forked from cockroachdb/cockroach
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request cockroachdb#84657 from yuzefovich/backport22.1-84398
release-22.1: colflow: prevent deadlocks when many queries spill to disk at same time
- Loading branch information
Showing
8 changed files
with
179 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // Copyright 2022 The Cockroach Authors. | ||
| // | ||
| // Use of this software is governed by the Business Source License | ||
| // included in the file licenses/BSL.txt. | ||
| // | ||
| // As of the Change Date specified in that file, in accordance with | ||
| // the Business Source License, use of this software will be governed | ||
| // by the Apache License, Version 2.0, included in the file | ||
| // licenses/APL.txt. | ||
|
|
||
| package colflow_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "strconv" | ||
| "strings" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/cockroachdb/cockroach/pkg/base" | ||
| "github.com/cockroachdb/cockroach/pkg/sql/execinfra" | ||
| "github.com/cockroachdb/cockroach/pkg/testutils/skip" | ||
| "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" | ||
| "github.com/cockroachdb/cockroach/pkg/util/cancelchecker" | ||
| "github.com/cockroachdb/cockroach/pkg/util/envutil" | ||
| "github.com/cockroachdb/cockroach/pkg/util/leaktest" | ||
| "github.com/cockroachdb/cockroach/pkg/util/log" | ||
| "github.com/cockroachdb/cockroach/pkg/util/timeutil" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // TestVectorizedFlowDeadlocksWhenSpilling is a regression test for the | ||
| // vectorized flow being deadlocked when multiple operators have to spill to | ||
| // disk exhausting the file descriptor limit. | ||
| func TestVectorizedFlowDeadlocksWhenSpilling(t *testing.T) { | ||
| defer leaktest.AfterTest(t)() | ||
| defer log.Scope(t).Close(t) | ||
|
|
||
| skip.UnderStressRace(t, "the test is too slow under stressrace") | ||
|
|
||
| vecFDsLimit := 8 | ||
| envutil.TestSetEnv(t, "COCKROACH_VEC_MAX_OPEN_FDS", strconv.Itoa(vecFDsLimit)) | ||
| serverArgs := base.TestServerArgs{ | ||
| Knobs: base.TestingKnobs{DistSQL: &execinfra.TestingKnobs{ | ||
| // Set the testing knob so that the first operator to spill would | ||
| // use up the whole FD limit. | ||
| VecFDsToAcquire: vecFDsLimit, | ||
| }}, | ||
| } | ||
| tc := testcluster.StartTestCluster(t, 1, base.TestClusterArgs{ServerArgs: serverArgs}) | ||
| ctx := context.Background() | ||
| defer tc.Stopper().Stop(ctx) | ||
| conn := tc.Conns[0] | ||
|
|
||
| _, err := conn.ExecContext(ctx, "CREATE TABLE t (a, b) AS SELECT i, i FROM generate_series(1, 10000) AS g(i)") | ||
| require.NoError(t, err) | ||
| // Lower the workmem budget so that all buffering operators have to spill to | ||
| // disk. | ||
| _, err = conn.ExecContext(ctx, "SET distsql_workmem = '1KiB'") | ||
| require.NoError(t, err) | ||
| // Allow just one retry to speed up the test. | ||
| _, err = conn.ExecContext(ctx, "SET CLUSTER SETTING sql.distsql.acquire_vec_fds.max_retries = 1") | ||
| require.NoError(t, err) | ||
|
|
||
| queryCtx, queryCtxCancel := context.WithDeadline(ctx, timeutil.Now().Add(10*time.Second)) | ||
| defer queryCtxCancel() | ||
| // Run a query with a hash joiner feeding into a hash aggregator, with both | ||
| // operators spilling to disk. We expect that the hash aggregator won't be | ||
| // able to spill though since the FD limit has been used up, and we'd like | ||
| // to see the query timing out (when acquiring the file descriptor quota) | ||
| // rather than being canceled due to the context deadline. | ||
| query := "SELECT max(a) FROM (SELECT t1.a, t1.b FROM t AS t1 INNER HASH JOIN t AS t2 ON t1.a = t2.b) GROUP BY b" | ||
| _, err = conn.ExecContext(queryCtx, query) | ||
| // We expect an error that is different from the query cancellation (which | ||
| // is what SQL layer returns on a context cancellation). | ||
| require.NotNil(t, err) | ||
| require.False(t, strings.Contains(err.Error(), cancelchecker.QueryCanceledError.Error())) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters