aws-flow 1.0.7 → 1.0.8

data/lib/aws/decider/history_helper.rb

@@ -131,6 +131,7 @@ module AWS
         decision_start_to_completion_events, decision_completion_to_start_events = [], []
         next_replay_current_time_milliseconds = -1
         last_decision_index = -1
+        concurrent_to_decision = true
         while @events.events.length > 0
           event = @events.events.shift
           event_type = event.event_type.to_sym

data/lib/aws/decider/task_poller.rb

@@ -89,7 +89,6 @@ module AWS
         @logger = options.logger if options
         @logger ||= Utilities::LogFactory.make_logger(self, "debug")
         @executor = executor
-
       end
 
       def execute(task)
@@ -166,11 +165,13 @@ module AWS
       end
 
       def poll_and_process_single_task(use_forking = true)
-
         @poll_semaphore ||= SuspendableSemaphore.new
         @poll_semaphore.acquire
         semaphore_needs_release = true
         @logger.debug "before the poll\n\n"
+        # This is to warm the lazily loaded clients in the @service, so we don't
+        # pay for their loading in every forked client
+        @service.config.to_h
         begin
           if use_forking
             @executor.block_on_max_workers

data/lib/aws/decider/version.rb

@@ -16,7 +16,7 @@
 module AWS
   module Flow
     def self.version
-      "1.0.7"
+      "1.0.8"
     end
   end
 end

data/test/aws/decider_spec.rb

@@ -17,10 +17,43 @@ require 'yaml'
 
 require 'aws/decider'
 include AWS::Flow
+class FakeConfig
+  def to_h
 
+  end
+end
 
 $RUBYFLOW_DECIDER_DOMAIN = "rubyflow_decider_domain_06-12-2012"
 $RUBYFLOW_DECIDER_TASK_LIST = 'test_task_list'
+
+class FakeAttribute
+  def initialize(data); @data = data; end
+  def method_missing(method_name, *args, &block)
+    if @data.keys.include? method_name
+      return @data[method_name]
+    end
+    super
+  end
+  def keys; @data.keys; end
+  def [](key); @data[key]; end
+  def to_h; @data; end
+  def []=(key, val); @data[key] = val; end
+end
+
+class FakeEvents
+  def initialize(args)
+    @events = []
+    args.each_with_index do |event, index|
+      event, attr = event if event.is_a? Array
+      attr ||= {}
+      @events << TestHistoryEvent.new(event, index + 1, FakeAttribute.new(attr))
+    end
+    @events
+  end
+  def to_a
+    @events
+  end
+end
 class TrivialConverter
   def dump(x)
     x
@@ -44,9 +77,11 @@ class FakePage
 end
 
 class FakeWorkflowExecution
-  def run_id
-    "1"
+  def initialize(run_id = "1", workflow_id = "1")
+    @run_id = run_id
+    @workflow_id = workflow_id
   end
+  attr_accessor :run_id, :workflow_id
 end
 
 class FakeWorkflowExecutionCollecton
@@ -142,6 +177,7 @@ describe Activity do
 end
 
 describe WorkflowClient do
+
   class FakeServiceClient
     attr_accessor :trace
     def respond_decision_task_completed(task_completed_request)
@@ -155,6 +191,7 @@ describe WorkflowClient do
     end
     def register_workflow_type(options)
     end
+
   end
   class TestWorkflow
     extend Decider
@@ -414,6 +451,9 @@ describe "FakeHistory" do
       def start_workflow_execution(options)
         {"runId" => "blah"}
       end
+      def config
+        FakeConfig.new
+      end
     end
 
     class Hash
@@ -1198,17 +1238,6 @@ describe "FakeHistory" do
   end
 
   it "ensures that CompleteWorkflowExecutionFailed is correctly handled" do
-    class FakeAttribute
-      def initialize(data)
-        @data = data
-      end
-      def method_missing(method_name, *args, &block)
-        if @data.keys.include? method_name
-          return @data[method_name]
-        end
-        super
-      end
-    end
 
     class SynchronousWorkflowTaskPoller < WorkflowTaskPoller
       def get_decision_tasks
@@ -1275,6 +1304,139 @@ describe "FakeHistory" do
     worker.start
     swf_client.trace.first[:decisions].first[:decision_type].should == "CompleteWorkflowExecution"
   end
+
+  it "ensures that time outs do not cause problems" do
+    class SynchronousWorkflowTaskPoller < WorkflowTaskPoller
+      def get_decision_tasks
+        fake_workflow_type = FakeWorkflowType.new(nil, "TimeOutWorkflow.entry_point", "1")
+        TestHistoryWrapper.new(fake_workflow_type,
+                               FakeEvents.new(["WorkflowExecutionStarted",
+                                               "DecisionTaskScheduled",
+                                               "DecisionTaskStarted",
+                                               "DecisionTaskCompleted",
+                                               ["StartChildWorkflowExecutionInitiated", {:workflow_id => "child_workflow_test"}],
+                                               ["ChildWorkflowExecutionStarted", {:workflow_execution => FakeWorkflowExecution.new("1", "child_workflow_test"), :workflow_id => "child_workflow_test"}],
+                                               "DecisionTaskScheduled",
+                                               "DecisionTaskStarted",
+                                               ["ChildWorkflowExecutionCompleted", {:workflow_execution => FakeWorkflowExecution.new("1", "child_workflow_test"), :workflow_id => "child_workflow_test"}],
+                                               "DecisionTaskScheduled",
+                                               "DecisionTaskTimedOut",
+                                               "DecisionTaskStarted",
+                                               "DecisionTaskCompleted",
+                                               ["ActivityTaskScheduled", {:activity_id => "Activity1"}],
+                                               "ActivityTaskStarted",
+                                               ["ActivityTaskCompleted", {:scheduled_event_id => 14}],
+                                               "DecisionTaskScheduled",
+                                               "DecisionTaskStarted"
+                                              ]))
+      end
+    end
+    workflow_type_object = double("workflow_type", :name => "TimeOutWorkflow.entry_point", :start_execution => "" )
+
+
+    domain = FakeDomain.new(workflow_type_object)
+    swf_client = FakeServiceClient.new
+    $my_workflow_client  = workflow_client(swf_client, domain) {{:prefix_name => "TimeOutWorkflow", :execution_method => "entry_point", :version => "1"}}
+    class TimeOutActivity
+      extend Activity
+      activity :run_activity1
+      def run_activity1; nil; end
+    end
+    class TimeOutWorkflow
+      extend Workflows
+      workflow(:entry_point) { {:version => "1"} }
+      activity_client(:activity) { {:version => "1", :prefix_name => "TimeOutActivity" } }
+
+      def entry_point
+        $my_workflow_client.start_execution() { {:task_list => "nonsense_task_list", :workflow_id => "child_workflow_test"}}
+        activity_client.run_activity1
+        p "yay"
+      end
+
+    end
+
+    task_list = "TimeOutWorkflow_tasklist"
+    my_workflow_factory = workflow_factory(swf_client, domain) do |options|
+      options.workflow_name = "TimeOutWorkflow"
+      options.execution_start_to_close_timeout = 3600
+      options.task_list = task_list
+    end
+
+    worker = SynchronousWorkflowWorker.new(swf_client, domain, task_list)
+    worker.add_workflow_implementation(TimeOutWorkflow)
+    my_workflow = my_workflow_factory.get_client
+    workflow_execution = my_workflow.start_execution
+    worker.start
+    swf_client.trace.first[:decisions].first[:decision_type].should == "CompleteWorkflowExecution"
+  end
+
+  it "ensures that the other timeout issue is not a problem" do
+    class SynchronousWorkflowTaskPoller < WorkflowTaskPoller
+      def get_decision_tasks
+        fake_workflow_type = FakeWorkflowType.new(nil, "OtherTimeOutWorkflow.entry_point", "1")
+        TestHistoryWrapper.new(fake_workflow_type,
+                               FakeEvents.new(["WorkflowExecutionStarted",
+                                               "DecisionTaskScheduled",
+                                               "DecisionTaskStarted",
+                                               "DecisionTaskCompleted",
+                                               ["ActivityTaskScheduled", {:activity_id => "Activity1"}],
+                                               ["ActivityTaskScheduled", {:activity_id => "Activity2"}],
+                                               "ActivityTaskStarted",
+                                               "ActivityTaskStarted",
+                                               ["ActivityTaskCompleted", {:scheduled_event_id => 5}],
+                                               "DecisionTaskScheduled",
+                                               "DecisionTaskStarted",
+                                               ["ActivityTaskCompleted", {:scheduled_event_id => 6}],
+                                               "DecisionTaskScheduled",
+                                               "DecisionTaskTimedOut",
+                                               "DecisionTaskStarted",
+                                               "DecisionTaskCompleted",
+                                               ["ActivityTaskScheduled", {:activity_id => "Activity3"}],
+                                               "ActivityTaskStarted",
+                                               ["ActivityTaskCompleted", {:scheduled_event_id => 17}],
+                                               "DecisionTaskScheduled",
+                                               "DecisionTaskStarted"
+                                              ]))
+      end
+    end
+    workflow_type_object = double("workflow_type", :name => "OtherTimeOutWorkflow.entry_point", :start_execution => "" )
+    domain = FakeDomain.new(workflow_type_object)
+    swf_client = FakeServiceClient.new
+    $my_workflow_client  = workflow_client(swf_client, domain) {{:prefix_name => "OtherTimeOutWorkflow", :execution_method => "entry_point", :version => "1"}}
+    class OtherTimeOutActivity
+      extend Activity
+      activity :run_activity1
+      def run_activity1; nil; end
+    end
+    class OtherTimeOutWorkflow
+      extend Workflows
+      workflow(:entry_point) { {:version => "1"} }
+      activity_client(:activity) { {:version => "1", :prefix_name => "OtherTimeOutActivity" } }
+
+      def entry_point
+        futures = []
+        futures << activity_client.send_async(:run_activity1)
+        futures << activity_client.send_async(:run_activity1)
+        wait_for_all(futures)
+        activity_client.run_activity1
+      end
+
+    end
+
+    task_list = "OtherTimeOutWorkflow_tasklist"
+    my_workflow_factory = workflow_factory(swf_client, domain) do |options|
+      options.workflow_name = "OtherTimeOutWorkflow"
+      options.execution_start_to_close_timeout = 3600
+      options.task_list = task_list
+    end
+
+    worker = SynchronousWorkflowWorker.new(swf_client, domain, task_list)
+    worker.add_workflow_implementation(OtherTimeOutWorkflow)
+    my_workflow = my_workflow_factory.get_client
+    workflow_execution = my_workflow.start_execution
+    worker.start
+    swf_client.trace.first[:decisions].first[:decision_type].should == "CompleteWorkflowExecution"
+  end
 end
 
 describe "Misc tests" do

