fix: fix global session timeout calculate (#118)

CECTC · May 30, 2022 · bf3b084 · bf3b084
1 parent 9eff19f
commit bf3b084
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/pkg/dt/distributed_transaction_manger.go b/pkg/dt/distributed_transaction_manger.go
@@ -231,7 +231,13 @@ func (manager *DistributedTransactionManager) processGlobalSessions() error {
 					return err
 				}
 			}
-			manager.globalSessionQueue.AddAfter(gs, time.Duration(misc.CurrentTimeMillis()-uint64(gs.BeginTime))*time.Millisecond)
+
+			delayAt := uint64(gs.Timeout) - (misc.CurrentTimeMillis() - uint64(gs.BeginTime))
+			if delayAt > 0 {
+				manager.globalSessionQueue.AddAfter(gs, time.Duration(delayAt))
+			} else {
+				manager.globalSessionQueue.Add(gs)
+			}
 		}
 		if gs.Status == api.Committing || gs.Status == api.Rollbacking {
 			bsKeys, err := manager.storageDriver.GetBranchSessionKeys(context.Background(), gs.XID)

diff --git a/pkg/dt/undolog/table_records.pb.go b/pkg/dt/undolog/table_records.pb.go
diff --git a/pkg/dt/undolog/undo_log.pb.go b/pkg/dt/undolog/undo_log.pb.go