Skip to content

Commit

Permalink
codeowners, roachtest, team: rename bulk-io to disaster-recovery
Browse files Browse the repository at this point in the history
Reflecting `bulk-io` to `disaster-recovery` team rename in:
- github CODEOWNERS
- pkg/cmd/roachtest owners
- pkg/internal/team team
- TEAMS.yaml

Release note: None
  • Loading branch information
celiala committed Sep 19, 2022
1 parent d3d7933 commit 14b7d74
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 46 deletions.
26 changes: 13 additions & 13 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@

/pkg/cli/ @cockroachdb/cli-prs
# last-rule-wins so bulk i/o takes userfile.go even though cli-prs takes pkg/cli
/pkg/cli/userfile.go @cockroachdb/bulk-io
/pkg/cli/userfile.go @cockroachdb/disaster-recovery
/pkg/cli/demo*.go @cockroachdb/cli-prs @cockroachdb/sql-experience @cockroachdb/server-prs
/pkg/cli/debug*.go @cockroachdb/cli-prs @cockroachdb/kv-prs
/pkg/cli/debug_job_trace*.go @cockroachdb/bulk-io
/pkg/cli/debug_job_trace*.go @cockroachdb/disaster-recovery
/pkg/cli/doctor*.go @cockroachdb/cli-prs @cockroachdb/sql-schema
/pkg/cli/import_test.go @cockroachdb/cli-prs @cockroachdb/bulk-io
/pkg/cli/import_test.go @cockroachdb/cli-prs @cockroachdb/disaster-recovery
/pkg/cli/sql*.go @cockroachdb/cli-prs @cockroachdb/sql-experience
/pkg/cli/start*.go @cockroachdb/cli-prs @cockroachdb/server-prs
/pkg/cli/mt_proxy.go @cockroachdb/sqlproxy-prs @cockroachdb/server-prs
Expand All @@ -88,14 +88,14 @@

/pkg/ccl/changefeedccl/ @cockroachdb/cdc-prs
/pkg/ccl/streamingccl/ @cockroachdb/cdc-prs
# last-rule-wins so *after* CDC takes most of streamingccl bulk-io takes ingest pkg.
/pkg/ccl/streamingccl/streamingest @cockroachdb/bulk-io
# last-rule-wins so *after* CDC takes most of streamingccl disaster-recovery takes ingest pkg.
/pkg/ccl/streamingccl/streamingest @cockroachdb/disaster-recovery

/pkg/ccl/backupccl/ @cockroachdb/bulk-io
/pkg/ccl/importccl/ @cockroachdb/bulk-io
/pkg/ccl/storageccl/ @cockroachdb/bulk-io
/pkg/cloud/ @cockroachdb/bulk-io
/pkg/sql/distsql_plan_csv.go @cockroachdb/bulk-io
/pkg/ccl/backupccl/ @cockroachdb/disaster-recovery
/pkg/ccl/importccl/ @cockroachdb/disaster-recovery
/pkg/ccl/storageccl/ @cockroachdb/disaster-recovery
/pkg/cloud/ @cockroachdb/disaster-recovery
/pkg/sql/distsql_plan_csv.go @cockroachdb/disaster-recovery

/pkg/geo/ @cockroachdb/geospatial

Expand All @@ -117,7 +117,7 @@
/pkg/base/ @cockroachdb/server-prs
/pkg/bench/ @cockroachdb/sql-queries
/pkg/bench/rttanalysis @cockroachdb/sql-schema
/pkg/blobs/ @cockroachdb/bulk-io
/pkg/blobs/ @cockroachdb/disaster-recovery
/pkg/build/ @cockroachdb/dev-inf
/pkg/ccl/baseccl/ @cockroachdb/cli-prs
/pkg/ccl/buildccl/ @cockroachdb/dev-inf
Expand Down Expand Up @@ -219,12 +219,12 @@
/pkg/roachpb/ @cockroachdb/kv-prs
/pkg/roachprod/ @cockroachdb/dev-inf
/pkg/rpc/ @cockroachdb/server-prs
/pkg/scheduledjobs/ @cockroachdb/bulk-io
/pkg/scheduledjobs/ @cockroachdb/disaster-recovery
/pkg/security/ @cockroachdb/server-prs
/pkg/settings/ @cockroachdb/server-prs
/pkg/spanconfig/ @cockroachdb/multiregion
/pkg/startupmigrations/ @cockroachdb/server-prs @cockroachdb/sql-schema
/pkg/streaming/ @cockroachdb/bulk-io
/pkg/streaming/ @cockroachdb/disaster-recovery
/pkg/testutils/ @cockroachdb/test-eng-noreview
/pkg/testutils/reduce/ @cockroachdb/sql-queries
/pkg/testutils/sqlutils/ @cockroachdb/sql-queries
Expand Down
4 changes: 1 addition & 3 deletions TEAMS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ cockroachdb/test-eng:
triage_column_id: 14041337
cockroachdb/security:
triage_column_id: 0 # TODO
cockroachdb/bulk-io:
aliases:
cockroachdb/bulk-prs: other
cockroachdb/disaster-recovery:
triage_column_id: 3097123
cockroachdb/cdc:
aliases:
Expand Down
20 changes: 10 additions & 10 deletions pkg/cmd/roachtest/registry/owners.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ type Owner string

