marathon_deploy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2064827ef363519d13290fa9e84e34b37d15a954
-  data.tar.gz: 9bb6235b0c8b3421cb3904561a67d022a6a72f5d
+  metadata.gz: 35b3f25c8764a73dd299377a082c1bf279574ba3
+  data.tar.gz: f8db464c0a0165b0f16de1bda5c170b07c069e60
 SHA512:
-  metadata.gz: 652ed65844e48852e55d1eb8a69436ab042df65139c0c7af24c3d34f94008a511c6275a68aaf6e94499a01bceba4dfdf3e00149484350b2cb6b7dab10a461651
-  data.tar.gz: 7be0be184f7d07d62e2457965e1d1723a03fa926c0bb6e633b5b1f970d8e359ed81e42b18dafb122f4b5b02add40d87d76e29fbf23ff6e43bcf115948560af7d
+  metadata.gz: 77cdd112a5424d33c3188391194ae099090ed7bd15b6a3e97ccdf20d0b42517491b5342a51ddba7288b481413e319b84a281c45277b244f822ce1c182990c7a9
+  data.tar.gz: cbee096acc67009a5b7183fc2eeb7a04890c94f54f09e1f715f43b47e27496f621132d0f8b1d37b60a33d38e0ad3280c2bbd3627ffccd2b232e921ce4984d4fe

data/examples/simple-python-example.yaml

@@ -0,0 +1,32 @@
+---
+id: python-example-stable
+cmd: echo python stable `hostname` > index.html; python3 -m http.server 8080
+mem: 16
+cpus: 0.1
+instances: 5
+container:
+  type: DOCKER
+  docker:
+    image: ubuntu:14.04
+    network: BRIDGE
+    portMappings:
+    - containerPort: 8080
+      hostPort: 0
+      protocol: tcp
+env:
+  SERVICE_TAGS: python,webapp,http,weight=100
+  SERVICE_NAME: python
+healthChecks:
+- portIndex: 0
+  protocol: TCP
+  gracePeriodSeconds: 30
+  intervalSeconds: 10
+  timeoutSeconds: 30
+  maxConsecutiveFailures: 3
+- path: "/"
+  portIndex: 0
+  protocol: HTTP
+  gracePeriodSeconds: 30
+  intervalSeconds: 10
+  timeoutSeconds: 30
+  maxConsecutiveFailures: 3

data/lib/marathon_deploy/application.rb

@@ -22,7 +22,7 @@ module MarathonDeploy
     case extension
       when '.json'
         @json = YamlJson.read_json(deployfile)
-      when '.yaml'
+      when '.yaml','.yml'
         @json = YamlJson.yaml2json(deployfile)
       else
         message = "File extension #{extension} is not supported for deployment file #{deployfile}"

data/lib/marathon_deploy/deployment.rb

@@ -89,13 +89,13 @@ module MarathonDeploy
     Timeout::timeout(HEALTHY_WAIT_TIMEOUT) do
       loop do
         break if (!health_checks_defined?)
-        sick = get_alive("false")
+        sick = get_alive(false)
         elapsedTime = '%.2f' % (Time.now - startTime)
         if (!sick.empty?)
           $LOG.info("#{sick.size}/#{@application.instances} instances are not healthy, retrying in #{HEALTHY_WAIT_RECHECK_INTERVAL}s (elapsed time #{elapsedTime}s)")
           $LOG.debug("Sick instances: " + sick.join(','))
-        else
-          healthy = get_alive("true")
+        else         
+          healthy = get_alive(true)
           if (healthy.size == @application.instances)
             elapsedTime = '%.2f' % (Time.now - startTime)
             $LOG.info("#{healthy.size} of #{@application.instances} expected instances are healthy (Total health-check time #{elapsedTime}s).")
@@ -160,28 +160,43 @@ module MarathonDeploy
   ####### PRIVATE METHODS ##########
   private
 
-  def get_alive(value)        
-    state = Array.new
-    
+  # returns an array of taskIds which are alive
+  def get_alive(value) 
+    raise ArgumentError, "value must be boolean true or false" unless (!!value == value)       
+    state = Array.new    
     if (health_checks_defined?)     
       response = list_app
       response_body = Utils.response_body(response)
         if (response_body[:app].empty?)
           raise Error::DeploymentError, "Marathon returned an empty app json object", caller
         else
-          get_healthcheck_results.flatten.each do |result|
-            next if result.nil?
-            alive = result[:alive].to_s
-            taskId = result[:taskId].to_s              
-            if (!alive.nil? && !taskId.nil?)
-              state << taskId if (alive == value)
-            end          
+          tasks = Hash.new
+          task_ids = Array.new
+          check_results = get_healthcheck_results.flatten
+          check_results.each do |task| 
+            next if task.nil?  
+            tasks[task[:taskId].to_s] ||= [] 
+          tasks[task[:taskId].to_s] << task[:alive]
+          end
+          
+          tasks.each do |k,v|            
+            if (value)
+              # if there are only alive=true for all healthchecks for this instance
+              if (v.uniq.length == 1 && v.uniq.first == value)
+                task_ids << k
+              end 
+            else
+              # if alive=false is seen for any healthchecks for this instance
+              if (v.include?(value))
+                task_ids << k
+              end 
+            end            
           end         
         end
     else
       $LOG.info("No health checks defined. Cannot determine application health of #{@application.id}.")    
     end
-    return state
+    return task_ids
   end
   
   def get_task_ids
@@ -193,6 +208,7 @@ module MarathonDeploy
   def get_healthcheck_results
     response = list_app
     response_body = Utils.response_body(response)
+    #puts JSON.pretty_generate(response_body)
     return response_body[:app][:tasks].collect { |task| task[:healthCheckResults]}
   end
     

data/lib/marathon_deploy/macro.rb

@@ -48,7 +48,7 @@ module MarathonDeploy
   def self.expand_macros(data)
     processed = ""
     macros = get_macros(data).uniq
-    $LOG.debug("Macros found in deploy file: #{macros.join(',')}")
+    $LOG.debug("Macros found in deploy file: #{macros.join(',')}") unless (macros.empty?)
     undefined = get_undefined_macros(macros)
     if (!undefined.empty?)
       raise Error::UndefinedMacroError, "Macros found in deploy file without defined environment variables: #{undefined.join(',')}", caller

data/lib/marathon_deploy/marathon_defaults.rb

@@ -7,7 +7,7 @@ module MarathonDeploy
  
   DEPLOYMENT_RECHECK_INTERVAL = 3
   DEPLOYMENT_TIMEOUT = 300
-  HEALTHY_WAIT_TIMEOUT = 10 #300
+  HEALTHY_WAIT_TIMEOUT = 300
   HEALTHY_WAIT_RECHECK_INTERVAL = 3
   PRODUCTION_ENVIRONMENT_NAME = 'PRODUCTION'
   DEFAULT_ENVIRONMENT_NAME = 'INTEGRATION'

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -91,6 +91,7 @@ files:
 - examples/nohealthchecks.yaml
 - examples/public-search-germany-webapp.pre.json
 - examples/run.sh
+- examples/simple-python-example.yaml
 - examples/testout.json
 - examples/testout.yaml
 - input.txt
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Mesos/Marathon deployment tool.