staypuft 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76ef07b6490d37e26005189f760b35a3dc490a96
-  data.tar.gz: f58f1ff00ab900cba9e420bf2285e69e794cedf5
+  metadata.gz: 393d259fe817948071494184f9fa3cd51ea8e654
+  data.tar.gz: 3641379f31897bed7e704f231b01b56254ea2656
 SHA512:
-  metadata.gz: cf97c5664747ae8531c58467ce6a819e5da449a17a1fe44d29fa6708dec8d0d6856ffc81034463ce8dd4f4a8ec5c50ceec350aec2bc1077ce41ba961ed14c233
-  data.tar.gz: abf04187d87bf7a0b8d30bad9dbb25dba23384ddcd4c0282fbe30494a0a34b45404988d678b6aa662d331338871dd51ea9af7dce1cd99577f5419e9f2eb6a1de
+  metadata.gz: 7ead581569132ae1531579d4ebe3b1b5808e2e7fba8e9166a34e1331ab3087227584e6eb827c68c83a1de46f75254bb065be3b5a45a45c2f77b7b01bfdf5213f
+  data.tar.gz: 378d4ba1e8647803e39665fe020fe22b57aeb7b308f206d179b6f6f53bb526761bc514c927f87f078b50b46907adbb3bef9a666b7200123de6bac51b72101072

data/app/lib/actions/staypuft/host/report_wait.rb

@@ -16,6 +16,9 @@ module Actions
 
       class ReportWait < Actions::Base
 
+        TIMEOUT = 9000
+
+        middleware.use Actions::Staypuft::Middleware::Timeout
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
         include Dynflow::Action::Polling
 

data/app/lib/actions/staypuft/host/wait_until_provisioned.rb

@@ -16,7 +16,13 @@ module Actions
 
       class WaitUntilProvisioned < Actions::Base
 
+        TIMEOUT = 7200
+
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
+        # Using the Timeout middleware to make sure input[:timeout] is
+        # set. The actual timeout check is performed separately for
+        # the WaitUntilProvisioned because it's not a polling action.
+        middleware.use Actions::Staypuft::Middleware::Timeout
 
         def plan(host)
           plan_self host_id: host.id
@@ -26,11 +32,22 @@ module Actions
           case event
           when nil
             suspend do |suspended_action|
+              # schedule timeout
+              world.clock.ping suspended_action, input[:timeout], "timeout"
+
+              # wake up when provisioning is finished
               Rails.cache.write(
                   ::Staypuft::Concerns::HostOrchestrationBuildHook.cache_id(input[:host_id]),
                   { execution_plan_id: suspended_action.execution_plan_id,
                     step_id:           suspended_action.step_id })
             end
+          when "timeout"
+            # clear timeout_start so that the action can be resumed/skipped
+            output[:timeout_start] = nil
+            fail(::Staypuft::Exception,
+                 "You've reached the timeout set for this action. If the " +
+                 "action is still ongoing, you can click on the " +
+                 "\"Resume Deployment\" button to continue.")
           when Hash
             output[:installed_at] = event.fetch(:installed_at).to_s
           when Dynflow::Action::Skip

data/app/lib/actions/staypuft/host/wait_until_ready.rb

@@ -17,7 +17,9 @@ module Actions
       class WaitUntilReady < Actions::Base
 
         STARTUP_GRACE_PERIOD = 60
+        TIMEOUT = 1800
 
+        middleware.use Actions::Staypuft::Middleware::Timeout
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
         include Dynflow::Action::Polling
 

data/app/lib/actions/staypuft/middleware/timeout.rb

@@ -0,0 +1,39 @@
+module Actions
+  module Staypuft
+    module Middleware
+      class Timeout < Dynflow::Middleware
+
+        def plan(*args)
+          pass(*args).tap do
+            action.input[:timeout] ||= action.class::TIMEOUT
+          end
+        end
+
+        def run(*args)
+          assert_timeout_not_reached
+          pass(*args)
+        end
+
+        private
+
+        def assert_timeout_not_reached
+          action.output[:timeout_start] ||= Time.now.to_i
+
+          timeout_start = action.output[:timeout_start]
+          now = Time.now.to_i
+          timeout = action.input[:timeout]
+
+          if now - timeout_start > timeout
+            # clear timeout_start so that the action can be resumed/skipped
+            action.output[:timeout_start] = nil
+            fail(::Staypuft::Exception,
+                 "You've reached the timeout set for this action. If the " +
+                 "action is still ongoing, you can click on the " +
+                 "\"Resume Deployment\" button to continue.")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.14'
+  VERSION = '0.5.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -178,6 +178,7 @@ files:
 - app/lib/actions/staypuft/host/deploy.rb
 - app/lib/actions/staypuft/host/create.rb
 - app/lib/actions/staypuft/middleware/as_current_user.rb
+- app/lib/actions/staypuft/middleware/timeout.rb
 - app/lib/staypuft/network_query.rb
 - app/lib/staypuft/deployment_param_importer.rb
 - app/lib/staypuft/seeder.rb