jflow 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c73bd7ddc1961e2cee02340e5e278ca38728b6
-  data.tar.gz: d24a8c760b838ead40d337d6ba3942ae08ed1e7c
+  metadata.gz: 00ce3f02a925a9d23d449d6e58d5ee6e234b5053
+  data.tar.gz: 64979f0b07f76690b8f7f6d0705936d3c4679a6f
 SHA512:
-  metadata.gz: 4f0511d6ff5150fdc07d1a7d6bcb57a50def52f2b0f8cd52bd8cc08bf0cfc79f1779e139edef360004cd63a5b75260ef19cc28d89940ae75666123e304dfcaee
-  data.tar.gz: af71fc5d74cdcd66f762ea16ff011c40ba773721b2e136765086998d1de3e00a15c4c495f1a6696d675d312acf43b41e3d200c5ca5b02fb6e5649d33db59fe42
+  metadata.gz: 15148f66af1e2011e5f1a3bf68df900548d399fba332001abff1b308c4da304820c6f3bd201fe086dd2963438c163bb9122f5516eb8617fdc3e371b69f3dbbfb
+  data.tar.gz: 4b254b3f1313f2e99230c265f6d184f428062111ca536b36b87beb393190fab7ec0b6da7ba21fe5d47dccc67eb0725c8608258bf848e1ac03fe96126164329c0

data/lib/jflow.rb

@@ -13,6 +13,7 @@ require "jflow/activity/task.rb"
 require "jflow/activity/map.rb"
 require "jflow/activity/worker.rb"
 require "jflow/worker_thread.rb"
+require "jflow/termination_protector.rb"
 require "jflow/stats.rb"
 require "jflow/cli.rb"
 

data/lib/jflow/cli.rb

@@ -25,7 +25,7 @@ module JFlow
       number_of_workers.times do
         worker_threads << worker_thread
       end
-      worker_threads << stats_thread if enable_stats
+      worker_threads << maintenance_thread if enable_stats || is_ec2_instance?
       worker_threads.each(&:join)
     end
 
@@ -63,18 +63,34 @@ module JFlow
       JFlow.load_activities
     end
 
-    def stats_thread
+    def maintenance_thread
       JFlow::WorkerThread.new do
         Thread.current.set_state(:polling)
         stats = JFlow::Stats.new(@domain, @tasklist)
+        protector = JFlow::TerminationProtector.new
         loop do
           break if Thread.current.marked_for_shutdown?
-          stats.tick
+          JFlow.configuration.logger.debug "Should protect?: #{should_protect?}"
+          protector.set_protection(should_protect?) if is_ec2_instance?
+          stats.tick if enable_stats
           sleep 30
         end
       end
     end
 
+    # returns true if any thread if working on someting
+    def should_protect?
+      worker_threads.each do |thread|
+        return true if thread.currently_working?
+      end
+      return false
+    end
+
+    # This should exist on all EC2 instances
+    def is_ec2_instance?
+      @ec2_instance ||= File.exist?('/sys/hypervisor/uuid')
+    end
+
     def log(str)
       JFlow.configuration.logger.info str
     end
@@ -95,4 +111,4 @@ module JFlow
     end
 
   end
-end
+end

data/lib/jflow/termination_protector.rb

@@ -0,0 +1,49 @@
+require 'net/http'
+require 'json'
+
+module JFlow
+  class TerminationProtector
+
+    def region
+      instance_data['region']
+    end
+
+    def instance_id
+      instance_data['instanceId']
+    end
+
+    # Returns a hash of instance data, including region, instance id + more
+    def instance_data
+      @instance_data ||= JSON.parse(Net::HTTP.get(URI.parse('http://169.254.169.254/latest/dynamic/instance-identity/document')))
+    end
+
+    def get_asg_name
+      ec2_client = Aws::EC2::Client.new(region: region)
+      instance_tags = ec2_client.describe_tags(filters: [
+        {
+          name: "resource-id",
+          values: [instance_id]
+        }
+      ])[0]
+      asg_name = instance_tags.select{|tag| tag.key == "aws:autoscaling:groupName"}.first.value
+      JFlow.configuration.logger.debug "Discovered autoscaling group name #{asg_name}"
+
+      asg_name
+    end
+
+    def set_protection(protect_status)
+      JFlow.configuration.logger.debug "Setting termination protection status to #{protect_status} for instance #{@instance_id} in region #{@region}"
+      begin
+        asg_client = Aws::AutoScaling::Client.new(region: region)
+        asg_client.set_instance_protection({
+          instance_ids: [instance_id],
+          auto_scaling_group_name: get_asg_name,
+          protected_from_scale_in: protect_status
+        })
+      rescue => e
+        JFlow.configuration.logger.debug "Something went wrong setting termination proection: #{e.inspect}"
+      end
+    end
+
+  end
+end

data/lib/jflow/version.rb

@@ -1,3 +1,3 @@
 module JFlow
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jflow
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Christophe Verbinnen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -140,6 +140,7 @@ files:
 - lib/jflow/configuration.rb
 - lib/jflow/domain.rb
 - lib/jflow/stats.rb
+- lib/jflow/termination_protector.rb
 - lib/jflow/version.rb
 - lib/jflow/worker_thread.rb
 homepage: https://github.com/djpate/jflow