From 0bf75ff87a44536e816df08e60cecae997d9b268 Mon Sep 17 00:00:00 2001 From: Michael Erickson Date: Wed, 25 Sep 2024 10:38:43 -0700 Subject: [PATCH 1/2] roachtest: set timeout in MR costfuzz, unoptimized-query-oracle We weren't setting a couple of session variables on the second connection opened for multi-region costfuzz and unoptimized-query-oracle, including statement_timeout. Fixes: #131147 Fixes: #131153 Fixes: #131166 Fixes: #131344 Release note: None --- .../roachtest/tests/query_comparison_util.go | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkg/cmd/roachtest/tests/query_comparison_util.go b/pkg/cmd/roachtest/tests/query_comparison_util.go index 3c14050fd531..7d76d3b6c176 100644 --- a/pkg/cmd/roachtest/tests/query_comparison_util.go +++ b/pkg/cmd/roachtest/tests/query_comparison_util.go @@ -184,6 +184,25 @@ func runOneRoundQueryComparison( fmt.Fprint(failureLog, "\n") } + connSetup := func(conn *gosql.DB) { + setStmtTimeout := fmt.Sprintf("SET statement_timeout='%s';", statementTimeout.String()) + t.Status("setting statement_timeout") + t.L().Printf("statement timeout:\n%s", setStmtTimeout) + if _, err := conn.Exec(setStmtTimeout); err != nil { + t.Fatal(err) + } + logStmt(setStmtTimeout) + + setUnconstrainedStmt := "SET unconstrained_non_covering_index_scan_enabled = true;" + t.Status("setting unconstrained_non_covering_index_scan_enabled") + t.L().Printf("\n%s", setUnconstrainedStmt) + if _, err := conn.Exec(setUnconstrainedStmt); err != nil { + logStmt(setUnconstrainedStmt) + t.Fatal(err) + } + logStmt(setUnconstrainedStmt) + } + node := 1 conn := c.Conn(ctx, t.L(), node) @@ -191,6 +210,8 @@ func runOneRoundQueryComparison( t.L().Printf("seed: %d", seed) t.L().Printf("setupName: %s", qct.setupName) + connSetup(conn) + if qct.setupName == "workload-replay" { logTest := func(logStr string, logType string) { @@ -309,23 +330,6 @@ func runOneRoundQueryComparison( } } - setStmtTimeout := fmt.Sprintf("SET statement_timeout='%s';", statementTimeout.String()) - t.Status("setting statement_timeout") - t.L().Printf("statement timeout:\n%s", setStmtTimeout) - if _, err := conn.Exec(setStmtTimeout); err != nil { - t.Fatal(err) - } - logStmt(setStmtTimeout) - - setUnconstrainedStmt := "SET unconstrained_non_covering_index_scan_enabled = true;" - t.Status("setting unconstrained_non_covering_index_scan_enabled") - t.L().Printf("\n%s", setUnconstrainedStmt) - if _, err := conn.Exec(setUnconstrainedStmt); err != nil { - logStmt(setUnconstrainedStmt) - t.Fatal(err) - } - logStmt(setUnconstrainedStmt) - conn2 := conn node2 := 1 if qct.isMultiRegion { @@ -336,6 +340,7 @@ func runOneRoundQueryComparison( node2 = rnd.Intn(qct.nodeCount-1) + 2 t.Status(fmt.Sprintf("running some queries from node %d with conn1 and some queries from node %d with conn2", node, node2)) conn2 = c.Conn(ctx, t.L(), node2) + connSetup(conn2) } // Initialize a smither that generates only INSERT and UPDATE statements with From 2f8f0d3e6c8e46f39da4f30d16f7e2d9077ca59f Mon Sep 17 00:00:00 2001 From: "James H. Linder" Date: Thu, 26 Sep 2024 11:51:34 -0400 Subject: [PATCH 2/2] license: change Cockroach Labs, Inc to The Cockroach Authors In pkg/raft, for the files we have changed, adjust the license headers from "Cockroach Labs, Inc." to "The Cockroach Authors". Part of RE-658 Release note: none --- pkg/raft/bootstrap.go | 4 ++-- pkg/raft/confchange/confchange.go | 4 ++-- pkg/raft/confchange/datadriven_test.go | 4 ++-- pkg/raft/confchange/quick_test.go | 4 ++-- pkg/raft/confchange/restore.go | 4 ++-- pkg/raft/confchange/restore_test.go | 4 ++-- pkg/raft/doc.go | 4 ++-- pkg/raft/example_test.go | 4 ++-- pkg/raft/interaction_test.go | 4 ++-- pkg/raft/log.go | 4 ++-- pkg/raft/log_test.go | 4 ++-- pkg/raft/log_unstable.go | 4 ++-- pkg/raft/log_unstable_test.go | 4 ++-- pkg/raft/node.go | 4 ++-- pkg/raft/node_test.go | 4 ++-- pkg/raft/node_util_test.go | 4 ++-- pkg/raft/quorum/bench_test.go | 4 ++-- pkg/raft/quorum/datadriven_test.go | 4 ++-- pkg/raft/quorum/joint.go | 4 ++-- pkg/raft/quorum/majority.go | 4 ++-- pkg/raft/quorum/quick_test.go | 4 ++-- pkg/raft/quorum/quorum.go | 4 ++-- pkg/raft/raft.go | 4 ++-- pkg/raft/raft_flow_control_test.go | 4 ++-- pkg/raft/raft_paper_test.go | 4 ++-- pkg/raft/raft_snap_test.go | 4 ++-- pkg/raft/raft_test.go | 4 ++-- pkg/raft/raftpb/confchange.go | 4 ++-- pkg/raft/raftpb/confstate.go | 4 ++-- pkg/raft/raftpb/confstate_test.go | 4 ++-- pkg/raft/raftpb/raft_test.go | 4 ++-- pkg/raft/rafttest/doc.go | 4 ++-- pkg/raft/rafttest/interaction_env.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_add_nodes.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_deliver_msgs.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_forget_leader.go | 4 ++-- .../rafttest/interaction_env_handler_process_append_thread.go | 4 ++-- .../rafttest/interaction_env_handler_process_apply_thread.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_process_ready.go | 4 ++-- .../rafttest/interaction_env_handler_propose_conf_change.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_raft_log.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_raftstate.go | 4 ++-- .../rafttest/interaction_env_handler_report_unreachable.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_send_snapshot.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_stabilize.go | 4 ++-- pkg/raft/rafttest/interaction_env_handler_status.go | 4 ++-- .../rafttest/interaction_env_handler_transfer_leadership.go | 4 ++-- pkg/raft/rafttest/interaction_env_logger.go | 4 ++-- pkg/raft/rafttest/network.go | 4 ++-- pkg/raft/rafttest/network_test.go | 4 ++-- pkg/raft/rafttest/node.go | 4 ++-- pkg/raft/rafttest/node_bench_test.go | 4 ++-- pkg/raft/rafttest/node_test.go | 4 ++-- pkg/raft/rawnode.go | 4 ++-- pkg/raft/rawnode_test.go | 4 ++-- pkg/raft/status.go | 4 ++-- pkg/raft/storage.go | 4 ++-- pkg/raft/storage_test.go | 4 ++-- pkg/raft/tracker/inflights.go | 4 ++-- pkg/raft/tracker/progress.go | 4 ++-- pkg/raft/tracker/progress_test.go | 4 ++-- pkg/raft/tracker/progresstracker.go | 4 ++-- pkg/raft/types.go | 4 ++-- pkg/raft/types_test.go | 4 ++-- pkg/raft/util.go | 4 ++-- pkg/raft/util_test.go | 4 ++-- pkg/testutils/lint/lint_test.go | 4 ++-- 68 files changed, 136 insertions(+), 136 deletions(-) diff --git a/pkg/raft/bootstrap.go b/pkg/raft/bootstrap.go index 82ace87f19e3..f54f6d998320 100644 --- a/pkg/raft/bootstrap.go +++ b/pkg/raft/bootstrap.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/confchange/confchange.go b/pkg/raft/confchange/confchange.go index 313290c8505c..e10006cb6e2d 100644 --- a/pkg/raft/confchange/confchange.go +++ b/pkg/raft/confchange/confchange.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/confchange/datadriven_test.go b/pkg/raft/confchange/datadriven_test.go index 2aeef89f6200..e979402db81b 100644 --- a/pkg/raft/confchange/datadriven_test.go +++ b/pkg/raft/confchange/datadriven_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/confchange/quick_test.go b/pkg/raft/confchange/quick_test.go index 30e0ea496dbc..7def8654dc15 100644 --- a/pkg/raft/confchange/quick_test.go +++ b/pkg/raft/confchange/quick_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/confchange/restore.go b/pkg/raft/confchange/restore.go index 5ac80a3c25b4..5a95f8e409a8 100644 --- a/pkg/raft/confchange/restore.go +++ b/pkg/raft/confchange/restore.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/confchange/restore_test.go b/pkg/raft/confchange/restore_test.go index 0114a787867d..735ca5dbbed5 100644 --- a/pkg/raft/confchange/restore_test.go +++ b/pkg/raft/confchange/restore_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/doc.go b/pkg/raft/doc.go index 0a965a8fd422..201bdfa0a753 100644 --- a/pkg/raft/doc.go +++ b/pkg/raft/doc.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/example_test.go b/pkg/raft/example_test.go index 4bd1c3ad3d6f..9c682661f178 100644 --- a/pkg/raft/example_test.go +++ b/pkg/raft/example_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/interaction_test.go b/pkg/raft/interaction_test.go index ab7091f6c7a0..c8097d049757 100644 --- a/pkg/raft/interaction_test.go +++ b/pkg/raft/interaction_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/log.go b/pkg/raft/log.go index 779b2bd2c7e8..09ec313bb5c6 100644 --- a/pkg/raft/log.go +++ b/pkg/raft/log.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/log_test.go b/pkg/raft/log_test.go index 13c2a8c0ce48..a00dce166577 100644 --- a/pkg/raft/log_test.go +++ b/pkg/raft/log_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/log_unstable.go b/pkg/raft/log_unstable.go index e7547f03ea62..1092e090e6e4 100644 --- a/pkg/raft/log_unstable.go +++ b/pkg/raft/log_unstable.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/log_unstable_test.go b/pkg/raft/log_unstable_test.go index 70c61704d939..053553defdfe 100644 --- a/pkg/raft/log_unstable_test.go +++ b/pkg/raft/log_unstable_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/node.go b/pkg/raft/node.go index c0e860c23ae6..f793e8138966 100644 --- a/pkg/raft/node.go +++ b/pkg/raft/node.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/node_test.go b/pkg/raft/node_test.go index 7fc88435f193..ea95da965d51 100644 --- a/pkg/raft/node_test.go +++ b/pkg/raft/node_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/node_util_test.go b/pkg/raft/node_util_test.go index d07050925123..a0d960006174 100644 --- a/pkg/raft/node_util_test.go +++ b/pkg/raft/node_util_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2022 The etcd Authors // diff --git a/pkg/raft/quorum/bench_test.go b/pkg/raft/quorum/bench_test.go index 258ac5b00f53..3bbdaf60ae9d 100644 --- a/pkg/raft/quorum/bench_test.go +++ b/pkg/raft/quorum/bench_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/quorum/datadriven_test.go b/pkg/raft/quorum/datadriven_test.go index 704851c68c65..e37bee8b4bd0 100644 --- a/pkg/raft/quorum/datadriven_test.go +++ b/pkg/raft/quorum/datadriven_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/quorum/joint.go b/pkg/raft/quorum/joint.go index 3aa33fb168ed..e0070a1639c8 100644 --- a/pkg/raft/quorum/joint.go +++ b/pkg/raft/quorum/joint.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/quorum/majority.go b/pkg/raft/quorum/majority.go index e923304e4abc..cf689ea23d2a 100644 --- a/pkg/raft/quorum/majority.go +++ b/pkg/raft/quorum/majority.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/quorum/quick_test.go b/pkg/raft/quorum/quick_test.go index df02edd3ac41..2972adaa477f 100644 --- a/pkg/raft/quorum/quick_test.go +++ b/pkg/raft/quorum/quick_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/quorum/quorum.go b/pkg/raft/quorum/quorum.go index c5b45519dd23..27ba983a434e 100644 --- a/pkg/raft/quorum/quorum.go +++ b/pkg/raft/quorum/quorum.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/raft.go b/pkg/raft/raft.go index 2510d5225085..6732e9e069de 100644 --- a/pkg/raft/raft.go +++ b/pkg/raft/raft.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/raft_flow_control_test.go b/pkg/raft/raft_flow_control_test.go index b5aa80a0720c..a4ccd9721c7e 100644 --- a/pkg/raft/raft_flow_control_test.go +++ b/pkg/raft/raft_flow_control_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/raft_paper_test.go b/pkg/raft/raft_paper_test.go index 866e51450853..745dd193fd71 100644 --- a/pkg/raft/raft_paper_test.go +++ b/pkg/raft/raft_paper_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/raft_snap_test.go b/pkg/raft/raft_snap_test.go index 463773dc9c77..0ec649de1684 100644 --- a/pkg/raft/raft_snap_test.go +++ b/pkg/raft/raft_snap_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/raft_test.go b/pkg/raft/raft_test.go index 1dce3d314210..a77e5168a084 100644 --- a/pkg/raft/raft_test.go +++ b/pkg/raft/raft_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/raftpb/confchange.go b/pkg/raft/raftpb/confchange.go index b63877da6792..faf0421e93f7 100644 --- a/pkg/raft/raftpb/confchange.go +++ b/pkg/raft/raftpb/confchange.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/raftpb/confstate.go b/pkg/raft/raftpb/confstate.go index 1d514d010e28..5972c57a5ca3 100644 --- a/pkg/raft/raftpb/confstate.go +++ b/pkg/raft/raftpb/confstate.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/raftpb/confstate_test.go b/pkg/raft/raftpb/confstate_test.go index 63138882b18a..55ee55b5796a 100644 --- a/pkg/raft/raftpb/confstate_test.go +++ b/pkg/raft/raftpb/confstate_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/raftpb/raft_test.go b/pkg/raft/raftpb/raft_test.go index fbffda32d9a2..6d07ec5871e2 100644 --- a/pkg/raft/raftpb/raft_test.go +++ b/pkg/raft/raftpb/raft_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2021 The etcd Authors // diff --git a/pkg/raft/rafttest/doc.go b/pkg/raft/rafttest/doc.go index 7b20b26914a4..b15e78769271 100644 --- a/pkg/raft/rafttest/doc.go +++ b/pkg/raft/rafttest/doc.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env.go b/pkg/raft/rafttest/interaction_env.go index 663803bd2545..616f1823a72a 100644 --- a/pkg/raft/rafttest/interaction_env.go +++ b/pkg/raft/rafttest/interaction_env.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler.go b/pkg/raft/rafttest/interaction_env_handler.go index d673fff23777..62f0e7e870b6 100644 --- a/pkg/raft/rafttest/interaction_env_handler.go +++ b/pkg/raft/rafttest/interaction_env_handler.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_add_nodes.go b/pkg/raft/rafttest/interaction_env_handler_add_nodes.go index e59b990f6cc0..d075c54f3e76 100644 --- a/pkg/raft/rafttest/interaction_env_handler_add_nodes.go +++ b/pkg/raft/rafttest/interaction_env_handler_add_nodes.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_deliver_msgs.go b/pkg/raft/rafttest/interaction_env_handler_deliver_msgs.go index 1f828c858ac0..ea449fe174cb 100644 --- a/pkg/raft/rafttest/interaction_env_handler_deliver_msgs.go +++ b/pkg/raft/rafttest/interaction_env_handler_deliver_msgs.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_forget_leader.go b/pkg/raft/rafttest/interaction_env_handler_forget_leader.go index bf0111ac13d6..f122101dd686 100644 --- a/pkg/raft/rafttest/interaction_env_handler_forget_leader.go +++ b/pkg/raft/rafttest/interaction_env_handler_forget_leader.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2023 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_process_append_thread.go b/pkg/raft/rafttest/interaction_env_handler_process_append_thread.go index 4a893c90f4e7..65039532ac9b 100644 --- a/pkg/raft/rafttest/interaction_env_handler_process_append_thread.go +++ b/pkg/raft/rafttest/interaction_env_handler_process_append_thread.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2022 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_process_apply_thread.go b/pkg/raft/rafttest/interaction_env_handler_process_apply_thread.go index baa90cb02775..0ba705897e86 100644 --- a/pkg/raft/rafttest/interaction_env_handler_process_apply_thread.go +++ b/pkg/raft/rafttest/interaction_env_handler_process_apply_thread.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2022 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_process_ready.go b/pkg/raft/rafttest/interaction_env_handler_process_ready.go index c665b72e6219..b2ecb57cc2b9 100644 --- a/pkg/raft/rafttest/interaction_env_handler_process_ready.go +++ b/pkg/raft/rafttest/interaction_env_handler_process_ready.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_propose_conf_change.go b/pkg/raft/rafttest/interaction_env_handler_propose_conf_change.go index 06ed8b2fc021..e51a63895a03 100644 --- a/pkg/raft/rafttest/interaction_env_handler_propose_conf_change.go +++ b/pkg/raft/rafttest/interaction_env_handler_propose_conf_change.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_raft_log.go b/pkg/raft/rafttest/interaction_env_handler_raft_log.go index 50a1a2585105..5962e720c440 100644 --- a/pkg/raft/rafttest/interaction_env_handler_raft_log.go +++ b/pkg/raft/rafttest/interaction_env_handler_raft_log.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_raftstate.go b/pkg/raft/rafttest/interaction_env_handler_raftstate.go index 3349e1d53328..06b709f59c7d 100644 --- a/pkg/raft/rafttest/interaction_env_handler_raftstate.go +++ b/pkg/raft/rafttest/interaction_env_handler_raftstate.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2021 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_report_unreachable.go b/pkg/raft/rafttest/interaction_env_handler_report_unreachable.go index e54200f4f475..6c8e310be9fd 100644 --- a/pkg/raft/rafttest/interaction_env_handler_report_unreachable.go +++ b/pkg/raft/rafttest/interaction_env_handler_report_unreachable.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2023 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_send_snapshot.go b/pkg/raft/rafttest/interaction_env_handler_send_snapshot.go index 8b77fd3c5f15..251fc25874fe 100644 --- a/pkg/raft/rafttest/interaction_env_handler_send_snapshot.go +++ b/pkg/raft/rafttest/interaction_env_handler_send_snapshot.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2023 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_stabilize.go b/pkg/raft/rafttest/interaction_env_handler_stabilize.go index 61f690cd1c6d..2c36e7fce4b1 100644 --- a/pkg/raft/rafttest/interaction_env_handler_stabilize.go +++ b/pkg/raft/rafttest/interaction_env_handler_stabilize.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_status.go b/pkg/raft/rafttest/interaction_env_handler_status.go index 1dd3e0ca2491..835961632a46 100644 --- a/pkg/raft/rafttest/interaction_env_handler_status.go +++ b/pkg/raft/rafttest/interaction_env_handler_status.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_handler_transfer_leadership.go b/pkg/raft/rafttest/interaction_env_handler_transfer_leadership.go index 7698d05ecff6..6fdf70766d1b 100644 --- a/pkg/raft/rafttest/interaction_env_handler_transfer_leadership.go +++ b/pkg/raft/rafttest/interaction_env_handler_transfer_leadership.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2021 The etcd Authors // diff --git a/pkg/raft/rafttest/interaction_env_logger.go b/pkg/raft/rafttest/interaction_env_logger.go index 12a040174604..a88ff9702e83 100644 --- a/pkg/raft/rafttest/interaction_env_logger.go +++ b/pkg/raft/rafttest/interaction_env_logger.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/rafttest/network.go b/pkg/raft/rafttest/network.go index dcbc46b651a0..a561f1f7dd12 100644 --- a/pkg/raft/rafttest/network.go +++ b/pkg/raft/rafttest/network.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/rafttest/network_test.go b/pkg/raft/rafttest/network_test.go index a3f2b53bb0a5..c24f8c6fc905 100644 --- a/pkg/raft/rafttest/network_test.go +++ b/pkg/raft/rafttest/network_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/rafttest/node.go b/pkg/raft/rafttest/node.go index 50468e14cbad..d6e993ea5dca 100644 --- a/pkg/raft/rafttest/node.go +++ b/pkg/raft/rafttest/node.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/rafttest/node_bench_test.go b/pkg/raft/rafttest/node_bench_test.go index d7555653a9a3..0fb3abe37c7e 100644 --- a/pkg/raft/rafttest/node_bench_test.go +++ b/pkg/raft/rafttest/node_bench_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/rafttest/node_test.go b/pkg/raft/rafttest/node_test.go index 4a6ed4ec1e11..a19252b66320 100644 --- a/pkg/raft/rafttest/node_test.go +++ b/pkg/raft/rafttest/node_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/rawnode.go b/pkg/raft/rawnode.go index 87af094a4e82..f07bfe1dc25e 100644 --- a/pkg/raft/rawnode.go +++ b/pkg/raft/rawnode.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/rawnode_test.go b/pkg/raft/rawnode_test.go index 8bab1fe1c86c..2eaa02038f4d 100644 --- a/pkg/raft/rawnode_test.go +++ b/pkg/raft/rawnode_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/status.go b/pkg/raft/status.go index e09040df780c..7cc4ead21d53 100644 --- a/pkg/raft/status.go +++ b/pkg/raft/status.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/storage.go b/pkg/raft/storage.go index a445a2deb712..277299413d43 100644 --- a/pkg/raft/storage.go +++ b/pkg/raft/storage.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/storage_test.go b/pkg/raft/storage_test.go index 12d41a1f090b..f5a3f7d4d0e7 100644 --- a/pkg/raft/storage_test.go +++ b/pkg/raft/storage_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/tracker/inflights.go b/pkg/raft/tracker/inflights.go index 56260d093942..6a09ff37a21e 100644 --- a/pkg/raft/tracker/inflights.go +++ b/pkg/raft/tracker/inflights.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/tracker/progress.go b/pkg/raft/tracker/progress.go index 07d9ae9a9cfc..27a2ed94e01b 100644 --- a/pkg/raft/tracker/progress.go +++ b/pkg/raft/tracker/progress.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/tracker/progress_test.go b/pkg/raft/tracker/progress_test.go index a3edbc839c78..303cbf5fad52 100644 --- a/pkg/raft/tracker/progress_test.go +++ b/pkg/raft/tracker/progress_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/tracker/progresstracker.go b/pkg/raft/tracker/progresstracker.go index 0011f1bed7f4..aba8cab568e0 100644 --- a/pkg/raft/tracker/progresstracker.go +++ b/pkg/raft/tracker/progresstracker.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2019 The etcd Authors // diff --git a/pkg/raft/types.go b/pkg/raft/types.go index aa598c6edf3d..7bab18b85edb 100644 --- a/pkg/raft/types.go +++ b/pkg/raft/types.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2024 The etcd Authors // diff --git a/pkg/raft/types_test.go b/pkg/raft/types_test.go index 2ab269a10906..920c0d070c9a 100644 --- a/pkg/raft/types_test.go +++ b/pkg/raft/types_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2024 The etcd Authors // diff --git a/pkg/raft/util.go b/pkg/raft/util.go index a64e9db8bc8a..038c368579ba 100644 --- a/pkg/raft/util.go +++ b/pkg/raft/util.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/raft/util_test.go b/pkg/raft/util_test.go index 9b54fb1723c0..f2efb2901086 100644 --- a/pkg/raft/util_test.go +++ b/pkg/raft/util_test.go @@ -1,5 +1,5 @@ -// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 2024 Cockroach Labs, Inc. +// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 2024 The Cockroach Authors. // // Copyright 2015 The etcd Authors // diff --git a/pkg/testutils/lint/lint_test.go b/pkg/testutils/lint/lint_test.go index 0da651c6462a..9954620bb4bf 100644 --- a/pkg/testutils/lint/lint_test.go +++ b/pkg/testutils/lint/lint_test.go @@ -88,8 +88,8 @@ var ( // cockroachModifiedCopyright is a header that's required to be added any // time a file with etcdApacheHeader is modified by authors from CRL. cockroachModifiedCopyright = regexp.MustCompile( - `// This code has been modified from its original form by Cockroach Labs, Inc. -// All modifications are Copyright 20\d\d Cockroach Labs, Inc.`) + `// This code has been modified from its original form by The Cockroach Authors. +// All modifications are Copyright 20\d\d The Cockroach Authors.`) ) const cockroachDB = "github.com/cockroachdb/cockroach"