Merge pull request #276 from dtm-labs/alpha

fix TimeoutToFail compensate

dtmsvr/trans_type_saga.go

@@ -187,7 +187,10 @@ func (t *transSagaProcessor) ProcessOnce(branches []TransBranch) error {
 		}
 	}
 	prepareToCompensate := func() {
-		_ = pickToRunActions() // flag started
+		toRun := pickToRunActions()
+		for _, b := range toRun { // flag started
+			branchResults[b].started = true
+		}
 		for i := 1; i < len(branchResults); i += 2 {
 			// these branches may have run. so flag them to status succeed, then run the corresponding
 			// compensate

test/saga_options_test.go

@@ -55,6 +55,7 @@ func TestSagaOptionsTimeout(t *testing.T) {
 	assert.Equal(t, StatusSubmitted, getTransStatus(saga.Gid))
 	cronTransOnceForwardNow(t, gid, 3600)
 	assert.Equal(t, StatusFailed, getTransStatus(saga.Gid))
+	assert.Equal(t, []string{StatusSucceed, StatusPrepared, StatusPrepared, StatusPrepared}, getBranchesStatus(saga.Gid))
 }
 
 func TestSagaGlobalTransWithRequestTimeout(t *testing.T) {