Skip to content

Commit 538b9b7

Browse files
tmp
1 parent 85a0fe2 commit 538b9b7

File tree

75 files changed

+196
-1361
lines changed

Some content is hidden

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

75 files changed

+196
-1361
lines changed

.github/workflows/github-actions-essential-ci.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ concurrency:
5454
jobs:
5555
acceptance:
5656
runs-on: [self-hosted, basic_big_runner_group]
57-
timeout-minutes: 60
57+
timeout-minutes: 30
5858
steps:
5959
- uses: actions/checkout@v4
6060
with:
@@ -75,7 +75,7 @@ jobs:
7575
if: always()
7676
check_generated_code:
7777
runs-on: [self-hosted, basic_runner_group]
78-
timeout-minutes: 60
78+
timeout-minutes: 30
7979
steps:
8080
- uses: actions/checkout@v4
8181
with:
@@ -90,7 +90,7 @@ jobs:
9090
if: always()
9191
docker_image_amd64:
9292
runs-on: [self-hosted, basic_runner_group]
93-
timeout-minutes: 60
93+
timeout-minutes: 30
9494
steps:
9595
- uses: actions/checkout@v4
9696
with:
@@ -111,7 +111,7 @@ jobs:
111111
if: always()
112112
examples_orms:
113113
runs-on: [self-hosted, basic_big_runner_group]
114-
timeout-minutes: 120
114+
timeout-minutes: 40
115115
steps:
116116
- uses: actions/checkout@v4
117117
with:
@@ -132,7 +132,7 @@ jobs:
132132
if: always()
133133
lint:
134134
runs-on: [self-hosted, basic_big_runner_group]
135-
timeout-minutes: 120
135+
timeout-minutes: 60
136136
steps:
137137
- uses: actions/checkout@v4
138138
with:
@@ -156,7 +156,7 @@ jobs:
156156
if: always()
157157
local_roachtest:
158158
runs-on: [self-hosted, basic_big_runner_group]
159-
timeout-minutes: 120
159+
timeout-minutes: 60
160160
steps:
161161
- uses: actions/checkout@v4
162162
with:
@@ -177,7 +177,7 @@ jobs:
177177
if: always()
178178
local_roachtest_fips:
179179
runs-on: [self-hosted, basic_runner_group_fips]
180-
timeout-minutes: 120
180+
timeout-minutes: 60
181181
steps:
182182
- uses: actions/checkout@v4
183183
with:
@@ -198,7 +198,7 @@ jobs:
198198
if: always()
199199
linux_amd64_build:
200200
runs-on: [self-hosted, basic_runner_group]
201-
timeout-minutes: 60
201+
timeout-minutes: 30
202202
steps:
203203
- uses: actions/checkout@v4
204204
with:
@@ -219,7 +219,7 @@ jobs:
219219
if: always()
220220
linux_amd64_fips_build:
221221
runs-on: [self-hosted, basic_runner_group]
222-
timeout-minutes: 60
222+
timeout-minutes: 30
223223
steps:
224224
- uses: actions/checkout@v4
225225
with:
@@ -240,7 +240,7 @@ jobs:
240240
if: always()
241241
unit_tests:
242242
runs-on: [self-hosted, basic_runner_group]
243-
timeout-minutes: 120
243+
timeout-minutes: 60
244244
steps:
245245
- uses: actions/checkout@v4
246246
with:

build/github/lint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bazel test \
2828
--sandbox_writable_path=$HOME \
2929
--test_env=GO_SDK=$(dirname $(dirname $(bazel run @go_sdk//:bin/go --run_under=realpath))) \
3030
--test_env=COCKROACH_WORKSPACE=$WORKSPACE \
31-
--test_timeout=3600 \
31+
--test_timeout=1800 \
3232
--build_event_binary_file=bes.bin \
3333
--jobs 50 \
3434
--remote_download_minimal $(./build/github/engflow-args.sh)

build/teamcity/internal/cockroach/release/publish/sign_staged_macos_release_on_linux.sh

+1-9
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@
55
# Use of this software is governed by the CockroachDB Software License
66
# included in the /LICENSE file.
77

8-
set -xeuo pipefail
98

10-
service_account=$(curl --header "Metadata-Flavor: Google" "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email" || echo "")
11-
if [[ $service_account != "[email protected]" ]]; then
12-
echo "Not running on a signing agent, skipping signing"
13-
exit 1
14-
fi
9+
set -xeuo pipefail
1510

1611
dir="$(dirname $(dirname $(dirname $(dirname $(dirname $(dirname "${0}"))))))"
1712
source "$dir/teamcity-support.sh" # For log_into_gcloud
@@ -25,9 +20,6 @@ remove_files_on_exit() {
2520
trap remove_files_on_exit EXIT
2621

2722
mkdir -p .secrets
28-
# Explicitly set the account to the signing agent. This is helpful if one of the previous
29-
# commands failed and left the account set to something else.
30-
gcloud config set account "[email protected]"
3123
gcloud secrets versions access latest --secret=apple-signing-cert | base64 -d > "$curr_dir/.secrets/cert.p12"
3224
gcloud secrets versions access latest --secret=apple-signing-cert-password > "$curr_dir/.secrets/cert.pass"
3325
gcloud secrets versions access latest --secret=appstoreconnect-api-key > "$curr_dir/.secrets/api_key.json"

build/teamcity/internal/release/process/make-and-publish-build-artifacts-darwin-sign.sh

-96
This file was deleted.

build/teamcity/internal/release/process/make-and-publish-build-artifacts-per-platform.sh

-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ The binaries will be available at:
146146
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.linux-amd64.tgz
147147
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.linux-amd64-fips.tgz
148148
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.linux-arm64.tgz
149-
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.darwin-11.0-arm64.tgz
150149
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.darwin-10.9-amd64.tgz
151150
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.windows-6.2-amd64.zip
152151

build/teamcity/internal/release/process/make-and-publish-build-tagging.sh

-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ Build ID: ${build_name}
103103
The binaries are available at:
104104
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.linux-amd64.tgz
105105
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.linux-arm64.tgz
106-
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.darwin-11.0-arm64.tgz
107106
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.darwin-10.9-amd64.tgz
108107
https://storage.googleapis.com/$gcs_bucket/cockroach-$build_name.windows-6.2-amd64.zip
109108

build/teamcity/internal/release/sign-patched-go.sh

+19-30
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,38 @@
88

99
set -xeuo pipefail
1010

11-
service_account=$(curl --header "Metadata-Flavor: Google" "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email" || echo "")
12-
if [[ $service_account != "[email protected]" ]]; then
13-
echo "Not running on a signing agent, skipping signing"
14-
exit 1
15-
fi
11+
KEYCHAIN_NAME=signing
12+
KEYCHAIN_PROFILE=notarization
13+
curr_dir=$(pwd)
1614

1715
cleanup() {
18-
rm -rf darwin.zip staging darwin-amd64 darwin-arm64 ./*.tar.gz TIMESTAMP.txt
19-
rm -rf .secrets
16+
security lock-keychain "${KEYCHAIN_NAME}"
17+
rm -rf darwin.zip staging darwin-amd64 darwin-arm64 *.tar.gz TIMESTAMP.txt
2018
}
2119
trap cleanup EXIT
2220

23-
mkdir -p .secrets
24-
# Explicitly set the account to the signing agent. This is helpful if one of the previous
25-
# commands failed and left the account set to something else.
26-
gcloud config set account "[email protected]"
27-
gcloud secrets versions access latest --secret=apple-signing-cert | base64 -d > .secrets/cert.p12
28-
gcloud secrets versions access latest --secret=apple-signing-cert-password > .secrets/cert.pass
29-
gcloud secrets versions access latest --secret=appstoreconnect-api-key > .secrets/api_key.json
30-
3121
mkdir artifacts
3222
mv TIMESTAMP.txt artifacts/TIMESTAMP.txt
23+
security unlock-keychain -p "${KEYCHAIN_PASSWORD}" "${KEYCHAIN_NAME}"
24+
3325
sign() {
34-
archive=$(ls -1 go*.darwin-$1.tar.gz | head -n1 | xargs basename)
35-
mkdir "darwin-$1"
36-
tar -xf "$archive" -C "darwin-$1"
37-
rm "$archive"
26+
archive=$(find . -name go*.darwin-$1.tar.gz -d 1 | head -n1 | xargs basename)
27+
mkdir darwin-$1
28+
tar -xf $archive -C darwin-$1
29+
rm $archive
3830
for bin in go gofmt; do
39-
rcodesign sign \
40-
--p12-file .secrets/cert.p12 --p12-password-file .secrets/cert.pass \
41-
--code-signature-flags runtime \
42-
"darwin-$1/go/bin/$bin"
31+
codesign --timestamp --options=runtime -f --keychain "$KEYCHAIN_NAME" -s "$SIGNING_IDENTITY" darwin-$1/go/bin/$bin
4332
done
44-
tar cf - -C "darwin-$1" go | gzip -9 > "artifacts/$archive"
33+
tar cf - -C darwin-$1 go | gzip -9 > artifacts/$archive
4534
mkdir staging
46-
cp "darwin-$1/go/bin/gofmt" staging
47-
cp "darwin-$1/go/bin/go" staging
35+
cp darwin-$1/go/bin/gofmt staging
36+
cp darwin-$1/go/bin/go staging
4837
zip -r darwin.zip staging
4938
rm -rf staging
50-
rcodesign notary-submit \
51-
--api-key-file .secrets/api_key.json \
52-
--wait \
53-
darwin.zip
39+
xcrun notarytool submit darwin.zip --wait \
40+
--team-id "$TEAM_ID" --keychain-profile "$KEYCHAIN_PROFILE" \
41+
--apple-id "$APPLE_ID" --verbose \
42+
--keychain "${HOME}/Library/Keychains/${KEYCHAIN_NAME}-db"
5443
}
5544

5645
sign amd64

docs/generated/metrics/metrics.html

-2
Original file line numberDiff line numberDiff line change
@@ -550,8 +550,6 @@
550550
<tr><td>STORAGE</td><td>raft.transport.sends-dropped</td><td>Number of Raft message sends dropped by the Raft Transport</td><td>Messages</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
551551
<tr><td>STORAGE</td><td>raft.transport.sent</td><td>Number of Raft messages sent by the Raft Transport</td><td>Messages</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
552552
<tr><td>STORAGE</td><td>raftlog.behind</td><td>Number of Raft log entries followers on other stores are behind.<br/><br/>This gauge provides a view of the aggregate number of log entries the Raft leaders<br/>on this node think the followers are behind. Since a raft leader may not always<br/>have a good estimate for this information for all of its followers, and since<br/>followers are expected to be behind (when they are not required as part of a<br/>quorum) *and* the aggregate thus scales like the count of such followers, it is<br/>difficult to meaningfully interpret this metric.</td><td>Log Entries</td><td>GAUGE</td><td>COUNT</td><td>AVG</td><td>NONE</td></tr>
553-
<tr><td>STORAGE</td><td>raftlog.size.max</td><td>Approximate size of the largest Raft log on the store.</td><td>Bytes</td><td>GAUGE</td><td>BYTES</td><td>AVG</td><td>NONE</td></tr>
554-
<tr><td>STORAGE</td><td>raftlog.size.total</td><td>Approximate size of all Raft logs on the store.</td><td>Bytes</td><td>GAUGE</td><td>BYTES</td><td>AVG</td><td>NONE</td></tr>
555553
<tr><td>STORAGE</td><td>raftlog.truncated</td><td>Number of Raft log entries truncated</td><td>Log Entries</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
556554
<tr><td>STORAGE</td><td>range.adds</td><td>Number of range additions</td><td>Range Ops</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>
557555
<tr><td>STORAGE</td><td>range.merges</td><td>Number of range merges</td><td>Range Ops</td><td>COUNTER</td><td>COUNT</td><td>AVG</td><td>NON_NEGATIVE_DERIVATIVE</td></tr>

pkg/ccl/backupccl/restore_job.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1403,7 +1403,7 @@ func createImportingDescriptors(
14031403
if err != nil {
14041404
return err
14051405
}
1406-
_ = typDesc.AddReferencingDescriptorID(table.GetID())
1406+
typDesc.AddReferencingDescriptorID(table.GetID())
14071407
if err := descsCol.WriteDescToBatch(
14081408
ctx, kvTrace, typDesc, b,
14091409
); err != nil {
@@ -3131,7 +3131,7 @@ func (r *restoreResumer) removeExistingTypeBackReferences(
31313131
}
31323132
existing := desc.(*typedesc.Mutable)
31333133
existing.MaybeIncrementVersion()
3134-
_ = existing.RemoveReferencingDescriptorID(tbl.ID)
3134+
existing.RemoveReferencingDescriptorID(tbl.ID)
31353135
}
31363136
}
31373137
}

0 commit comments

Comments
 (0)