dapp 0.13.17 → 0.13.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9e04341cb2d60b3950b60e7a0347ce4ba3aefc8
-  data.tar.gz: 746bcfa431003b5aaac9d97c7f09aa7a8a895c8d
+  metadata.gz: d6b08668d5e7085683b983ee2459556137efd222
+  data.tar.gz: c4897d4a33e753fde1569993557c1524627eb2c5
 SHA512:
-  metadata.gz: 93a186ff50fa4fdceec4a973bc011d21bc60e747cebe7b0f4be3f6bcd905ef5ae578f95732afdf757b4de291f595422c89a088e4c5395d6bfa80f42fe031fe9c
-  data.tar.gz: 09f10ab1ae0e559576882fdca1cb64b6c31b89987497ccb7b371625bf9a33d99243ee0f4baf03bc610c73f4824755631b88d5e4d5b22a763547e01dbd9e5316c
+  metadata.gz: fa7a617befda0df14a3270ae9666fc4a40f5d5ac283438b8895d870e8d85aaec07467b4e300f31423bafa28046841186edc96070d410e201e063713fc59ad141
+  data.tar.gz: 4a7170e9053054c72ac25a8671debfcfdc7895edc180b71733d52a93a863242b4b9a425e584fc4cd8804336365c2a70a72ea1d966d627bea8346e5fd7c9285f2

data/lib/dapp/dimg/config/directive/dimg/validation.rb

@@ -82,18 +82,31 @@ module Dapp
             def validate_artifact_format(artifacts)
               artifacts.map do |a|
                 path_format = proc { |path| File.expand_path(File.join('/', path, '/'))[1..-1] }
-
                 path_format.call(a._to) =~ %r{^([^\/]*)\/?(.*)$}
+
                 to = Regexp.last_match(1)
-                include_paths = a._include_paths.dup
-                include_paths << Regexp.last_match(2) unless Regexp.last_match(2).empty?
-                exclude_paths = a._exclude_paths.dup
+                include_exclude_path_format = proc do |path|
+                  paths = [].tap do |arr|
+                    arr << Regexp.last_match(2) unless Regexp.last_match(2).empty?
+                    arr << path
+                  end
+                  path_format.call(File.join(*paths))
+                end
+
+                include_paths = [].tap do |arr|
+                  if a._include_paths.empty? && !Regexp.last_match(2).empty?
+                    arr << Regexp.last_match(2)
+                  else
+                    arr.concat(a._include_paths.dup.map(&include_exclude_path_format))
+                  end
+                end
+                exclude_paths = a._exclude_paths.dup.map(&include_exclude_path_format)
 
                 {
                   index: artifacts.index(a),
                   to: to,
-                  include_paths: include_paths.map(&path_format),
-                  exclude_paths: exclude_paths.map(&path_format)
+                  include_paths: include_paths,
+                  exclude_paths: exclude_paths
                 }
               end
             end

data/lib/dapp/kube/kubernetes/client.rb

@@ -105,6 +105,14 @@ module Dapp
                    **{ follow: follow }.merge(query_parameters))
         rescue Excon::Error::Timeout
           raise Error::Timeout
+        rescue Error::Base => err
+          if err.net_status[:code] == :bad_request and
+             err.net_status[:data][:response_body] and
+             err.net_status[:data][:response_body]['message'].end_with? 'ContainerCreating'
+             raise Error::Pod::ContainerCreating, data: err.net_status[:data]
+          else
+            raise
+          end
         end
 
         def event_list(**query_parameters)
@@ -152,7 +160,7 @@ module Dapp
               else
                 raise Error::NotFound, data: err_data
               end
-            else not response.status.to_s.start_with? '2'
+            elsif not response.status.to_s.start_with? '2'
               raise Error::Base, code: :bad_request, data: err_data
             end
           end

data/lib/dapp/kube/kubernetes/client/error.rb

@@ -19,6 +19,11 @@ module Dapp
 
       module Pod
         class NotFound < Kubernetes::Client::Error::NotFound ; end
+        class ContainerCreating < Kubernetes::Client::Error::Base
+          def initialize(**net_status)
+            super({code: :container_creating}.merge(net_status))
+          end
+        end
       end # Pod
     end # Kubernetes::Client::Error
   end # Kube

data/lib/dapp/kube/kubernetes/manager/container.rb

@@ -13,22 +13,12 @@ module Dapp
           @processed_log_timestamps = Set.new
         end
 
