Skip to content

increased timeout of tablet status check #5643

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
morgo merged 1 commit into from
Jan 2, 2020
Merged

increased timeout of tablet status check #5643

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
8 changes: 4 additions & 4 deletions go/test/endtoend/backup/backup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func TestMasterBackup(t *testing.T) {
assert.Nil(t, err)

restoreWaitForBackup(t, "replica")
err = replica2.VttabletProcess.WaitForTabletTypesForTimeout([]string{"SERVING"}, 15*time.Second)
err = replica2.VttabletProcess.WaitForTabletTypesForTimeout([]string{"SERVING"}, 25*time.Second)
assert.Nil(t, err)

cluster.VerifyRowsInTablet(t, replica2, keyspaceName, 2)
Expand Down Expand Up @@ -110,7 +110,7 @@ func TestMasterReplicaSameBackup(t *testing.T) {

// now bring up the other replica, letting it restore from backup.
restoreWaitForBackup(t, "replica")
err = replica2.VttabletProcess.WaitForTabletTypesForTimeout([]string{"SERVING"}, 15*time.Second)
err = replica2.VttabletProcess.WaitForTabletTypesForTimeout([]string{"SERVING"}, 25*time.Second)
assert.Nil(t, err)

// check the new replica has the data
Expand Down Expand Up @@ -325,7 +325,7 @@ func testBackup(t *testing.T, tabletType string) {
_, err = master.VttabletProcess.QueryTablet("insert into vt_insert_test (msg) values ('test2')", keyspaceName, true)
assert.Nil(t, err)

err = replica2.VttabletProcess.WaitForTabletTypesForTimeout([]string{"SERVING"}, 15*time.Second)
err = replica2.VttabletProcess.WaitForTabletTypesForTimeout([]string{"SERVING"}, 25*time.Second)
assert.Nil(t, err)
cluster.VerifyRowsInTablet(t, replica2, keyspaceName, 2)

Expand Down Expand Up @@ -396,7 +396,7 @@ func verifyRestoreTablet(t *testing.T, tablet *cluster.Vttablet, status string)
err := tablet.VttabletProcess.Setup()
assert.Nil(t, err)
if status != "" {
err = tablet.VttabletProcess.WaitForTabletTypesForTimeout([]string{status}, 15*time.Second)
err = tablet.VttabletProcess.WaitForTabletTypesForTimeout([]string{status}, 25*time.Second)
assert.Nil(t, err)
}

Expand Down