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

Reduce wait time in test helpers #14476

Merged
merged 4 commits into from
Nov 15, 2023
+48 −10
Merged

Reduce wait time in test helpers #14476

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7303a5
Reduce wait time in test helpers
dbussink Nov 6, 2023
9137143
Merge remote-tracking branch 'upstream/main' into dbussink/improve-te…
GuptaManan100 Nov 13, 2023
64124f7
feat: wait for table to be dropped
GuptaManan100 Nov 15, 2023
9cd716f
feat: use a singe timeout for all the deletions
GuptaManan100 Nov 15, 2023
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
29 changes: 19 additions & 10 deletions go/test/endtoend/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,16 +236,17 @@ func WaitForAuthoritative(t *testing.T, ks, tbl string, readVSchema func() (*int
case <-timeout:
return fmt.Errorf("schema tracking didn't mark table t2 as authoritative until timeout")
default:
time.Sleep(1 * time.Second)
res, err := readVSchema()
require.NoError(t, err, res)
t2Map := getTableT2Map(res, ks, tbl)
authoritative, fieldPresent := t2Map["column_list_authoritative"]
if !fieldPresent {
time.Sleep(100 * time.Millisecond)
continue
}
authoritativeBool, isBool := authoritative.(bool)
if !isBool || !authoritativeBool {
time.Sleep(100 * time.Millisecond)
continue
}
return nil
Expand All @@ -262,18 +263,19 @@ func WaitForKsError(t *testing.T, vtgateProcess cluster.VtgateProcess, ks string
t.Fatalf("schema tracking did not find error in '%s'", ks)
return ""
default:
time.Sleep(1 * time.Second)
res, err := vtgateProcess.ReadVSchema()
require.NoError(t, err, res)
kss := convertToMap(*res)["keyspaces"]
ksMap := convertToMap(convertToMap(kss)[ks])
ksErr, fieldPresent := ksMap["error"]
if !fieldPresent {
break
time.Sleep(100 * time.Millisecond)
continue
}
errString, isErr := ksErr.(string)
if !isErr {
break
time.Sleep(100 * time.Millisecond)
continue
}
return errString
}
Expand All @@ -288,25 +290,28 @@ func WaitForColumn(t *testing.T, vtgateProcess cluster.VtgateProcess, ks, tbl, c
case <-timeout:
return fmt.Errorf("schema tracking did not find column '%s' in table '%s'", col, tbl)
default:
time.Sleep(1 * time.Second)
res, err := vtgateProcess.ReadVSchema()
require.NoError(t, err, res)
t2Map := getTableT2Map(res, ks, tbl)
authoritative, fieldPresent := t2Map["column_list_authoritative"]
if !fieldPresent {
break
time.Sleep(100 * time.Millisecond)
continue
}
authoritativeBool, isBool := authoritative.(bool)
if !isBool || !authoritativeBool {
break
time.Sleep(100 * time.Millisecond)
continue
}
colMap, exists := t2Map["columns"]
if !exists {
break
time.Sleep(100 * time.Millisecond)
continue
}
colList, isSlice := colMap.([]interface{})
if !isSlice {
break
time.Sleep(100 * time.Millisecond)
continue
}
for _, c := range colList {
colDef, isMap := c.(map[string]interface{})
Expand All @@ -317,6 +322,7 @@ func WaitForColumn(t *testing.T, vtgateProcess cluster.VtgateProcess, ks, tbl, c
return nil
}
}
time.Sleep(100 * time.Millisecond)
}
}
}
Expand All @@ -330,7 +336,10 @@ func getTableT2Map(res *interface{}, ks, tbl string) map[string]interface{} {
}

func convertToMap(input interface{}) map[string]interface{} {
output := input.(map[string]interface{})
output, ok := input.(map[string]interface{})
if !ok {
return make(map[string]interface{})
}
return output
}

Expand Down
Loading