Skip to content

storage: deflake TestNodeLivenessStatusMap #36952

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

Merged
craig merged 1 commit into from
Apr 24, 2019
Merged

storage: deflake TestNodeLivenessStatusMap #36952

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 15 additions & 17 deletions pkg/storage/node_liveness_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,21 +855,23 @@ func TestNodeLivenessStatusMap(t *testing.T) {
// See what comes up in the status.
callerNodeLiveness := firstServer.GetNodeLiveness()

type expectedStatus struct {
type testCase struct {
nodeID roachpb.NodeID
expectedStatus storagepb.NodeLivenessStatus
}
testData := []expectedStatus{

// Below we're going to check that all statuses converge and stabilize
// to a known situation.
testData := []testCase{
{liveNodeID, storagepb.NodeLivenessStatus_LIVE},
{deadNodeID, storagepb.NodeLivenessStatus_DEAD},
{decommissioningNodeID, storagepb.NodeLivenessStatus_DECOMMISSIONING},
{removedNodeID, storagepb.NodeLivenessStatus_DECOMMISSIONED},
}

for _, test := range testData {
t.Run(test.expectedStatus.String(), func(t *testing.T) {
t.Run(fmt.Sprintf("n%d->%s", test.nodeID, test.expectedStatus), func(t *testing.T) {
nodeID, expectedStatus := test.nodeID, test.expectedStatus
t.Parallel()

testutils.SucceedsSoon(t, func() error {
// Ensure that dead nodes are quickly recognized as dead by
Expand All @@ -882,21 +884,17 @@ func TestNodeLivenessStatusMap(t *testing.T) {
storage.TimeUntilStoreDead.Override(&firstServer.ClusterSettings().SV,
storage.TestTimeUntilStoreDead)

log.Infof(ctx, "checking expected status for node %d", nodeID)
log.Infof(ctx, "checking expected status (%s) for node %d", expectedStatus, nodeID)
nodeStatuses := callerNodeLiveness.GetLivenessStatusMap()
if st, ok := nodeStatuses[nodeID]; !ok {
return fmt.Errorf("%s node not in statuses", expectedStatus)
} else {
if st != expectedStatus {
if expectedStatus == storagepb.NodeLivenessStatus_DECOMMISSIONING && st == storagepb.NodeLivenessStatus_DECOMMISSIONED {
// Server somehow shut down super-fast. Tolerating the mismatch.
return nil
}
return fmt.Errorf("unexpected status: got %s, expected %s",
st, expectedStatus)
}
st, ok := nodeStatuses[nodeID]
if !ok {
return errors.Errorf("node %d: not in statuses\n", nodeID)
}
if st != expectedStatus {
return errors.Errorf("node %d: unexpected status: got %s, expected %s\n",
nodeID, st, expectedStatus,
)
}
log.Infof(ctx, "node %d status ok", nodeID)
return nil
})
})
Expand Down