-        def wait_till_created!
-          pod_manager.wait_till_running!
-
-          loop do
-            pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
-            break unless pod.container_state(name).first == 'waiting'
-            sleep 0.1
-          end
-        end
-
         def watch_till_terminated!
           pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
           _, container_state_data = pod.container_state(name)
           return if @processed_containers_ids.include? container_state_data['containerID']
 
-          wait_till_created!
+          pod_manager.wait_till_running!
 
           pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
           container_state, container_state_data = pod.container_state(name)
@@ -38,14 +28,20 @@ module Dapp
               pod = Kubernetes::Client::Resource::Pod.new(dapp.kubernetes.pod(pod_manager.name))
               container_state, container_state_data = pod.container_state(name)
 
-              chunk_lines_by_time = dapp.kubernetes.pod_log(pod_manager.name, container: name, timestamps: true, sinceTime: @processed_log_till_time)
-                .lines
-                .map(&:strip)
-                .map do |line|
-                  timestamp, _, data = line.partition(' ')
-                  [timestamp, data]
-                end
-                .reject {|timestamp, _| @processed_log_timestamps.include? timestamp}
+              chunk_lines_by_time = {}
+              begin
+                chunk_lines_by_time = dapp.kubernetes.pod_log(pod_manager.name, container: name, timestamps: true, sinceTime: @processed_log_till_time)
+                  .lines
+                  .map(&:strip)
+                  .map do |line|
+                    timestamp, _, data = line.partition(' ')
+                    [timestamp, data]
+                  end
+                  .reject {|timestamp, _| @processed_log_timestamps.include? timestamp}
+              rescue Kubernetes::Client::Error::Pod::ContainerCreating
+                sleep 0.1
+                next
+              end
 
               chunk_lines_by_time.each do |timestamp, data|
                 dapp.log("[#{timestamp}] #{data}")

data/lib/dapp/kube/kubernetes/manager/deployment.rb

@@ -112,23 +112,26 @@ module Dapp
 
                       dapp.with_log_indent do
                         pod.containers_names.each do |container_name|
-                          next if pod.container_state(name).first == 'waiting'
-
                           known_log_timestamps_by_pod_and_container[pod.name] ||= {}
                           known_log_timestamps_by_pod_and_container[pod.name][container_name] ||= Set.new
 
                           since_time = nil
                           since_time = @deployed_at.utc.iso8601(9) if @deployed_at
 
-                          log_lines_by_time = dapp.kubernetes.pod_log(pod.name, container: container_name, timestamps: true, sinceTime: since_time)
-                            .lines.map(&:strip)
-                            .map {|line|
-                              timestamp, _, data = line.partition(' ')
-                              unless known_log_timestamps_by_pod_and_container[pod.name][container_name].include? timestamp
-                                known_log_timestamps_by_pod_and_container[pod.name][container_name].add timestamp
-                                [timestamp, data]
-                              end
-                            }.compact
+                          log_lines_by_time = []
+                          begin
+                            log_lines_by_time = dapp.kubernetes.pod_log(pod.name, container: container_name, timestamps: true, sinceTime: since_time)
+                              .lines.map(&:strip)
+                              .map {|line|
+                                timestamp, _, data = line.partition(' ')
+                                unless known_log_timestamps_by_pod_and_container[pod.name][container_name].include? timestamp
+                                  known_log_timestamps_by_pod_and_container[pod.name][container_name].add timestamp
+                                  [timestamp, data]
+                                end
+                              }.compact
+                          rescue Kubernetes::Client::Error::Pod::ContainerCreating
+                            next
+                          end
 
                           if log_lines_by_time.any?
                             dapp.log_step("Last container '#{container_name}' log:")

data/lib/dapp/kube/kubernetes/manager/job.rb

@@ -40,7 +40,7 @@ module Dapp
               if job.succeeded?
                 break
               elsif job.failed?
-                warn "Job '#{name}' has been failed: #{job.spec['status']}"
+                dapp.log_warning "Job '#{name}' has been failed: #{job.spec['status']}"
                 break
               end
 
@@ -53,7 +53,7 @@ module Dapp
             begin
               pod_manager.watch_till_done!
             rescue Kubernetes::Client::Error::Pod::NotFound => err
-              warn "Pod '#{err.net_status.fetch(:response_body, {}).fetch('details', {})['name']}' has been deleted"
+              dapp.log_warning "Pod '#{pod_manager.name}' has been deleted"
             ensure
               @processed_pods_names << process_pod.name
             end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.17'.freeze
+  VERSION = '0.13.18'.freeze
   BUILD_CACHE_VERSION = 15
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.17
+  version: 0.13.18
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout