show vitess_tablets should show new master's timestamp after reparenting

Signed-off-by: deepthi <deepthi@planetscale.com>
vitessio · Jun 10, 2020 · 17ef346 · 17ef346
1 parent 2036988
commit 17ef346
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/examples/local/scripts/vtgate-up.sh b/examples/local/scripts/vtgate-up.sh
@@ -37,7 +37,6 @@ vtgate \
   -cell $cell \
   -cells_to_watch $cell \
   -tablet_types_to_wait MASTER,REPLICA \
-  -gateway_implementation discoverygateway \
   -service_map 'grpc-vtgateservice' \
   -pid_file $VTDATAROOT/tmp/vtgate.pid \
   -mysql_auth_server_impl none \

diff --git a/examples/region_sharding/scripts/vtgate-up.sh b/examples/region_sharding/scripts/vtgate-up.sh
@@ -37,7 +37,6 @@ vtgate \
   -cell $cell \
   -cells_to_watch $cell \
   -tablet_types_to_wait MASTER,REPLICA \
-  -gateway_implementation discoverygateway \
   -service_map 'grpc-vtgateservice' \
   -pid_file $VTDATAROOT/tmp/vtgate.pid \
   -mysql_auth_server_impl none \

diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go
@@ -29,8 +29,6 @@ import (
 	"sync"
 	"time"
 
-	"vitess.io/vitess/go/vt/logutil"
-
 	"vitess.io/vitess/go/vt/log"
 	vtgatepb "vitess.io/vitess/go/vt/proto/vtgate"
 
@@ -991,10 +989,11 @@ func (e *Executor) showTablets() (*sqltypes.Result, error) {
 				if !ts.Serving {
 					state = "NOT_SERVING"
 				}
-				mtst := ts.Tablet.MasterTermStartTime
+				mtst := ts.TabletExternallyReparentedTimestamp
 				mtstStr := ""
-				if mtst != nil && mtst.Seconds > 0 {
-					mtstStr = logutil.ProtoToTime(ts.Tablet.MasterTermStartTime).Format(time.RFC3339)
+				if mtst > 0 {
+					// this code depends on the fact that TabletExternallyReparentedTimestamp is the seconds since epoch start
+					mtstStr = time.Unix(mtst, 0).UTC().Format(time.RFC3339)
 				}
 				rows = append(rows, buildVarCharRow(
 					s.Cell,
@@ -1009,17 +1008,20 @@ func (e *Executor) showTablets() (*sqltypes.Result, error) {
 			}
 		}
 	} else {
+		log.Info("DEBUG: in showTablets")
 		status := e.scatterConn.GetHealthCheckCacheStatus()
 		for _, s := range status {
 			for _, ts := range s.TabletsStats {
 				state := "SERVING"
 				if !ts.Serving {
 					state = "NOT_SERVING"
 				}
-				mtst := ts.Tablet.MasterTermStartTime
+				mtst := ts.MasterTermStartTime
 				mtstStr := ""
-				if mtst != nil && mtst.Seconds > 0 {
-					mtstStr = logutil.ProtoToTime(ts.Tablet.MasterTermStartTime).Format(time.RFC3339)
+				if mtst > 0 {
+					// this code depends on the fact that MasterTermStartTime is the seconds since epoch start
+					mtstStr = time.Unix(mtst, 0).UTC().Format(time.RFC3339)
+					log.Infof("DEBUG: MasterTermStartTime: %v", mtstStr)
 				}
 				rows = append(rows, buildVarCharRow(
 					s.Cell,

diff --git a/go/vt/vttablet/tabletmanager/rpc_replication.go b/go/vt/vttablet/tabletmanager/rpc_replication.go
@@ -532,7 +532,7 @@ func (agent *ActionAgent) setMasterLocked(ctx context.Context, parentAlias *topo
 	tablet := agent.Tablet()
 	if tablet.Type == topodatapb.TabletType_MASTER {
 		tablet.Type = topodatapb.TabletType_REPLICA
-		tablet.MasterTermStartTime = nil
+		agent.setMasterTermStartTime(time.Time{})
 		agent.updateState(ctx, tablet, "setMasterLocked")
 	}