// The allowable values of Owner.
const (
OwnerSQLExperience Owner = `sql-experience`
OwnerBulkIO Owner = `bulk-io`
OwnerCDC Owner = `cdc`
OwnerKV Owner = `kv`
OwnerMultiRegion Owner = `multiregion`
OwnerServer Owner = `server`
OwnerSQLQueries Owner = `sql-queries`
OwnerSQLSchema Owner = `sql-schema`
OwnerStorage Owner = `storage`
OwnerTestEng Owner = `test-eng`
OwnerSQLExperience Owner = `sql-experience`
OwnerDisasterRecovery Owner = `disaster-recovery`
OwnerCDC Owner = `cdc`
OwnerKV Owner = `kv`
OwnerMultiRegion Owner = `multiregion`
OwnerServer Owner = `server`
OwnerSQLQueries Owner = `sql-queries`
OwnerSQLSchema Owner = `sql-schema`
OwnerStorage Owner = `storage`
OwnerTestEng Owner = `test-eng`
)
12 changes: 6 additions & 6 deletions pkg/cmd/roachtest/tests/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func registerBackupNodeShutdown(r registry.Registry) {

r.Add(registry.TestSpec{
Name: fmt.Sprintf("backup/nodeShutdown/worker/%s", backupNodeRestartSpec),
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: backupNodeRestartSpec,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
gatewayNode := 2
Expand All @@ -136,7 +136,7 @@ func registerBackupNodeShutdown(r registry.Registry) {
})
r.Add(registry.TestSpec{
Name: fmt.Sprintf("backup/nodeShutdown/coordinator/%s", backupNodeRestartSpec),
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: backupNodeRestartSpec,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
gatewayNode := 2
Expand All @@ -160,7 +160,7 @@ func registerBackupNodeShutdown(r registry.Registry) {
func registerBackupMixedVersion(r registry.Registry) {
r.Add(registry.TestSpec{
Name: "backup/mixed-version",
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(4),
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
// An empty string means that the cockroach binary specified by flag
Expand Down Expand Up @@ -251,7 +251,7 @@ func registerBackup(r registry.Registry) {
backup2TBSpec := r.MakeClusterSpec(10)
r.Add(registry.TestSpec{
Name: fmt.Sprintf("backup/2TB/%s", backup2TBSpec),
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: backup2TBSpec,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
rows := rows2TiB
Expand Down Expand Up @@ -290,7 +290,7 @@ func registerBackup(r registry.Registry) {
KMSSpec := r.MakeClusterSpec(3)
r.Add(registry.TestSpec{
Name: fmt.Sprintf("backup/KMS/%s", KMSSpec.String()),
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: KMSSpec,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
if c.Spec().Cloud == spec.GCE {
Expand Down Expand Up @@ -408,7 +408,7 @@ func registerBackup(r registry.Registry) {
// verifies them with a fingerprint.
r.Add(registry.TestSpec{
Name: `backupTPCC`,
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(3),
Timeout: 1 * time.Hour,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
Expand Down
14 changes: 7 additions & 7 deletions pkg/cmd/roachtest/tests/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func registerImportNodeShutdown(r registry.Registry) {

r.Add(registry.TestSpec{
Name: "import/nodeShutdown/worker",
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(4),
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
c.Put(ctx, t.Cockroach(), "./cockroach")
Expand All @@ -75,7 +75,7 @@ func registerImportNodeShutdown(r registry.Registry) {
})
r.Add(registry.TestSpec{
Name: "import/nodeShutdown/coordinator",
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(4),
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
c.Put(ctx, t.Cockroach(), "./cockroach")
Expand Down Expand Up @@ -140,7 +140,7 @@ func registerImportTPCC(r registry.Registry) {
timeout := 5 * time.Hour
r.Add(registry.TestSpec{
Name: testName,
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(numNodes),
Timeout: timeout,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
Expand All @@ -152,7 +152,7 @@ func registerImportTPCC(r registry.Registry) {
const geoZones = "europe-west2-b,europe-west4-b,asia-northeast1-b,us-west1-b"
r.Add(registry.TestSpec{
Name: fmt.Sprintf("import/tpcc/warehouses=%d/geo", geoWarehouses),
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(8, spec.CPU(16), spec.Geo(), spec.Zones(geoZones)),
Timeout: 5 * time.Hour,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
Expand Down Expand Up @@ -183,7 +183,7 @@ func registerImportTPCH(r registry.Registry) {
item := item
r.Add(registry.TestSpec{
Name: fmt.Sprintf(`import/tpch/nodes=%d`, item.nodes),
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(item.nodes),
Timeout: item.timeout,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
Expand Down Expand Up @@ -314,7 +314,7 @@ func runImportMixedVersion(
func registerImportMixedVersion(r registry.Registry) {
r.Add(registry.TestSpec{
Name: "import/mixed-versions",
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
// Mixed-version support was added in 21.1.
Cluster: r.MakeClusterSpec(4),
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
Expand Down Expand Up @@ -358,7 +358,7 @@ func registerImportDecommissioned(r registry.Registry) {

r.Add(registry.TestSpec{
Name: "import/decommissioned",
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(4),
Run: runImportDecommissioned,
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/tests/mixed_version_jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func runJobsMixedVersions(
func registerJobsMixedVersions(r registry.Registry) {
r.Add(registry.TestSpec{
Name: "jobs/mixed-versions",
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Skip: "#67587",
// Jobs infrastructure was unstable prior to 20.1 in terms of the behavior
// of `PAUSE/CANCEL JOB` commands which were best effort and relied on the
Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/roachtest/tests/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ func registerRestoreNodeShutdown(r registry.Registry) {

r.Add(registry.TestSpec{
Name: "restore/nodeShutdown/worker",
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(4),
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
gatewayNode := 2
Expand All @@ -306,7 +306,7 @@ func registerRestoreNodeShutdown(r registry.Registry) {

r.Add(registry.TestSpec{
Name: "restore/nodeShutdown/coordinator",
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(4),
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
gatewayNode := 2
Expand Down Expand Up @@ -441,7 +441,7 @@ func registerRestore(r registry.Registry) {

r.Add(registry.TestSpec{
Name: testName,
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(item.nodes, clusterOpts...),
Timeout: item.timeout,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
Expand Down Expand Up @@ -513,7 +513,7 @@ func registerRestore(r registry.Registry) {
withPauseTimeout := 3 * time.Hour
r.Add(registry.TestSpec{
Name: withPauseTestName,
Owner: registry.OwnerBulkIO,
Owner: registry.OwnerDisasterRecovery,
Cluster: r.MakeClusterSpec(10),
Timeout: withPauseTimeout,
Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/internal/team/team.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ type Team struct {
// Aliases is a map from additional team name to purpose for which to use
// them. The purpose "other" indicates a team that exists but which has no
// particular purpose as far as `teams` is concerned (for example, teams like
// the @cockroachdb/bulk-prs team which exists primarily to route, via
// CODEOWNERS, code reviews for the @cockroachdb/bulk-io team). This map
// the @cockroachdb/kv-prs team which exists primarily to route, via
// CODEOWNERS, code reviews for the @cockroachdb/kv team). This map
// does not contain TeamName.
Aliases map[Alias]Purpose `yaml:"aliases"`
// TriageColumnID is the Github Column ID to assign issues to.
Expand Down

0 comments on commit 14b7d74

Please sign in to comment.