elastic_beans 0.10.0.alpha3 → 0.10.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583357835167edf4cae60e1c2151130c44ea75bd
-  data.tar.gz: 9ca2c8eb722305dee6e9c2b6e222b1204ba410b0
+  metadata.gz: ab319bee66fb6845dab2666354b537f014d57922
+  data.tar.gz: 1a6f05149363a12674100472bba10579d3e18d00
 SHA512:
-  metadata.gz: 2f53b9bed978bb88683abe9ea0c3e1024afa6a0aeab7c5481a676729720f6e443cc4351f0221acfa7c16d55d040358130c1bc9895cdb657850827adf1de2cae5
-  data.tar.gz: f2a75273d6299587372ea58eee84439f878c2028c605fdd5a187edce554064ba2cb19789ba41cf0acb5ec0ffbfc024ad70f52ca6c1188b00b325afdd312b6997
+  metadata.gz: 8ef907a6ddabf1243e976d882b22d1524510816ff58690c8141f55866781b77295294aa3b9117d8800828072650e9733786ae0da9c3cd9830f1d1c16dbdb781e
+  data.tar.gz: c9c517314e4403cfe788ab28667f35a029d388feefaa6f8c3b8100258fb18e6082e4306ad7321a69def8ea3313e6b44577acda3dec2a8d873612b221b4a6ad40

data/lib/elastic_beans/application.rb

