Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
63852: server: skip TestTelemetrySQLStatsIndependence r=tbg a=knz

This test flakes if the reg server is temporarily unavailable.

Informs  cockroachdb#63844, cockroachdb#63851,  cockroachdb#63848

63854: sqlsmith: don't use crdb_internal.create_join_token r=yuzefovich a=yuzefovich

This is an internal builtin, and we probably don't get much when using
it in the sqlsmith. Currently this builtin occasionally leads to an
internal error.

Addresses: cockroachdb#63819.

Release note: None

Co-authored-by: Raphael 'kena' Poss <[email protected]>
Co-authored-by: Yahor Yuzefovich <[email protected]>
  • Loading branch information
3 people committed Apr 19, 2021
3 parents b8553b7 + 51a879c + fe12893 commit cc35207
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/internal/sqlsmith/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,8 @@ var functions = func() map[tree.FunctionClass]map[oid.Oid][]function {
continue
}
if strings.Contains(def.Name, "crdb_internal.force_") ||
strings.Contains(def.Name, "crdb_internal.unsafe_") {
strings.Contains(def.Name, "crdb_internal.unsafe_") ||
strings.Contains(def.Name, "crdb_internal.create_join_token") {
continue
}
if _, ok := m[def.Class]; !ok {
Expand Down
7 changes: 7 additions & 0 deletions pkg/server/stats_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/tests"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/cockroach/pkg/util/log"
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
Expand All @@ -37,6 +38,12 @@ import (
func TestTelemetrySQLStatsIndependence(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

// This test fails if the central reporting server from CRL
// breaks. It should be improved to customize the reporting URL and
// mock the registration collector with an in-memory server.
skip.WithIssue(t, 63851)

ctx := context.Background()
params, _ := tests.CreateTestServerParams()
s, sqlDB, _ := serverutils.StartServer(t, params)
Expand Down

0 comments on commit cc35207

Please sign in to comment.