Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/buildomat/jobs/test-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#:
#: name = "test-linux"
#: variety = "basic"
#: target = "ubuntu-22.04-large"
#: target = "ubuntu-22.04"

set -o errexit
set -o pipefail
Expand Down
1 change: 1 addition & 0 deletions pkg/cli/democluster/demo_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ func TestTransientClusterSimulateLatencies(t *testing.T) {
// Set up an empty 9-node cluster with simulated latencies.
demoCtx.SimulateLatency = true
demoCtx.NumNodes = 9
demoCtx.Localities = defaultLocalities
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really sure why this fixes things and it kind of pisses me off. Best I can tell this ends up being nil if it's not set, so maybe this test never worked properly and any simulated latencies were an accident?


certsDir, err := ioutil.TempDir("", "cli-demo-test")
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion pkg/rpc/nodedialer/nodedialer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func TestConnHealthTryDial(t *testing.T) {
require.NoError(t, ln.popConn().Close())
require.Eventually(t, func() bool {
return nd.ConnHealthTryDial(staticNodeID, rpc.DefaultClass) == nil
}, time.Second, 10*time.Millisecond)
}, 5*time.Second, 10*time.Millisecond)
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Closing the connection pops the breaker. The lines just above this allow 5 seconds for a popped breaker to recover. So why not here?

}

func TestConnHealthInternal(t *testing.T) {
Expand Down
7 changes: 0 additions & 7 deletions pkg/sql/conn_executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1364,13 +1364,6 @@ ALTER TABLE t1 ADD COLUMN b INT DEFAULT 1`,
t.Fatalf("unexpected post commit jobs latency: %v", postCommitJobsInterval.AsFloat64())
}

if tc.expectNonTrivialSchemaChangeTime && postCommitJobsInterval.AsFloat64() < 0.1 {
t.Fatalf(
"expected schema changes to take longer than 0.1 seconds, took: %v",
postCommitJobsInterval.AsFloat64(),
)
}

Comment on lines -1367 to -1373
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failing the test because it took less than 100ms to insert and alter 10,000 rows is ridiculous. I think the expectNonTrivialSchemaChangeTime is really meant to make sure that the other queries don't take too long, not to make sure that this query takes long enough...

if rows.Next() {
t.Fatalf("unexpected number of rows returned by last query statistics: %v", err)
}
Expand Down
Loading