Revert "abort lock table when tn restart (#20915)"

pkg/lockservice/lock_table_allocator.go

@@ -117,15 +117,12 @@ func (l *lockTableAllocator) Get(
 	return l.registerBind(binds, group, tableID, originTableID, sharding)
 }
 
-func (l *lockTableAllocator) KeepLockTableBind(
-	serviceID string,
-	version uint64,
-) bool {
+func (l *lockTableAllocator) KeepLockTableBind(serviceID string) bool {
 	b := l.getServiceBinds(serviceID)
 	if b == nil {
 		return false
 	}
-	return b.active() && (version == 0 || version == l.version)
+	return b.active()
 }
 
 func (l *lockTableAllocator) AddCannotCommit(values []pb.OrphanTxn) [][]byte {
@@ -838,16 +835,12 @@ func (l *lockTableAllocator) handleKeepLockTableBind(
 	req *pb.Request,
 	resp *pb.Response,
 	cs morpc.ClientSession) {
-	resp.KeepLockTableBind.OK = l.KeepLockTableBind(
-		req.KeepLockTableBind.ServiceID,
-		req.KeepLockTableBind.Version,
-	)
+	resp.KeepLockTableBind.OK = l.KeepLockTableBind(req.KeepLockTableBind.ServiceID)
 	if !resp.KeepLockTableBind.OK {
 		// resp.KeepLockTableBind.Status = pb.Status_ServiceCanRestart
 		writeResponse(l.logger, cancel, resp, nil, cs)
 		return
 	}
-	resp.KeepLockTableBind.Version = l.version
 	b := l.getServiceBinds(req.KeepLockTableBind.ServiceID)
 	if b.isStatus(pb.Status_ServiceLockEnable) {
 		if req.KeepLockTableBind.Status != pb.Status_ServiceLockEnable {

pkg/lockservice/lock_table_allocator_test.go

@@ -201,9 +201,7 @@ func TestKeepaliveBind(t *testing.T) {
 				time.Sleep(time.Millisecond * 20)
 			}
 
-			assert.True(t, a.KeepLockTableBind("s1", 0))
-
-			assert.False(t, a.KeepLockTableBind("s1", 1))
+			assert.True(t, a.KeepLockTableBind("s1"))
 		})
 }
 

pkg/lockservice/lock_table_keeper.go

@@ -184,7 +184,6 @@ func (k *lockTableKeeper) doKeepLockTableBind(ctx context.Context) {
 	req.Method = pb.Method_KeepLockTableBind
 	req.KeepLockTableBind.ServiceID = k.serviceID
 	req.KeepLockTableBind.Status = k.service.getStatus()
-	req.KeepLockTableBind.Version = k.service.tnVersion
 	if !k.service.isStatus(pb.Status_ServiceLockEnable) {
 		req.KeepLockTableBind.LockTables = k.service.topGroupTables()
 		req.KeepLockTableBind.TxnIDs = k.service.activeTxnHolder.getAllTxnID()
@@ -201,7 +200,6 @@ func (k *lockTableKeeper) doKeepLockTableBind(ctx context.Context) {
 	defer releaseResponse(resp)
 
 	if resp.KeepLockTableBind.OK {
-		k.service.tnVersion = resp.KeepLockTableBind.Version
 		switch resp.KeepLockTableBind.Status {
 		case pb.Status_ServiceLockEnable:
 			if !k.service.isStatus(pb.Status_ServiceLockEnable) {

pkg/lockservice/service.go

@@ -56,7 +56,6 @@ type service struct {
 	stopOnce             sync.Once
 	fetchWhoWaitingListC chan who
 	logger               *log.MOLogger
-	tnVersion            uint64
 
 	remote struct {
 		client Client
@@ -97,7 +96,6 @@ func NewLockService(
 			stopper.WithLogger(getLogger(cfg.ServiceID).RawLogger())),
 		fetchWhoWaitingListC: make(chan who, 10240),
 		logger:               getLogger(cfg.ServiceID),
-		tnVersion:            0,
 	}
 
 	for _, opt := range opts {

pkg/lockservice/types.go

@@ -182,7 +182,7 @@ type LockTableAllocator interface {
 	// KeepLockTableBind once a cn is bound to a Table, a heartbeat needs to be sent
 	// periodically to keep the binding in place. If no heartbeat is sent for a long
 	// period of time to maintain the binding, the binding will become invalid.
-	KeepLockTableBind(serviceID string, version uint64) bool
+	KeepLockTableBind(serviceID string) bool
 	// Valid check for changes in the binding relationship of a specific lock-table.
 	Valid(serviceID string, txnID []byte, binds []pb.LockTable) ([]uint64, error)
 	// AddCannotCommit add cannot commit txn.