data/test/aws/integration_spec.rb

@@ -1007,6 +1007,7 @@ describe "RubyFlowDecider" do
           raise "simulated error"
         end
         def run_activity2
+
         end
       end
       workflow_execution = @my_workflow_client.start_execution
@@ -1014,8 +1015,10 @@ describe "RubyFlowDecider" do
       @activity_worker.run_once
       @worker.run_once
       @worker.run_once
-      workflow_execution.events.map(&:event_type).last.should == "WorkflowExecutionFailed"
-      workflow_execution.events.to_a.length.should == 17
+      history = workflow_execution.events.map(&:event_type)
+      history.last.should == "WorkflowExecutionFailed"
+      # Should look something like: ["WorkflowExecutionStarted", "DecisionTaskScheduled", "DecisionTaskStarted", "DecisionTaskCompleted", "ActivityTaskScheduled", "ActivityTaskScheduled", "ActivityTaskStarted", "ActivityTaskFailed", "DecisionTaskScheduled", "DecisionTaskStarted", "DecisionTaskCompleted", "ActivityTaskCancelRequested", "ActivityTaskCanceled", "DecisionTaskScheduled", "DecisionTaskStarted", "DecisionTaskCompleted", "WorkflowExecutionFailed"]
+      history.should include "ActivityTaskCancelRequested"
     end
 
     it "makes sure that you can use the :exponential_retry key" do
@@ -2285,7 +2288,6 @@ describe "RubyFlowDecider" do
           version "1"
           entry_point :entry_point
           def entry_point
-            "yay"
           end
         end
         worker = WorkflowWorker.new(swf.client, domain, "timeout_test", WorkflowIDWorkflow)
@@ -2529,7 +2531,6 @@ describe "RubyFlowDecider" do
         version "1"
         entry_point :entry_point
         def entry_point
-          "yay"
         end
       end
       worker = WorkflowWorker.new(@swf.client, @domain, "client_test_inheritance", OptionsWorkflow)
@@ -2552,7 +2553,6 @@ describe "RubyFlowDecider" do
         version "1"
         entry_point :entry_point
         def entry_point
-          "yay"
         end
       end
       worker = WorkflowWorker.new(@swf.client, @domain, "client_test_inheritance", OptionsWorkflow)
@@ -2742,7 +2742,7 @@ describe "RubyFlowDecider" do
     class WorkflowWorkflow
       extend Workflows
       workflow(:entry_point) { {:version => "1", :execution_start_to_close_timeout => 3600, :task_list => "test"} }
-      def entry_point; "yay";end
+      def entry_point; ;end
     end
     worker = WorkflowWorker.new(@swf.client, @domain, "test", WorkflowWorkflow)
     worker.register
@@ -2755,7 +2755,7 @@ describe "RubyFlowDecider" do
     class WorkflowWorkflow
       extend Workflows
       workflow(:entry_point) { {:version => "1", :execution_start_to_close_timeout => 3600, :task_list => "test"} }
-      def entry_point; "yay";end
+      def entry_point; ;end
     end
     worker = WorkflowWorker.new(@swf.client, @domain, "Foobarbaz", WorkflowWorkflow)
     worker.register
@@ -2783,7 +2783,7 @@ describe "RubyFlowDecider" do
       extend Workflows
       workflow(:entry_point) { {:version => "1", :execution_start_to_close_timeout => 3600, :task_list => "test"} }
 
-      def entry_point; "yay";end
+      def entry_point; ;end
     end
     worker = WorkflowWorker.new(@swf.client, @domain, "Foobarbaz", WorkflowWorkflow)
     worker.register

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-flow
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk