elastic_beans 0.10.0.alpha4 → 0.10.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab319bee66fb6845dab2666354b537f014d57922
-  data.tar.gz: 1a6f05149363a12674100472bba10579d3e18d00
+  metadata.gz: d754b33da7a3f07521bc482202e613379f857d34
+  data.tar.gz: 18565aa2ae2b834401eb8c6e129dc7db2fa26bf5
 SHA512:
-  metadata.gz: 8ef907a6ddabf1243e976d882b22d1524510816ff58690c8141f55866781b77295294aa3b9117d8800828072650e9733786ae0da9c3cd9830f1d1c16dbdb781e
-  data.tar.gz: c9c517314e4403cfe788ab28667f35a029d388feefaa6f8c3b8100258fb18e6082e4306ad7321a69def8ea3313e6b44577acda3dec2a8d873612b221b4a6ad40
+  metadata.gz: 9d701c345a20ac52fa4be4ac428ebc85f7051a176dac0132d70961c7f280e8b4c1d0c37f300b7b8ed0fe21aea8d42b6610f030e44fba1dcf4733472eed4b5060
+  data.tar.gz: 2f83cbf28762e060e3b88f158794d496decb39d2c91af4d587f7ea62b2fc3add9b6ff8dfdd0bc9fe8572c77f006114c8b1d34bcd9345e3188210d3d1f4af76d1

data/lib/elastic_beans/application.rb

@@ -146,8 +146,16 @@ module ElasticBeans
         prefix: command_key_prefix,
         max_keys: 100,
       ).contents
-      objects.each_with_object([]) { |object, commands|
+      objects.each_with_object([]) do |object, commands|
         begin
+          next unless object.key.end_with?('.json')
+          begin
+            s3.head_object(bucket: bucket_name, key: "#{object.key}.killed")
+            next
+          rescue ::Aws::S3::Errors::NotFound
+            # not killed, move on
+          end
+
           response = s3.get_object(bucket: bucket_name, key: object.key)
           command = ElasticBeans::Exec::Command.from_json(response.body.read)
           commands << command unless command.freeze_instance?
@@ -155,7 +163,9 @@ module ElasticBeans
         rescue ::Aws::S3::Errors::NoSuchKey
         rescue JSON::ParserError
         end
-      }
+      end
+    rescue ::Aws::S3::Errors::AccessDenied
+      raise AccessDeniedS3Error.new(bucket: bucket_name, key: "#{command_key_prefix}*")
     end
 
     # Fetches the +ExecQueueUrl+ Output from the application CloudFormation stack.
@@ -165,7 +175,7 @@ module ElasticBeans
     end
 
     # Schedules the given ElasticBeans::Exec::Command or +id+ for termination.
-    # Removes the metadata for the command and relies on the SQSConsumer to terminate it.
+    # Adds a special piece of metadata to kill the command and relies on the SQSConsumer to terminate it.
     #
     # Raises an error if the application does not exist.
     def kill_command(command_or_id)
@@ -179,8 +189,8 @@ module ElasticBeans
         command_id = command_or_id
       end
 
-      key = "#{command_key_prefix}#{command_id}.json"
-      s3.delete_object(
+      key = "#{command_key_prefix}#{command_id}.json.killed"
+      s3.put_object(
         bucket: bucket_name,
         key: key,
       )

data/lib/elastic_beans/command/kill.rb

@@ -13,7 +13,7 @@ You can find an enqueued command's ID by running `ps`.
 
 Commands are run in an "exec" environment, separate from your webserver or worker environments.
 When they are enqueued, metadata is created in S3 and removed when the command is complete.
-Removing that metadata cancels the command.
+Adding a special piece of metadata cancels the command.
 The command is sent a SIGTERM, and then a SIGKILL if it has not yet died.
 
 Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY.

data/lib/elastic_beans/exec/sqs_consumer.rb

@@ -31,9 +31,10 @@ class SQSConsumer
         sleep(LOOP_PERIOD)
         if (message = receive_message)
           command = command_from_message(message)
-          unless metadata_exists?(command: command)
+          if killing_command?(command)
             delete_message(message)
-            log_command("Skipping command ID=#{command['id']} `#{command['command']}' because it was killed")
+            log("Skipping command ID=#{command['id']} `#{command['command']}' because it was killed")
+            remove_metadata(command: command)
             next
           end
 
@@ -137,6 +138,53 @@ class SQSConsumer
     @killed
   end
 
+  def killing_command?(command)
+    metadata = command['metadata']
+    if metadata && metadata['bucket'] && metadata['key']
+      s3.head_object(
+        bucket: metadata['bucket'],
+        key: "#{metadata['key']}.killed",
+      )
+      true
+    end
+  rescue ::Aws::S3::Errors::NotFound
+    false
+  rescue StandardError => e
+    log("[metadata_exists] #{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 killing_command?(command)
+          yield if block_given?
+        end
+      end
+    end
+  end
+
   def receive_message
     sqs.receive_message(
       queue_url: queue_url,
@@ -171,62 +219,19 @@ class SQSConsumer
     log("[update_metadata] #{e.class.name}: #{e.message}\n#{e.backtrace.join("\n")}")
   end
 
-  def metadata_exists?(command:)
+  def remove_metadata(command:)
     metadata = command['metadata']
     if metadata && metadata['bucket'] && metadata['key']
-      s3.head_object(
+      s3.delete_object(
         bucket: metadata['bucket'],
         key: metadata['key'],
       )
-      true
-    end
-  rescue ::Aws::S3::Errors::NotFound
-    false
-  rescue StandardError => e
-    log("[metadata_exists] #{e.class.name}: #{e.message}\n#{e.backtrace.join("\n")}")
-  end
-
-  def remove_metadata(command:)
-    metadata = command['metadata']
-    if metadata && metadata['bucket'] && metadata['key']
       s3.delete_object(
         bucket: metadata['bucket'],
-        key: metadata['key'],
+        key: "#{metadata['key']}.killed",
       )
     end
   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.alpha4"
+  VERSION = "0.10.0.alpha5"
 end

metadata

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