@@ -149,7 +149,8 @@ module ElasticBeans
       objects.each_with_object([]) { |object, commands|
         begin
           response = s3.get_object(bucket: bucket_name, key: object.key)
-          commands << ElasticBeans::Exec::Command.from_json(response.body.read)
+          command = ElasticBeans::Exec::Command.from_json(response.body.read)
+          commands << command unless command.freeze_instance?
         # skip finished or invalid commands
         rescue ::Aws::S3::Errors::NoSuchKey
         rescue JSON::ParserError

data/lib/elastic_beans/exec/command.rb

@@ -21,9 +21,10 @@ module ElasticBeans
       # Command metadata, such as where to store execution data in S3.
       attr_reader :metadata
 
-      def initialize(command_string:, id: nil, instance_id: nil, start_time: nil, metadata: nil)
+      def initialize(command_string:, freeze_instance: false, id: nil, instance_id: nil, start_time: nil, metadata: nil)
         @id = id || SecureRandom.uuid
         @command_string = command_string
+        @freeze = freeze_instance
         @instance_id = instance_id
         @start_time = start_time
         @metadata = metadata || {}
@@ -33,10 +34,16 @@ module ElasticBeans
         id == other.id
       end
 
+      # Instead of a +command_string+ to execute, instruct the instance to not do anything.
+      def freeze_instance?
+        @freeze
+      end
+
       def to_json
         attributes = {}
         attributes[:id] = id
-        attributes[:command] = command_string
+        attributes[:command] = command_string if command_string
+        attributes[:freeze] = true if freeze_instance?
         attributes[:instance_id] = instance_id if instance_id
         attributes[:start_time] = start_time.iso8601 if start_time
         attributes[:metadata] = metadata
@@ -48,11 +55,18 @@ module ElasticBeans
         new(
           id: attributes["id"],
           command_string: attributes["command"],
+          freeze_instance: attributes["freeze"],
           instance_id: attributes["instance_id"],
           start_time: attributes["start_time"] ? Time.iso8601(attributes["start_time"]) : nil,
           metadata: attributes["metadata"],
         )
       end
+
+      # A special ElasticBeans::Exec::Command that instructs the instance to not do anything.
+      # Used for interactive exec commands, like +rails console+.
+      def self.freeze_instance
+        new(command_string: nil, freeze_instance: true)
+      end
     end
   end
 end

data/lib/elastic_beans/exec/sqs_consumer.rb

@@ -7,6 +7,9 @@ require "time"
 # @!visibility private
 class SQSConsumer
   LOOP_PERIOD = 1
+  KILL_PERIOD = 5
+  TERM_TIMEOUT = 25
+  FREEZE_TIMEOUT = 86400
 
   def initialize(instance_id:, logdir:, queue_url:, s3:, sqs:)
     @instance_id = instance_id
@@ -34,47 +37,50 @@ class SQSConsumer
             next
           end
 
-          log_command("Executing command ID=#{command['id']} `#{command['command']}' on host #{`hostname`.chomp} pid #{command_pid}...")
           start_time = Time.now
-          @command_pid = Process.spawn(
-            "#{command_script} #{command['command']}",
-            out: [command_logfile, "a"],
-            err: [command_logfile, "a"],
-          )
+          if command['freeze']
+            log("Freezing command ID=#{command['id']} on host #{`hostname`.chomp}...")
+          else
+            log_command("Executing command ID=#{command['id']} `#{command['command']}' on host #{`hostname`.chomp} pid #{command_pid}...")
+            @command_pid = Process.spawn(
+              "#{command_script} #{command['command']}",
+              out: [command_logfile, "a"],
+              err: [command_logfile, "a"],
+            )
+          end
+
           delete_message(message)
           update_metadata(command: command, start_time: start_time)
 
-          # poll command metadata to see if it is still available, if it disappears then kill the process
-          killed_thread = Thread.new do
-            loop do
-              sleep 5
-
-              if !metadata_exists?(command: command)
+          if command['freeze']
+            begin
+              Timeout.timeout(FREEZE_TIMEOUT) do
+                while_killed(command) do
+                  throw(:killed)
+                end
+                log("Defrosting from freeze command ID=#{command['id']}")
+              end
+            rescue Timeout::Error
+              log("Freeze command ID=#{command['id']} never terminated; timing out after '#{FREEZE_TIMEOUT}' seconds")
+            end
+          else
+            # poll command metadata to see if it is still available, if it disappears then kill the process
+            killed_thread = Thread.new do
+              while_killed(command) do
                 if already_killed?
-                  log_command(
-                    "Sending KILL signal to command ID=#{command['id']} `#{command['command']}' on host #{`hostname`.chomp} pid #{command_pid}" \
-                      " because it was killed and has not terminated yet"
-                  )
-                  Process.kill("KILL", command_pid)
-                  break
+                  kill_command(command, force: true)
+                  throw(:killed)
                 else
-                  log_command(
-                    "Sending TERM signal to command ID=#{command['id']} `#{command['command']}' on host #{`hostname`.chomp} pid #{command_pid}" \
-                      " because it was killed"
-                  )
-                  Process.kill("TERM", command_pid)
+                  kill_command(command)
                   @killed = true
-                  # give the command a little bit to die
-                  sleep 25
                 end
               end
             end
+            _, status = Process.wait2(command_pid)
+            killed_thread.kill if killed_thread.alive?
+            log_command("Command ID=#{command['id']} `#{command['command']}' exited on host #{`hostname`.chomp}: #{status}")
           end
 
-          _, status = Process.wait2(command_pid)
-          killed_thread.kill if killed_thread.alive?
-          log_command("Command ID=#{command['id']} `#{command['command']}' exited on host #{`hostname`.chomp}: #{status}")
-
           @command_pid = nil
           @killed = nil
           remove_metadata(command: command)
@@ -191,4 +197,36 @@ class SQSConsumer
   rescue StandardError => e
     log("[remove_metadata] #{e.class.name}: #{e.message}\n#{e.backtrace.join("\n")}")
   end
+
+  def kill_command(command, force: false)
+    if force
+      signal = "KILL"
+    else
+      signal = "TERM"
+    end
+
+    log_command(
+      "Sending signal '#{signal}' to" \
+        " command ID=#{command['id']} `#{command['command']}' on host #{`hostname`.chomp} pid #{command_pid}" \
+        " because it was killed"
+    )
+    Process.kill(signal, command_pid)
+
+    unless force
+      # give the command a little bit to die
+      sleep(TERM_TIMEOUT)
+    end
+  end
+
+  def while_killed(command)
+    catch(:killed) do
+      loop do
+        sleep(KILL_PERIOD)
+
+        if !metadata_exists?(command: command)
+          yield if block_given?
+        end
+      end
+    end
+  end
 end

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.10.0.alpha3"
+  VERSION = "0.10.0.alpha4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.10.0.alpha3
+  version: 0.10.0.alpha4
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk