feat: impl role listener

wesql · Dec 22, 2023 · 9bd78dc · 9bd78dc
1 parent 90859a5
commit 9bd78dc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/go/vt/vttablet/tabletmanager/tm_init.go b/go/vt/vttablet/tabletmanager/tm_init.go
@@ -385,8 +385,15 @@ func (tm *TabletManager) Start(tablet *topodatapb.Tablet, healthCheckInterval ti
 		servenv.OnTerm(tm.VDiffEngine.Close)
 	}
 
-	tm.roleListener = role.NewListener(func(ctx context.Context, tabletType topodatapb.TabletType) {
-		tm.ChangeType(ctx, tabletType, false)
+	tm.roleListener = role.NewListener(func(ctx context.Context, tabletType topodatapb.TabletType) (bool, error) {
+		if tm.Tablet().Type == tabletType {
+			return false, nil
+		}
+		err := tm.ChangeType(ctx, tabletType, false)
+		if err != nil {
+			return false, err
+		}
+		return true, nil
 	})
 	servenv.OnRun(tm.roleListener.Open)
 	servenv.OnTerm(tm.roleListener.Close)

diff --git a/go/vt/vttablet/tabletserver/role/listener.go b/go/vt/vttablet/tabletserver/role/listener.go
@@ -87,10 +87,10 @@ type Listener struct {
 	stateMutex     sync.Mutex
 	reconcileMutex sync.Mutex
 
-	changeTypeFunc func(ctx context.Context, tabletType topodatapb.TabletType)
+	changeTypeFunc func(ctx context.Context, tabletType topodatapb.TabletType) (bool, error)
 }
 
-func NewListener(changeTypeFunc func(ctx context.Context, tabletType topodatapb.TabletType)) *Listener {
+func NewListener(changeTypeFunc func(ctx context.Context, tabletType topodatapb.TabletType) (bool, error)) *Listener {
 	l := &Listener{
 		isOpen:         0,
 		changeTypeFunc: changeTypeFunc,
@@ -185,7 +185,13 @@ func (collector *Listener) reconcileLeadership(ctx context.Context) {
 	case topodatapb.TabletType_PRIMARY, topodatapb.TabletType_REPLICA, topodatapb.TabletType_RDONLY:
 		changeTypeCtx, cancel := context.WithTimeout(context.Background(), topo.RemoteOperationTimeout)
 		defer cancel()
-		collector.changeTypeFunc(changeTypeCtx, tabletType)
+		changed, err := collector.changeTypeFunc(changeTypeCtx, tabletType)
+		if err != nil {
+			log.Error("change vttablet role to %s error", tabletType.String())
+		}
+		if changed {
+			log.Infof("change vttablet role to %s successfully", tabletType.String())
+		}
 	default:
 		log.Error("role value is not a string, role:%v", role)
 	}