vx-container_connector 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac0678ace6c0b5769744cdb0e655d4e63b4900d3
-  data.tar.gz: b06128dbfb44098fe8ef0a2e1cb7202eaac7ca46
+  metadata.gz: dd2b8b0551d449bcdc5e71117af7df9850aef1c3
+  data.tar.gz: fac8df9b3c35e10aee7ac712781bfcc0117c2f73
 SHA512:
-  metadata.gz: d62f37c16b0329d679a5e9df1d4a2fae4522a46d1026d375ae1455e6cf81619952a1f86ad52467e055fc5b19f714fb4ac92ce9160f35fc868d678d7ba05753df
-  data.tar.gz: 25b05b23497cb46beded12e974df85b58827118781a47a7dc2dbb5f1b4d5ab717d617419fa4db4f68f90c9b864cd3fc6bca20eda3f1bbc69e6a3ece78350433d
+  metadata.gz: 4e66db65e5463f92d8c9ae708706a9d0a12848876db907cb806cb294ed6d0e35fbbbd1b5e227010c1fc782a2afd742f5889524f624197cc92ae6512dde6be379
+  data.tar.gz: ad366eb332fe6946d1afe98a92823a09ebbaddfe8472b9f55ee15ec83bd8d9e8c84eb6c187babe10521ec5738782db3853577ec2fb4aa6b98ca4d0cc98827afa

data/lib/vx/container_connector/docker.rb

@@ -67,27 +67,20 @@ module Vx
             forward_agent: false
           }
           logger.info "open ssh session to #{user}@#{host}"
-          attempts = 0
-          begin
+          with_retries ::Net::SSH::AuthenticationFailed, limit: 3, sleep: 3 do
             open_ssh(host, user, ssh_options) do |ssh|
               logger.info "ssh session opened"
               yield Spawner.new(container, ssh, remote_dir)
             end
-          rescue ::Net::SSH::AuthenticationFailed => e
-            logger.error "got #{e.inspect}, retry #{attempts}"
-            sleep 0.5
-            attempts += 1
-            if attempts > 5
-              raise e
-            else
-              retry
-            end
           end
         end
 
         def start_container(&block)
           container = ::Docker::Container.create container_options
-          container.start
+
+          with_retries ::Docker::Error::NotFoundError, limit: 3, sleep: 3 do
+            container.start
+          end
 
           begin
             logger.info "start container #{container.id}"

data/lib/vx/container_connector/mixin/retriable.rb

@@ -26,6 +26,7 @@ module Vx
         begin
           yield
         rescue *exceptions => e
+          $stderr.puts "got: #{inspect}, attempt #{retried}"
           if retried + 1 < options[:limit]
             retried += 1
             sleep options[:sleep]

data/lib/vx/container_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ContainerConnector
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-container_connector
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Dmitry Galinsky