Bugfix: worker should not retry on non err (#908)

cadence-workflow · Jun 28, 2018 · ce946a7 · ce946a7
1 parent ad7b522
commit ce946a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/service/history/historyReplicator.go b/service/history/historyReplicator.go
@@ -154,7 +154,8 @@ func (r *historyReplicator) ApplyEvents(request *h.ReplicateEventsRequest) (retE
 		_, err := context.loadWorkflowExecution()
 		if err == nil {
 			// Workflow execution already exist, looks like a duplicate start event, it is safe to ignore it
-			logger.Info("Dropping stale replication task for start event.")
+			logger.Infof("Dropping stale replication task for start event, DomainID: %v, WorkflowID: %v, RunID: %v.",
+				domainID, execution.GetWorkflowId(), execution.GetRunId())
 			r.metricsClient.IncCounter(metrics.ReplicateHistoryEventsScope, metrics.StaleReplicationEventsCounter)
 			return nil
 		}

diff --git a/service/worker/processor.go b/service/worker/processor.go
@@ -409,6 +409,7 @@ RetryLoop:
 			time.Sleep(retryErrorWaitMillis * time.Millisecond)
 			continue RetryLoop
 		}
+		break RetryLoop
 	}
 	return err
 }