panteras_api 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeb5ebc31839e45b1d91d08a03a821644a6603da
-  data.tar.gz: 2e5adbea11f05e82af189b12b46598e58b6647fd
+  metadata.gz: ea8ca118bcd94f2214e8b26b808ff340c0a2256f
+  data.tar.gz: 19410c55001484b73f5febcafcfc73a56a6030da
 SHA512:
-  metadata.gz: 27e0c7f2826ee4eec93a4a082df45bb7d81d8b4a2f74303a98896c845a0a64173a4d568cfdf12a491b54b4a3141d5de022cd963498be6fa0e61e2a8459203722
-  data.tar.gz: 223f6a8d7a341ee53364e6cd531ffa5086a18998d155670a3bc1b76c29210f7bdfa338ab94edbf8ad2c946e96a48a91226b4b70d5b654790c107425f9958f582
+  metadata.gz: 774f39767226b84eebb8fdafa197cfe08e1922f2a5da3f9645e38e029a4f19cf44dde229b58d77cd9c66974220a75277929ef0b06699d7451fe7d11f356b6c78
+  data.tar.gz: cb947d62cf63f2b3c5ede496b64900c441004151db1e9f7637b197f12cddca9b773655d191bf405ad995485611805e7a6d672d30aff8806c82eb6204985e506d

data/bin/mesos_consul_consistency_check

@@ -72,9 +72,23 @@ puts "* My hostname: #{my_fqdn}" if config[:debug]
 
 timeout_in_seconds = config[:timeout]
 
+marathon_temp = MarathonEndpoint.new(config[:mesos_master_hostname], 8080, config[:marathon_username], config[:marathon_password])
+@marathon = MarathonEndpoint.new(marathon_temp.leader, 8080, config[:marathon_username], config[:marathon_password])
+
+### Skip when deploymetns - in multiple places to aviod race conditions
+def exit_on_deployment
+  if ! @marathon.deployments.empty?
+    puts "Deployment in progess"
+    exit 0
+  end
+end
+
+exit_on_deployment
+
 begin
 Timeout::timeout(timeout_in_seconds) do
 
+
   ### MESOS
   puts "#" * 75 if config[:debug]
   puts "* Mesos tasks ids running this cluster (all slaves):" if config[:debug]
@@ -94,18 +108,17 @@ Timeout::timeout(timeout_in_seconds) do
     #puts mesos.task_ids('chronos-config').sort
   end
 
+  exit_on_deployment
+
   ### MARATHON
   puts "#" * 75 if config[:debug]
   puts "* Marathon tasks on #{my_fqdn}:" if config[:debug]
-  marathon = MarathonEndpoint.new(mesos.master_hostname, 8080, config[:marathon_username], config[:marathon_password])
-  if ! marathon.deployments.empty?
-    puts "Deployment in progess"
-    exit 0
-  end
-  marathon_tasks = marathon.my_task_ids(my_fqdn, 'marathon')
+  marathon_tasks = @marathon.my_task_ids(my_fqdn, 'marathon')
   puts marathon_tasks.sort if config[:debug]
   good_news << "#{marathon_tasks.size} marathon tasks running."
 
+  exit_on_deployment
+
   ## MESOS LOCAL
   puts "#" * 75 if config[:debug]
   puts "* Mesos tasks ids for tasks running on #{my_fqdn}:" if config[:debug]
@@ -114,6 +127,8 @@ Timeout::timeout(timeout_in_seconds) do
   puts mesos_tasks.sort if config[:debug]
   good_news << "#{mesos_tasks.size} mesos tasks running." if ! mesos_tasks.empty?
 
+  exit_on_deployment
+
   ### CHRONOS
   puts "#" * 75 if config[:debug]
   puts "* Chronos tasks on #{my_fqdn}:" if config[:debug]
@@ -152,6 +167,7 @@ Timeout::timeout(timeout_in_seconds) do
   puts consul_services.sort if config[:debug]
   good_news << "#{consul_services.size} consul services running."
 
+  exit_on_deployment
 
   ### set these environment variables here or in shell for testing a remote docker (ie, boot2docker)
   #ENV['DOCKER_HOST']='tcp://192.168.59.103:2376'
@@ -212,6 +228,8 @@ rescue Timeout::Error
   good_news << "Time out - no response in reasonable time"
 end
 
+exit_on_deployment
+
 if ! bad_news.empty?
   puts "problems on #{my_fqdn}: #{bad_news.join(' ')}"
   exit config[:error_exit_code]

data/lib/panteras_api/marathon_endpoint.rb

@@ -18,13 +18,18 @@ class MarathonEndpoint
     to_j(get_response_with_redirect(@host, '/v2/apps/', @port, @user, @passwd))[:apps]
   end
 
+  def leader
+    to_j(get_response_with_redirect(@host, '/v2/leader', @port, @user, @passwd))[:leader].split(':').first
+  end
+
   def deployments
     to_j(get_response_with_redirect(@host, '/v2/deployments', @port, @user, @passwd))
   end
 
   def app_names
-    raise StandardError, "Empty response from marathon", caller if all_apps.nil?
-    all_apps.collect { |a| a[:id][1..-1] }
+    apps = all_apps
+    raise StandardError, "Empty response from marathon", caller if apps.nil?
+    apps.collect { |a| a[:id][1..-1] }
   end
   
   def tasks_ids(app_name)

data/lib/panteras_api/version.rb

@@ -1,3 +1,3 @@
 module PanterasApi
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panteras_api
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Jonathan Colby