marathon_deploy 0.1.49 → 0.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af24963806cfffb04b82861400c985fca4c9cfaa
-  data.tar.gz: e4dbe7a9e5d3acb2499ee78d905bc1feb0036fbb
+  metadata.gz: f756c9936eefbd912e30c63e7d6f92ced9cbd878
+  data.tar.gz: 9850ae0570fa9cd09334bf443ecf1ac2aac5f39a
 SHA512:
-  metadata.gz: cf2fe646b04ceb3bc049a2a68afda61c630412ec37974bbaa99796978da30b3c04b42e0da0ce302ecd1fd34a52b0bfae1a1e6d0e1b110293c2fa7df35d6a7794
-  data.tar.gz: 99d2747a8644b75ea057ca580bdfab2be430501f485b81db6a392c9af42b6c285306443f3a50979d2ae391926e86a9e94874c40eeb8e3fb5e8f97d93358cdfbf
+  metadata.gz: 45284e7b60f096f5de4ee4cd7c50717fa7f4080766cba750914033998458642e0451b7968c1f9dee4e82fc08b07ad941327d20473b5f7b392645a4a32bd3e225
+  data.tar.gz: 4b19afdcd201eca3d20926532098b2c595d95572c102cd9fe569eb324c2984c821bd97b514974d2c412124bb60c1228c27da75da52cb61297171abd9fd8bb84e

data/lib/marathon_deploy/deployment.rb

@@ -6,6 +6,7 @@ require 'timeout'
 module MarathonDeploy
   class Deployment
 
+  WAIT_FOR_DEPLOYMENT_TIMEOUT = MarathonDefaults::WAIT_FOR_DEPLOYMENT_TIMEOUT
   DEPLOYMENT_RECHECK_INTERVAL = MarathonDefaults::DEPLOYMENT_RECHECK_INTERVAL
   DEPLOYMENT_TIMEOUT = MarathonDefaults::DEPLOYMENT_TIMEOUT
   HEALTHY_WAIT_TIMEOUT = MarathonDefaults::HEALTHY_WAIT_TIMEOUT
@@ -38,16 +39,21 @@ module MarathonDeploy
     end
   end
 
+  def wait_for_deployment()
+      startTime = Time.now
+      Timeout::timeout(WAIT_FOR_DEPLOYMENT_TIMEOUT) do
+          while !deployment_running?
+            sleep(DEPLOYMENT_RECHECK_INTERVAL)
+            $LOG.info("Waiting for Marathon to start deployment")
+          end
+      end
+  end
+
   def wait_for_deployment_id(message = "Deployment with deploymentId #{@deploymentId} in progress")
       startTime = Time.now
       deployment_seen = false
       Timeout::timeout(DEPLOYMENT_TIMEOUT) do
-        while !deployment_running?
-          sleep(DEPLOYMENT_RECHECK_INTERVAL)
-          $LOG.info("Waiting for Marathon to start deployment")
-        end
         while running_for_deployment_id?
-
           deployment_seen = true
           #response = list_all
           #STDOUT.print "." if ( $LOG.level == 1 )
@@ -137,11 +143,9 @@ module MarathonDeploy
     return response
   end
 
-  def update_app(force=false)
-    url = @url + MarathonDefaults::MARATHON_APPS_REST_PATH + @application.id
-    url += force ? '?force=true' : ''
+  def update_app
     $LOG.debug("Updating app #{@application.id} #{url}")
-    response = HttpUtil.put(url,@application.json)
+    response = Utils.putJSON(@url,@application)
     begin
       @deploymentId = Utils.response_body(response)[:deploymentId]
     rescue Exception=>e

data/lib/marathon_deploy/marathon_client.rb

@@ -58,7 +58,14 @@ module MarathonDeploy
     
     # wait for deployment to finish, according to marathon deployment API call
     begin
-      deployment.wait_for_deployment_id 
+      deployment.wait_for_deployment
+    rescue Timeout::Error => e
+      $LOG.warn("Timed out after waiting for deployment to start")
+      $LOG.warn("Deployment did not start at all")
+      $LOG.warn("Possible reason: deploying the same plan already (use option -f to ensure that plans are unique)")
+    end
+    begin
+      deployment.wait_for_deployment_id
     rescue Timeout::Error => e
       $LOG.error("Timed out waiting for deployment of #{application.id} to complete. Canceling deploymentId #{deployment.deploymentId} and rolling back!")
       deployment.cancel(deployment.deploymentId)

data/lib/marathon_deploy/marathon_defaults.rb

@@ -9,6 +9,7 @@ module MarathonDeploy
     attr_accessor :marathon_username, :marathon_password
   end
 
+  WAIT_FOR_DEPLOYMENT_TIMEOUT = 7
   DEPLOYMENT_RECHECK_INTERVAL = 3
   DEPLOYMENT_TIMEOUT = 300
   HEALTHY_WAIT_TIMEOUT = 300

data/lib/marathon_deploy/utils.rb

@@ -60,6 +60,18 @@ module MarathonDeploy
     value
   end
 
+  def self.putJSON(url,application)
+    response = nil
+    5.times { |i|
+      i+=1
+      response = HttpUtil.put(url + MarathonDefaults::MARATHON_APPS_REST_PATH + application.id,application.json)
+      break if (!response.nil?)
+      $LOG.info "Did not receive anything from Marathon. Waiting #{i} seconds then retrying ..."
+      sleep i
+    }
+    return response
+  end
+
   def self.lookup(model, key, *rest)
     v = model[key]
     return v if rest.empty?

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.49"
+  VERSION = "0.1.50"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.49
+  version: 0.1.50
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger