timer duration change and loose deterministic check (#342)

* timer duration change and loose deterministic check

* update doc for Sleep() and NewTimer()

Author: yiminc

internal/internal_event_handlers.go

@@ -25,6 +25,7 @@ package internal
 import (
 	"errors"
 	"fmt"
+	"math"
 	"time"
 
 	"github.com/uber-go/tally"
@@ -327,15 +328,15 @@ func (wc *workflowEnvironmentImpl) NewTimer(d time.Duration, callback resultHand
 		callback(nil, fmt.Errorf("negative duration provided %v", d))
 		return nil
 	}
-	if d.Seconds() == 0 {
+	if d == 0 {
 		callback(nil, nil)
 		return nil
 	}
 
 	timerID := wc.GenerateSequenceID()
 	startTimerAttr := &m.StartTimerDecisionAttributes{}
 	startTimerAttr.TimerId = common.StringPtr(timerID)
-	startTimerAttr.StartToFireTimeoutSeconds = common.Int64Ptr(int64(d.Seconds()))
+	startTimerAttr.StartToFireTimeoutSeconds = common.Int64Ptr(int64(math.Ceil(d.Seconds())))
 
 	decision := wc.decisionsHelper.startTimer(startTimerAttr)
 	decision.setData(&scheduledTimer{callback: callback})

internal/internal_task_handlers.go

@@ -28,6 +28,7 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
+	"strings"
 	"sync"
 	"time"
 
@@ -719,6 +720,14 @@ matchLoop:
 	return nil
 }
 
+func lastPartOfActivityName(name string) string {
+	lastDotIdx := strings.LastIndex(name, ".")
+	if lastDotIdx < 0 || lastDotIdx == len(name)-1 {
+		return name
+	}
+	return name[lastDotIdx+1:]
+}
+
 func isDecisionMatchEvent(d *s.Decision, e *s.HistoryEvent, strictMode bool) bool {
 	switch d.GetDecisionType() {
 	case s.DecisionTypeScheduleActivityTask:
@@ -729,7 +738,7 @@ func isDecisionMatchEvent(d *s.Decision, e *s.HistoryEvent, strictMode bool) boo
 		decisionAttributes := d.ScheduleActivityTaskDecisionAttributes
 
 		if eventAttributes.GetActivityId() != decisionAttributes.GetActivityId() ||
-			eventAttributes.ActivityType.GetName() != decisionAttributes.ActivityType.GetName() ||
+			lastPartOfActivityName(eventAttributes.ActivityType.GetName()) != lastPartOfActivityName(decisionAttributes.ActivityType.GetName()) ||
 			(strictMode && eventAttributes.TaskList.GetName() != decisionAttributes.TaskList.GetName()) ||
 			(strictMode && bytes.Compare(eventAttributes.Input, decisionAttributes.Input) != 0) {
 			return false
@@ -758,7 +767,7 @@ func isDecisionMatchEvent(d *s.Decision, e *s.HistoryEvent, strictMode bool) boo
 		decisionAttributes := d.StartTimerDecisionAttributes
 
 		if eventAttributes.GetTimerId() != decisionAttributes.GetTimerId() ||
-			eventAttributes.GetStartToFireTimeoutSeconds() != decisionAttributes.GetStartToFireTimeoutSeconds() {
+			(strictMode && eventAttributes.GetStartToFireTimeoutSeconds() != decisionAttributes.GetStartToFireTimeoutSeconds()) {
 			return false
 		}
 

internal/internal_task_handlers_test.go

@@ -346,7 +346,7 @@ func (t *TaskHandlersTestSuite) TestWorkflowTask_NondeterministicDetection() {
 		createTestEventWorkflowExecutionStarted(1, &s.WorkflowExecutionStartedEventAttributes{TaskList: &s.TaskList{Name: &taskList}}),
 		createTestEventActivityTaskScheduled(2, &s.ActivityTaskScheduledEventAttributes{
 			ActivityId:   common.StringPtr("0"),
-			ActivityType: &s.ActivityType{Name: common.StringPtr("Greeter_Activity")},
+			ActivityType: &s.ActivityType{Name: common.StringPtr("pkg.Greeter_Activity")},
 			TaskList:     &s.TaskList{Name: &taskList},
 		}),
 	}
@@ -370,6 +370,13 @@ func (t *TaskHandlersTestSuite) TestWorkflowTask_NondeterministicDetection() {
 	t.Error(err)
 	t.Nil(request)
 	t.Contains(err.Error(), "nondeterministic")
+
+	// now with different package name to activity type
+	testEvents[1].ActivityTaskScheduledEventAttributes.ActivityType.Name = common.StringPtr("new-package.Greeter_Activity")
+	task = createWorkflowTask(testEvents, 2, "HelloWorld_Workflow")
+	request, _, err = taskHandler.ProcessWorkflowTask(task, nil, false)
+	t.NoError(err)
+	t.NotNil(request)
 }
 
 func (t *TaskHandlersTestSuite) TestWorkflowTask_CancelActivityBeforeSent() {

internal/workflow.go

@@ -433,7 +433,8 @@ func Now(ctx Context) time.Time {
 // this NewTimer() to get the timer instead of the Go lang library one(timer.NewTimer()). You can cancel the pending
 // timer by cancel the Context (using context from workflow.WithCancel(ctx)) and that will cancel the timer. After timer
 // is canceled, the returned Future become ready, and Future.Get() will return *CanceledError.
-// The current timer resolution implementation is in seconds but is subjected to change.
+// The current timer resolution implementation is in seconds and uses math.Ceil(d.Seconds()) as the duration. But is
+// subjected to change in the future.
 func NewTimer(ctx Context, d time.Duration) Future {
 	future, settable := NewFuture(ctx)
 	if d <= 0 {
@@ -465,7 +466,8 @@ func NewTimer(ctx Context, d time.Duration) Future {
 // Sleep() returns nil if the duration d is passed, or it returns *CanceledError if the ctx is canceled. There are 2
 // reasons the ctx could be canceled: 1) your workflow code cancel the ctx (with workflow.WithCancel(ctx));
 // 2) your workflow itself is canceled by external request.
-// The current timer resolution implementation is in seconds but is subjected to change.
+// The current timer resolution implementation is in seconds and uses math.Ceil(d.Seconds()) as the duration. But is
+// subjected to change in the future.
 func Sleep(ctx Context, d time.Duration) (err error) {
 	t := NewTimer(ctx, d)
 	err = t.Get(ctx, nil)

workflow/deterministic_wrappers.go

@@ -104,7 +104,8 @@ func Now(ctx Context) time.Time {
 // this NewTimer() to get the timer instead of the Go lang library one(timer.NewTimer()). You can cancel the pending
 // timer by cancel the Context (using context from workflow.WithCancel(ctx)) and that will cancel the timer. After timer
 // is canceled, the returned Future become ready, and Future.Get() will return *CanceledError.
-// The current timer resolution implementation is in seconds but is subjected to change.
+// The current timer resolution implementation is in seconds and uses math.Ceil(d.Seconds()) as the duration. But is
+// subjected to change in the future.
 func NewTimer(ctx Context, d time.Duration) Future {
 	return internal.NewTimer(ctx, d)
 }
@@ -115,7 +116,8 @@ func NewTimer(ctx Context, d time.Duration) Future {
 // Sleep() returns nil if the duration d is passed, or it returns *CanceledError if the ctx is canceled. There are 2
 // reasons the ctx could be canceled: 1) your workflow code cancel the ctx (with workflow.WithCancel(ctx));
 // 2) your workflow itself is canceled by external request.
-// The current timer resolution implementation is in seconds but is subjected to change.
+// The current timer resolution implementation is in seconds and uses math.Ceil(d.Seconds()) as the duration. But is
+// subjected to change in the future.
 func Sleep(ctx Context, d time.Duration) (err error) {
 	return internal.Sleep(ctx, d)
 }