Skip to content

Commit 7d69677

Browse files
rharding6373rharding6373
committed
tmp
1 parent 3faaec6 commit 7d69677

File tree

1,906 files changed

+41266
-92381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,906 files changed

+41266
-92381
lines changed

‎.github/CODEOWNERS

+34-38
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
/pkg/sql/control_job* @cockroachdb/sql-queries-prs @cockroachdb/jobs-prs
7474
/pkg/sql/job_exec_context* @cockroachdb/sql-queries-prs @cockroachdb/jobs-prs
7575
/pkg/sql/delegate/*job*.go @cockroachdb/jobs-prs @cockroachdb/disaster-recovery
76-
#!/pkg/sql/BUILD.bazel @cockroachdb/sql-queries-noreview
7776

7877
/pkg/sql/importer/ @cockroachdb/sql-queries-prs
7978
/pkg/sql/importer/export* @cockroachdb/cdc-prs
@@ -84,8 +83,6 @@
8483
/pkg/sql/execstats/ @cockroachdb/obs-prs
8584
/pkg/sql/scheduledlogging/ @cockroachdb/obs-prs
8685
/pkg/sql/sqlstats/ @cockroachdb/obs-prs
87-
/pkg/sql/sqlliveness/ @cockroachdb/server-prs
88-
/pkg/sql/sqlinstance/ @cockroachdb/server-prs
8986
/pkg/sql/tablemetadatacache/ @cockroachdb/obs-prs
9087
/pkg/ccl/testccl/sqlstatsccl/ @cockroachdb/obs-prs
9188

@@ -97,8 +94,8 @@
9794

9895
/pkg/sql/crdb_internal.go @cockroachdb/sql-foundations
9996
/pkg/sql/pg_catalog.go @cockroachdb/sql-foundations
100-
/pkg/sql/pgwire/ @cockroachdb/sql-foundations @cockroachdb/product-security
101-
/pkg/sql/pgwire/auth.go @cockroachdb/sql-foundations @cockroachdb/security-engineering
97+
/pkg/sql/pgwire/ @cockroachdb/sql-foundations @cockroachdb/server-prs @cockroachdb/product-security
98+
/pkg/sql/pgwire/auth.go @cockroachdb/sql-foundations @cockroachdb/server-prs @cockroachdb/security-engineering
10299
/pkg/sql/sem/builtins/ @cockroachdb/sql-foundations
103100
/pkg/sql/vtable/ @cockroachdb/sql-foundations
104101

@@ -167,11 +164,10 @@
167164
/pkg/cli/init.go @cockroachdb/kv-prs @cockroachdb/cli-prs
168165
/pkg/cli/log*.go @cockroachdb/obs-prs @cockroachdb/cli-prs @cockroachdb/obs-india-prs
169166
/pkg/cli/mt_cert* @cockroachdb/security-engineering @cockroachdb/product-security
170-
/pkg/cli/mt_proxy.go @cockroachdb/sqlproxy-prs @cockroachdb/server-prs
171-
/pkg/cli/mt_start_sql.go @cockroachdb/sqlproxy-prs @cockroachdb/server-prs
172-
/pkg/cli/mt_test_directory.go @cockroachdb/sqlproxy-prs @cockroachdb/server-prs
167+
/pkg/cli/mt_proxy.go @cockroachdb/sqlproxy-prs @cockroachdb/server-prs
168+
/pkg/cli/mt_start_sql.go @cockroachdb/sqlproxy-prs @cockroachdb/server-prs
169+
/pkg/cli/mt_test_directory.go @cockroachdb/sqlproxy-prs @cockroachdb/server-prs
173170
/pkg/cli/nodelocal*.go @cockroachdb/disaster-recovery
174-
/pkg/cli/node*.go @cockroachdb/kv-prs @cockroachdb/cli-prs
175171
/pkg/cli/rpc*.go @cockroachdb/kv-prs @cockroachdb/cli-prs
176172
/pkg/cli/sql*.go @cockroachdb/sql-foundations @cockroachdb/cli-prs
177173
/pkg/cli/start*.go @cockroachdb/server-prs @cockroachdb/cli-prs
@@ -190,80 +186,80 @@
190186
# respective teams.
191187
#
192188
#!/pkg/server/ @cockroachdb/unowned
193-
/pkg/server/admin*.go @cockroachdb/obs-prs
189+
/pkg/server/admin*.go @cockroachdb/obs-prs @cockroachdb/server-prs
194190
/pkg/server/api_v2*.go @cockroachdb/obs-prs @cockroachdb/server-prs
195-
/pkg/server/api_v2_auth*.go @cockroachdb/obs-prs @cockroachdb/security-engineering @cockroachdb/product-security
191+
/pkg/server/api_v2_auth*.go @cockroachdb/obs-prs @cockroachdb/server-prs @cockroachdb/security-engineering @cockroachdb/product-security
196192
/pkg/server/application_api/ @cockroachdb/obs-prs
197-
/pkg/server/authentication*.go @cockroachdb/security-engineering @cockroachdb/product-security
193+
/pkg/server/authentication*.go @cockroachdb/security-engineering @cockroachdb/server-prs @cockroachdb/product-security
198194
/pkg/server/clock_monotonicity.go @cockroachdb/kv-prs
199195
/pkg/server/combined_statement_stats*.go @cockroachdb/obs-prs
200196
/pkg/server/critical_nodes*.go @cockroachdb/obs-prs
201197
/pkg/server/debug/ @cockroachdb/obs-prs @cockroachdb/server-prs
202-
/pkg/server/decommission*.go @cockroachdb/kv-prs
203-
/pkg/server/drain*.go @cockroachdb/kv-prs @cockroachdb/sql-foundations
204-
/pkg/server/dumpstore/ @cockroachdb/obs-prs
205-
/pkg/server/external_storage*.go @cockroachdb/disaster-recovery
206-
/pkg/server/fanout*.go @cockroachdb/obs-prs
198+
/pkg/server/decommission*.go @cockroachdb/kv-prs @cockroachdb/server-prs
199+
/pkg/server/drain*.go @cockroachdb/kv-prs @cockroachdb/server-prs
200+
/pkg/server/dumpstore/ @cockroachdb/obs-prs @cockroachdb/server-prs
201+
/pkg/server/external_storage*.go @cockroachdb/disaster-recovery @cockroachdb/server-prs
202+
/pkg/server/fanout*.go @cockroachdb/obs-prs @cockroachdb/server-prs
207203
/pkg/server/diagnostics/ @cockroachdb/obs-prs
204+
/pkg/server/dumpstore/ @cockroachdb/obs-prs @cockroachdb/server-prs
208205
/pkg/server/goroutinedumper/ @cockroachdb/obs-prs @cockroachdb/server-prs
209206
/pkg/server/heapprofiler/ @cockroachdb/obs-prs @cockroachdb/server-prs
210-
/pkg/server/import_ts*.go @cockroachdb/obs-prs @cockroachdb/kv-prs
207+
/pkg/server/import_ts*.go @cockroachdb/obs-prs @cockroachdb/server-prs @cockroachdb/kv-prs
211208
/pkg/server/index_usage*.go @cockroachdb/obs-prs
212209
/pkg/server/init*.go @cockroachdb/kv-prs @cockroachdb/server-prs
210+
/pkg/server/intent_*.go @cockroachdb/kv-prs @cockroachdb/server-prs
213211
/pkg/server/key_vis* @cockroachdb/obs-prs
214212
/pkg/server/license/ @cockroachdb/sql-foundations
215213
/pkg/server/load_endpoint* @cockroachdb/obs-prs @cockroachdb/server-prs
216214
/pkg/server/loss_of_quorum*.go @cockroachdb/kv-prs
217215
/pkg/server/migration* @cockroachdb/sql-foundations
218216
/pkg/server/multi_store* @cockroachdb/kv-prs @cockroachdb/storage
219-
/pkg/server/node* @cockroachdb/kv-prs
220-
/pkg/server/node_http*.go @cockroachdb/obs-prs
217+
/pkg/server/node* @cockroachdb/kv-prs @cockroachdb/server-prs
218+
/pkg/server/node_http*.go @cockroachdb/obs-prs @cockroachdb/server-prs
221219
/pkg/server/node_tenant*go @cockroachdb/obs-prs @cockroachdb/server-prs
222220
/pkg/server/pgurl/ @cockroachdb/sql-foundations @cockroachdb/cli-prs
223-
/pkg/server/pagination* @cockroachdb/obs-prs
221+
/pkg/server/pagination* @cockroachdb/obs-prs @cockroachdb/server-prs
224222
/pkg/server/problem_ranges*.go @cockroachdb/obs-prs
225-
/pkg/server/profiler/ @cockroachdb/obs-prs @cockroachdb/kv-prs @cockroachdb/server-prs
226-
/pkg/server/purge_auth_* @cockroachdb/obs-prs
223+
/pkg/server/profiler/ @cockroachdb/obs-prs @cockroachdb/kv-prs
224+
/pkg/server/purge_auth_* @cockroachdb/obs-prs @cockroachdb/server-prs
227225
/pkg/server/server_controller_*.go @cockroachdb/server-prs
228226
/pkg/server/server_controller_http.go @cockroachdb/obs-prs @cockroachdb/server-prs
229227
/pkg/server/server_controller_sql.go @cockroachdb/sql-foundations @cockroachdb/server-prs
230228
/pkg/server/server_drpc_test.go @cockroachdb/server-prs
231-
# DB Server will eventually competely own server_http*
232229
/pkg/server/server_http*.go @cockroachdb/obs-prs @cockroachdb/server-prs
233230
/pkg/server/server_import_ts*.go @cockroachdb/obs-prs @cockroachdb/kv-prs
234231
/pkg/server/server_obs* @cockroachdb/obs-prs
235232
/pkg/server/server_systemlog* @cockroachdb/obs-prs
236233
/pkg/server/serverpb/ @cockroachdb/obs-prs @cockroachdb/server-prs
237-
/pkg/server/serverpb/authentication* @cockroachdb/obs-prs @cockroachdb/security-engineering @cockroachdb/product-security
234+
/pkg/server/serverpb/authentication* @cockroachdb/obs-prs @cockroachdb/security-engineering @cockroachdb/server-prs @cockroachdb/product-security
238235
/pkg/server/serverpb/index_reco* @cockroachdb/obs-prs
239-
/pkg/server/serverrules/ @cockroachdb/obs-prs @cockroachdb/product-security
236+
/pkg/server/serverrules/ @cockroachdb/obs-prs @cockroachdb/server-prs
240237
/pkg/server/settings_cache*.go @cockroachdb/server-prs
241238
/pkg/server/settingswatcher/ @cockroachdb/server-prs
242239
/pkg/server/span_stats*.go @cockroachdb/obs-prs
243240
/pkg/server/sql_stats*.go @cockroachdb/obs-prs
244241
/pkg/server/statement*.go @cockroachdb/obs-prs
245-
/pkg/server/status*go @cockroachdb/obs-prs
246-
/pkg/server/status*go @cockroachdb/obs-prs
247-
/pkg/server/status/ @cockroachdb/obs-prs
242+
/pkg/server/status*go @cockroachdb/obs-prs @cockroachdb/server-prs
243+
/pkg/server/status*go @cockroachdb/obs-prs @cockroachdb/server-prs
244+
/pkg/server/status/ @cockroachdb/obs-prs @cockroachdb/server-prs
248245
/pkg/server/sticky_vfs* @cockroachdb/storage
249246
/pkg/server/structlogging/ @cockroachdb/obs-prs
250247
/pkg/server/systemconfigwatcher/ @cockroachdb/kv-prs
251-
/pkg/server/telemetry/ @cockroachdb/obs-prs
248+
/pkg/server/telemetry/ @cockroachdb/obs-prs @cockroachdb/server-prs
252249
/pkg/server/tenant*.go @cockroachdb/obs-prs @cockroachdb/server-prs
253250
/pkg/server/tenantsettingswatcher/ @cockroachdb/server-prs
254251
/pkg/server/testserver*.go @cockroachdb/test-eng @cockroachdb/server-prs
255-
/pkg/server/tracedumper/ @cockroachdb/obs-prs
256-
/pkg/server/user*.go @cockroachdb/obs-prs @cockroachdb/security-engineering @cockroachdb/product-security
252+
/pkg/server/tracedumper/ @cockroachdb/obs-prs @cockroachdb/server-prs
253+
/pkg/server/user*.go @cockroachdb/obs-prs @cockroachdb/server-prs @cockroachdb/security-engineering @cockroachdb/product-security
257254
/pkg/server/version_cluster*.go @cockroachdb/dev-inf
258255

259256

260257
/pkg/ccl/jobsccl/ @cockroachdb/jobs-prs @cockroachdb/disaster-recovery
261258
/pkg/ccl/changefeedccl/ @cockroachdb/cdc-prs
262259

263260
/pkg/crosscluster/ @cockroachdb/disaster-recovery
264-
/pkg/backup/ @cockroachdb/disaster-recovery
265-
/pkg//backup/*_job.go @cockroachdb/disaster-recovery @cockroachdb/jobs-prs
266-
/pkg/sql/exec_util_backup.go @cockroachdb/disaster-recovery
261+
/pkg/backup/ @cockroachdb/disaster-recovery
262+
/pkg//backup/*_job.go @cockroachdb/disaster-recovery @cockroachdb/jobs-prs
267263
/pkg/revert/ @cockroachdb/disaster-recovery
268264
/pkg/ccl/storageccl/ @cockroachdb/disaster-recovery
269265
/pkg/ccl/cloudccl/ @cockroachdb/disaster-recovery
@@ -378,7 +374,7 @@
378374
/docs/generated/http/ @cockroachdb/obs-prs @cockroachdb/server-prs
379375
/pkg/cmd/docgen/http.go @cockroachdb/obs-prs @cockroachdb/server-prs
380376

381-
/pkg/ccl/sqlproxyccl/ @cockroachdb/sqlproxy-prs
377+
/pkg/ccl/sqlproxyccl/ @cockroachdb/sqlproxy-prs @cockroachdb/server-prs
382378

383379
/pkg/gen/ @cockroachdb/dev-inf
384380
#!/pkg/gen/*.bzl @cockroachdb/dev-inf-noreview
@@ -569,14 +565,14 @@
569565
/pkg/roachpb/metadata* @cockroachdb/kv-prs
570566
/pkg/roachpb/span* @cockroachdb/kv-prs
571567
/pkg/roachpb/string_test.go @cockroachdb/kv-prs
572-
/pkg/roachpb/tenant* @cockroachdb/kv-prs @cockroachdb/server-prs
568+
/pkg/roachpb/tenant* @cockroachdb/kv-prs
573569
#!/pkg/roachpb/version* @cockroachdb/unowned
574570
/pkg/roachprod/ @cockroachdb/test-eng
575571
/pkg/rpc/ @cockroachdb/kv-prs
576572
/pkg/rpc/auth.go @cockroachdb/kv-prs @cockroachdb/security-engineering @cockroachdb/product-security
577573
/pkg/rpc/auth_tenant.go @cockroachdb/server-prs @cockroachdb/security-engineering @cockroachdb/product-security
578574
/pkg/scheduledjobs/ @cockroachdb/jobs-prs @cockroachdb/disaster-recovery
579-
/pkg/security/ @cockroachdb/security-engineering @cockroachdb/product-security
575+
/pkg/security/ @cockroachdb/security-engineering @cockroachdb/server-prs @cockroachdb/product-security
580576
/pkg/security/clientsecopts/ @cockroachdb/sql-foundations @cockroachdb/security-engineering @cockroachdb/product-security
581577
#!/pkg/settings/ @cockroachdb/unowned
582578
/pkg/spanconfig/ @cockroachdb/kv-prs @cockroachdb/sql-foundations

‎.github/workflows/auto-merge-backports.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
2525
const query = `
2626
query SearchPRs() {
27-
search(query: "repo:${context.repo.owner}/${context.repo.repo} is:pr is:open label:backport label:blathers-backport label:backport-test-only -author:blathers-crl[bot]", type: ISSUE, first: 100) {
27+
search(query: "repo:${context.repo.owner}/${context.repo.repo} is:pr is:open label:backport label:blathers-backport label:backport-test-only", type: ISSUE, first: 100) {
2828
nodes {
2929
... on PullRequest {
3030
number
@@ -75,15 +75,15 @@ jobs:
7575
console.log(`Merging PR #${pr.number}, Created at: ${pr.createdAt}, Approved: ${approved}, Labels: ${labels}`);
7676
7777
// Merge the PR
78-
try {
79-
console.log(`Merging PR #${pr.number}`);
80-
await github.rest.pulls.merge({
81-
owner: context.repo.owner,
82-
repo: context.repo.repo,
83-
pull_number: pr.number,
84-
merge_method: "merge",
85-
});
86-
} catch (err) {
87-
console.warn(`Failed to merge PR #${pr.number}: ${err.message}`);
88-
}
78+
// try {
79+
// console.log(`Merging PR #${pr.number}`);
80+
// await github.rest.pulls.merge({
81+
// owner: context.repo.owner,
82+
// repo: context.repo.repo,
83+
// pull_number: pr.number,
84+
// merge_method: "merge",
85+
// });
86+
// } catch (err) {
87+
// console.warn(`Failed to merge PR #${pr.number}: ${err.message}`);
88+
// }
8989
}

‎.github/workflows/microbenchmarks-ci.yaml

+26-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
name: build merge base
2020
runs-on: [self-hosted, basic_runner_group]
2121
timeout-minutes: 30
22-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'X-skip-perf-check') }}
2322
outputs:
2423
merge_base: ${{ steps.build.outputs.merge_base }}
2524
steps:
@@ -35,7 +34,6 @@ jobs:
3534
name: build head
3635
runs-on: [self-hosted, basic_runner_group]
3736
timeout-minutes: 30
38-
if: ${{ !contains(github.event.pull_request.labels.*.name, 'X-skip-perf-check') }}
3937
steps:
4038
- name: Checkout
4139
uses: actions/checkout@v4
@@ -74,10 +72,6 @@ jobs:
7472
compare:
7573
runs-on: [self-hosted, basic_runner_group]
7674
timeout-minutes: 30
77-
permissions:
78-
contents: read
79-
pull-requests: write
80-
issues: write
8175
needs: [base, run-group-1, run-group-2]
8276
steps:
8377
- name: Checkout
@@ -91,9 +85,33 @@ jobs:
9185
env:
9286
BASE_SHA: ${{ needs.base.outputs.merge_base }}
9387
HEAD_SHA: ${{ env.HEAD }}
88+
- name: Clean up
89+
run: ./build/github/cleanup-engflow-keys.sh
90+
shell: bash
91+
if: always()
92+
post:
93+
runs-on: [ self-hosted, basic_runner_group ]
94+
if: contains(github.event.pull_request.labels.*.name, 'T-microbench-post') # TODO: remove this check once results are confirmed to be stable on CI.
95+
timeout-minutes: 30
96+
permissions:
97+
contents: read
98+
pull-requests: write
99+
issues: write
100+
needs: [ base, compare ]
101+
steps:
102+
- name: Checkout
103+
uses: actions/checkout@v4
104+
- run: ./build/github/get-engflow-keys.sh
105+
shell: bash
106+
- name: Unique Build ID
107+
run: echo "BUILD_ID=${{ github.run_id }}-${{ github.run_attempt }}" >> $GITHUB_ENV
108+
- name: Compare and Post
109+
run: ./build/github/microbenchmarks/post.sh
110+
env:
111+
HEAD_SHA: ${{ env.HEAD }}
94112
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
95-
GITHUB_REPO: "cockroachdb/cockroach"
96-
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
113+
REPO: "cockroachdb/cockroach"
114+
PR_NUMBER: ${{ github.event.pull_request.number }}
97115
- name: Clean up
98116
run: ./build/github/cleanup-engflow-keys.sh
99117
shell: bash

‎.github/workflows/update_releases.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
- "release-24.1"
3232
- "release-24.3"
3333
- "release-25.1"
34-
- "release-25.2"
3534
name: Update pkg/testutils/release/cockroach_releases.yaml on ${{ matrix.branch }}
3635
runs-on: ubuntu-latest
3736
steps:

‎AUTHORS

-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Abhinav Garg <[email protected]>
2929
Abhinav Gupta <[email protected]> <[email protected]>
3030
Abhishek Kedia <[email protected]>
3131
Abhishek Madan <[email protected]> <[email protected]> <[email protected]> Abhemailk [email protected] <[email protected]>
32-
Abhishek Munnolimath <[email protected]>
3332
Abhishek Saha <[email protected]> AbhishekSaha <[email protected]>
3433
Abhishek Soni <[email protected]>
3534
acoshift <[email protected]>
@@ -345,7 +344,6 @@ Matt Spilchen <[email protected]>
345344
Matt Stobo <[email protected]>
346345
Matt Tracy <[email protected]> <[email protected]>
347346
Matt White <[email protected]>
348-
Matthew Lougheed <[email protected]>
349347
Matthew O'Connor <[email protected]> <[email protected]>
350348
Matthew Todd <[email protected]> <[email protected]>
351349
Max Lang <[email protected]> <[email protected]>
@@ -510,7 +508,6 @@ Tommy Truongchau <[email protected]> <[email protected]>
510508
Toshi Noguchi <[email protected]> <[email protected]>
511509
Tristan Ohlson <[email protected]> <@cockroachlabs.com>
512510
Tristan Rice <[email protected]> <[email protected]>
513-
Tuan Dau <[email protected]>
514511
Tushar Jain <[email protected]>
515512
Txiaozhe <[email protected]>
516513
Tyler Neely <[email protected]>

‎BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ nogo(
207207
"//pkg/testutils/lint/passes/returncheck",
208208
"//pkg/testutils/lint/passes/returnerrcheck",
209209
"//pkg/testutils/lint/passes/shadow",
210+
"//pkg/testutils/lint/passes/timer",
210211
"//pkg/testutils/lint/passes/unconvert",
211212
],
212213
)

0 commit comments

Comments
 (0)