fix reachable bug

Signed-off-by: Tim Vaillancourt <[email protected]>
timvaillancourt · Jan 23, 2025 · a83afbf · a83afbf
1 parent b3c43e5
commit a83afbf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/go/vt/vttablet/tabletserver/health/primary_monitor.go b/go/vt/vttablet/tabletserver/health/primary_monitor.go
@@ -86,11 +86,13 @@ func (pm *TMClientPrimaryMonitor) ping(tmc *grpctmclient.Client, primary *topoda
 
 	ctx, cancel := context.WithTimeout(pm.ctx, PrimaryPingTimeout)
 	defer cancel()
+	var reachable uint32
 	if err := tmc.Ping(ctx, primary); err != nil {
 		log.Errorf("Failed to ping primary %s: %+v", topoproto.TabletAliasString(primary.Alias), err)
-		return
+	} else {
+		reachable = 1
 	}
-	atomic.StoreUint32(&pm.reachable, 1)
+	atomic.StoreUint32(&pm.reachable, reachable)
 }
 
 // poll pings the primary periodically and on-demand when the address changes.

diff --git a/go/vt/vttablet/tabletserver/health/primary_monitor_test.go b/go/vt/vttablet/tabletserver/health/primary_monitor_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
-	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 
+	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	"vitess.io/vitess/go/vt/vttablet/grpctmserver"
 	"vitess.io/vitess/go/vt/vttablet/tmrpctest"
 )