Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[10.0] Update healthy tablets correctly for primary down #7937

Merged
merged 2 commits into from
Apr 23, 2021
Merged

[10.0] Update healthy tablets correctly for primary down #7937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0353021
Check tablet alias before removing after error stream
5antelope Apr 21, 2021
a7cfe60
Only modify healthy map
5antelope Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions go/vt/discovery/healthcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,14 @@ func (hc *HealthCheckImpl) updateHealth(th *TabletHealth, prevTarget *query.Targ
}
}
case isPrimary && !isPrimaryUp:
// No healthy master tablet
hc.healthy[targetKey] = []*TabletHealth{}
if healthy, ok := hc.healthy[targetKey]; ok && len(healthy) > 0 {
// isPrimary is true here therefore we should only have 1 tablet in healthy
alias := tabletAliasString(topoproto.TabletAliasString(healthy[0].Tablet.Alias))
// Clear healthy list for primary if the existing tablet is down
if alias == tabletAlias {
hc.healthy[targetKey] = []*TabletHealth{}
}
}
}

if !trivialUpdate {
Expand Down
78 changes: 78 additions & 0 deletions go/vt/discovery/healthcheck_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,84 @@ func TestHealthCheckErrorOnPrimary(t *testing.T) {
assert.Empty(t, a, "wrong result, expected empty list")
}

func TestHealthCheckErrorOnPrimaryAfterExternalReparent(t *testing.T) {
ts := memorytopo.NewServer("cell")
hc := createTestHc(ts)
defer hc.Close()

resultChan := hc.Subscribe()

tablet1 := createTestTablet(0, "cell", "a")
input1 := make(chan *querypb.StreamHealthResponse)
fc1 := createFakeConn(tablet1, input1)
fc1.errCh = make(chan error)
hc.AddTablet(tablet1)
<-resultChan

tablet2 := createTestTablet(1, "cell", "b")
tablet2.Type = topodatapb.TabletType_REPLICA
input2 := make(chan *querypb.StreamHealthResponse)
createFakeConn(tablet2, input2)
hc.AddTablet(tablet2)
<-resultChan

shr2 := &querypb.StreamHealthResponse{
TabletAlias: tablet2.Alias,
Target: &querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_REPLICA},
Serving: true,
TabletExternallyReparentedTimestamp: 0,
RealtimeStats: &querypb.RealtimeStats{SecondsBehindMaster: 10, CpuUsage: 0.2},
}
input2 <- shr2
<-resultChan
shr1 := &querypb.StreamHealthResponse{
TabletAlias: tablet1.Alias,
Target: &querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_MASTER},
Serving: true,
TabletExternallyReparentedTimestamp: 10,
RealtimeStats: &querypb.RealtimeStats{SecondsBehindMaster: 0, CpuUsage: 0.2},
}
input1 <- shr1
<-resultChan
// tablet 1 is the primary now
health := []*TabletHealth{{
Tablet: tablet1,
Target: &querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_MASTER},
Serving: true,
Stats: &querypb.RealtimeStats{SecondsBehindMaster: 0, CpuUsage: 0.2},
MasterTermStartTime: 10,
}}
a := hc.GetHealthyTabletStats(&querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_MASTER})
mustMatch(t, health, a, "unexpected result")

shr2 = &querypb.StreamHealthResponse{
TabletAlias: tablet2.Alias,
Target: &querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_MASTER},
Serving: true,
TabletExternallyReparentedTimestamp: 20,
RealtimeStats: &querypb.RealtimeStats{SecondsBehindMaster: 0, CpuUsage: 0.2},
}
input2 <- shr2
<-resultChan
// reparent: tablet 2 is the primary now
health = []*TabletHealth{{
Tablet: tablet2,
Target: &querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_MASTER},
Serving: true,
Stats: &querypb.RealtimeStats{SecondsBehindMaster: 0, CpuUsage: 0.2},
MasterTermStartTime: 20,
}}
a = hc.GetHealthyTabletStats(&querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_MASTER})
mustMatch(t, health, a, "unexpected result")

// Stream error from tablet 1
fc1.errCh <- fmt.Errorf("some stream error")
<-resultChan
// tablet 2 should still be the master
a = hc.GetHealthyTabletStats(&querypb.Target{Keyspace: "k", Shard: "s", TabletType: topodatapb.TabletType_MASTER})
mustMatch(t, health, a, "unexpected result")
}

func TestHealthCheckVerifiesTabletAlias(t *testing.T) {
ts := memorytopo.NewServer("cell")
hc := createTestHc(ts)
Expand Down