Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
64029: roachprod: remove support for spinning up cassandra clusters r=jlinder a=alan-mas

When working on #47567, we discovered that the cassandra cluster support is no longer used and can be removed. This commit removes cassandra cluster support. 

Release note: None

65705: settings: mark diagnostics.forced_stat_reset.interval as retired r=otan a=rafiss

It was removed in ac3c723 but was never
added to this list. This prevents noise in the logs when trying to read
the old setting name.

Release note: None

65732: bazel: exclude `_bazel` from consideration by gazelle r=rail a=rickystewart

tests. Since then, we've seen `gazelle` occasionally time out lint jobs
in CI (see #65715). The error messages don't make a great deal of sense;
a bunch of them look like this:

    gazelle: found packages exports (exports.go) and p (issue20046.go) in /go/src/github.com/cockroachdb/cockroach/_bazel/bin/pkg/testutils/lint/passes/forbiddenmethod/forbiddenmethod_test_/forbiddenmethod_test.runfiles/go_sdk/src/go/internal/gcimporter/testdata

i.e., Gazelle is looking in `_bazel/bin`, finding `testdata` for the
`go/internal/gcimporter` package in the `go_sdk`, and complaining about
the results. So we add `_bazel` to the list of `exclude`s to prevent
this. This is necessary according to
bazel-contrib/bazel-gazelle#168.

Release note: None

Co-authored-by: Alanmas <[email protected]>
Co-authored-by: Rafi Shamim <[email protected]>
Co-authored-by: Ricky Stewart <[email protected]>
  • Loading branch information
4 people committed May 26, 2021
4 parents 821d315 + 0ca24f6 + accc415 + 5fd3c9a commit 3322dfc
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 1,638 deletions.
3 changes: 2 additions & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
# - The vendor directory. We're using external targets for go dependencies,
# generated without actually looking at vendor. See #58229.
#
# gazelle:exclude _bazel
# gazelle:exclude c-deps/krb5
# gazelle:exclude c-deps/protobuf
# gazelle:exclude artifacts
# gazelle:exclude vendor
# gazelle:exclude **/zcgo_flags.go
# gazelle:exclude **/zcgo_flags_*.go
# gazelle:exclude **/*.og.go
Expand All @@ -87,7 +89,6 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
# gazelle:exclude pkg/sql/lexbase/reserved_keywords.go
# gazelle:exclude pkg/cmd/prereqs/testdata
# gazelle:exclude pkg/testutils/**/testdata/**
# gazelle:exclude vendor
# gazelle:exclude pkg/security/securitytest/embedded.go
# gazelle:exclude pkg/cmd/roachprod/vm/aws/embedded.go
# gazelle:exclude pkg/**/*_string.go
Expand Down
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/exp v0.0.0-20200513190911-00229845015e h1:rMqLP+9XLy+LdbCXHjJHAmTfXCr93W7oruWA6Hq1Alc=
golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
golang.org/x/exp v0.0.0-20210514180818-737f94c0881e h1:VqVU3dsTLGDa5pW74b+xG1lvKltt4EZIUrFPeKOqV2s=
golang.org/x/exp v0.0.0-20210514180818-737f94c0881e/go.mod h1:MSdmUWF4ZWBPSUbgUX/gaau5kvnbkSs9pgtY6B9JXDE=
Expand Down
2 changes: 0 additions & 2 deletions pkg/cmd/roachprod/install/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "install",
srcs = [
"cassandra.go",
"cassandra_yaml.go",
"cluster_synced.go",
"cockroach.go",
"expander.go",
Expand Down
164 changes: 0 additions & 164 deletions pkg/cmd/roachprod/install/cassandra.go

This file was deleted.

Loading

0 comments on commit 3322dfc

Please sign in to comment.