Skip to content

Commit 16ee348

Browse files
craig[bot]shghasemirafissdhartunianmsbutler
committed
158390: sql: support table storage params change in the declarative schema changer r=rafiss a=shghasemi ### sql: support table storage params change in the declarative schema changer Previously, storage parameters were set and reset using the legacy schema changer. With this change, setting most non-backfilling table storage params will use the declarative schema changer. Setting ttl-related params, schema_locked, and infer_rbr_region_col_using_constraint is not implemented yet. ### schemachanger: handle RESET storage param in declarative schema changer This reuses the logic that was added to handle SET. The only difference is that RESET always drops the StorageParam element. ### schemachanger: handle manual schema_locked setting in declarative This storage parameter is special, so this requires logic to use the pre-existing TableSchemaLocked element rather than the normal storage param element. As part of this, we partially revert bc3f228 and refactor the check to be a little simpler since we don't actually need to handle the mixed version case now. Epic CRDB-31281 Fixes #155990 Release note: None 159075: sqlstats: skip TestSQLStatsDiscardStatsOnFingerprintLimit under race r=dhartunian a=dhartunian Resolves: #158978 Epic: None Release note: None 159096: cli: skip some zip tests under deadlock r=dhartunian a=dhartunian Resolves: #158973 Resolves: #158375 Resolves: #158467 Resolves: #158437 Epic: None Release note: None 159100: azure: set default of cloudstorage.azure.try.timeout to 0 r=jeffswenson a=msbutler This setting was previously set to 1m to deflake the TestAzureFaultInjection unit test, but unfortunately this also led to production backup flakes in the azure backup roachtest. Instead of reenabling this setting, we should to teach the resuming reader to time out hanging reads (reference issue #159098) Epic: none Release note: none 159120: build: bump go fork SHA for runtime.Yield and goroutine profiles r=dt a=dt 159165: Revert "decommission: retry on errors for AllocatorCheckRange" r=wenyihu6 a=wenyihu6 **Revert "decommission: retry on errors for AllocatorCheckRange"** Reverting this commit for now because randomized decommission is failing due to timeouts. We could change the code to retry only on throttled stores, but I need to dig deeper. I’m uncertain why these errors don’t fail the test immediately and instead cause long waits without this commit. I’ll investigate separately. Given this behaviour has been on releases for a while, reverting seems okay. This reverts commit 5d90692. Fixes: #157973 --- **Revert "kv: add TestDecommissionPreCheckRetryThrottledStores"** This reverts commit 0b2c0ce. Fixes: #157973 Co-authored-by: Shadi Ghasemitaheri <[email protected]> Co-authored-by: Rafi Shamim <[email protected]> Co-authored-by: David Hartunian <[email protected]> Co-authored-by: Michael Butler <[email protected]> Co-authored-by: David Taylor <[email protected]> Co-authored-by: wenyihu6 <[email protected]>
7 parents 1645953 + e306fc9 + 5132652 + 86988fa + ea6c150 + 355d1a0 + a01f02c commit 16ee348

File tree

53 files changed

+1590
-319
lines changed

Some content is hidden

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

53 files changed

+1590
-319
lines changed

‎WORKSPACE‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,13 +185,13 @@ load(
185185
go_download_sdk(
186186
name = "go_sdk",
187187
sdks = {
188-
"darwin_arm64": ("go1.25.3.darwin-arm64.tar.gz", "746818c3703980b10279f9afec54145b35b0e3d5801fe6f5bdceeea53bcb6792"),
189-
"linux_amd64": ("go1.25.3.linux-amd64.tar.gz", "821f2ede78f535fe10f95c38e2c6c87bbc200649dee20068ae4424de400196c7"),
190-
"linux_arm64": ("go1.25.3.linux-arm64.tar.gz", "f6537bed6500b20d3ac1c8fd2e27609cb3c89b5e54579e344c09febb651e9598"),
191-
"linux_s390x": ("go1.25.3.linux-s390x.tar.gz", "6d080fdd7333c8c84d679119613b7dc6b8703dc45f7231be78ba13e0523ffd50"),
192-
"windows_amd64": ("go1.25.3.windows-amd64.tar.gz", "2f108bdf9956d0e1620d6277ecf761438f4562f7d551ca6258e8579875cf1ce5"),
188+
"darwin_arm64": ("go1.25.3.darwin-arm64.tar.gz", "52c5c195a9dff3462f4926df7f523ab4e72d008bb481e1a5a2b1d3a91201ab9b"),
189+
"linux_amd64": ("go1.25.3.linux-amd64.tar.gz", "50c53742691b1325a9279dcefbc90121e8a9da94652fa393885f49e95fdfb096"),
190+
"linux_arm64": ("go1.25.3.linux-arm64.tar.gz", "043edbf881d032155ce79187f27344ed1ed5d32a98e069dfe734b4854ed4ab34"),
191+
"linux_s390x": ("go1.25.3.linux-s390x.tar.gz", "1b584edfdacfdc390f507bca85b5d1034ce4cc4c1089a12da3dd7f55f87d5a24"),
192+
"windows_amd64": ("go1.25.3.windows-amd64.tar.gz", "8b62f1feb0aad2a1a80792316a9b4563d14f21d88d5a821c8c3b0be09d087172"),
193193
},
194-
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/{}"],
194+
urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/{}"],
195195
version = "1.25.3",
196196
)
197197

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,11 +1186,11 @@ DISTDIR_FILES = {
11861186
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macos.20250801-193032.tar.gz": "8d28434cd175f0a32dfdd8ba8a5fa44c3d04d1e53cccfe9dbb3c6e301a03a47c",
11871187
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macosarm.20250801-193032.tar.gz": "a4b0bbb056bb462682b49ec34816f02c71047b38733d50d8de78b737c892db61",
11881188
"https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.windows.20250801-193032.tar.gz": "a61f4faf7a7d017a194c64b453a38c982423ef3678fa049dbf114920759da59c",
1189-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.darwin-arm64.tar.gz": "746818c3703980b10279f9afec54145b35b0e3d5801fe6f5bdceeea53bcb6792",
1190-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.linux-amd64.tar.gz": "821f2ede78f535fe10f95c38e2c6c87bbc200649dee20068ae4424de400196c7",
1191-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.linux-arm64.tar.gz": "f6537bed6500b20d3ac1c8fd2e27609cb3c89b5e54579e344c09febb651e9598",
1192-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.linux-s390x.tar.gz": "6d080fdd7333c8c84d679119613b7dc6b8703dc45f7231be78ba13e0523ffd50",
1193-
"https://storage.googleapis.com/public-bazel-artifacts/go/20251028-171726/go1.25.3.windows-amd64.tar.gz": "2f108bdf9956d0e1620d6277ecf761438f4562f7d551ca6258e8579875cf1ce5",
1189+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.darwin-arm64.tar.gz": "52c5c195a9dff3462f4926df7f523ab4e72d008bb481e1a5a2b1d3a91201ab9b",
1190+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.linux-amd64.tar.gz": "50c53742691b1325a9279dcefbc90121e8a9da94652fa393885f49e95fdfb096",
1191+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.linux-arm64.tar.gz": "043edbf881d032155ce79187f27344ed1ed5d32a98e069dfe734b4854ed4ab34",
1192+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.linux-s390x.tar.gz": "1b584edfdacfdc390f507bca85b5d1034ce4cc4c1089a12da3dd7f55f87d5a24",
1193+
"https://storage.googleapis.com/public-bazel-artifacts/go/20251210-163008/go1.25.3.windows-amd64.tar.gz": "8b62f1feb0aad2a1a80792316a9b4563d14f21d88d5a821c8c3b0be09d087172",
11941194
"https://storage.googleapis.com/public-bazel-artifacts/java/railroad/rr-1.63-java8.zip": "d2791cd7a44ea5be862f33f5a9b3d40aaad9858455828ebade7007ad7113fb41",
11951195
"https://storage.googleapis.com/public-bazel-artifacts/js/rules_jest-v0.18.4.tar.gz": "d3bb833f74b8ad054e6bff5e41606ff10a62880cc99e4d480f4bdfa70add1ba7",
11961196
"https://storage.googleapis.com/public-bazel-artifacts/js/rules_js-v1.42.3.tar.gz": "2cfb3875e1231cefd3fada6774f2c0c5a99db0070e0e48ea398acbff7c6c765b",

‎build/teamcity/internal/release/build-and-publish-patched-go/commit.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9bec28dcd0f7a372d89ef9292cc72c33bf4c7cba
1+
392609326d3b3ae02ec91dbe02ac2d60f5d4ee1e

‎build/teamcity/internal/release/build-and-publish-patched-go/impl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ for CONFIG in $CONFIGS; do
117117
mv go/bin/${GOOS}_$GOARCH/* go/bin
118118
rm -r go/bin/${GOOS}_$GOARCH
119119
fi
120-
tar cf - go | gzip -9 > /artifacts/go$GOVERS.$GOOS-$GOARCH.tar.gz
120+
tar --exclude='.git' -cf - go | gzip -9 > /artifacts/go$GOVERS.$GOOS-$GOARCH.tar.gz
121121
rm -rf go/bin
122122
done
123123

‎build/teamcity/internal/release/publish-patched-go-for-mac.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ publish() {
2525
gsutil cp $archive gs://public-bazel-artifacts/go/$loc/$archive
2626
mv $archive artifacts
2727
}
28-
publish amd64
2928
publish arm64
3029

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if [[ $service_account != "[email protected]
1515
fi
1616

1717
cleanup() {
18-
rm -rf darwin.zip staging darwin-amd64 darwin-arm64 ./*.tar.gz TIMESTAMP.txt
18+
rm -rf darwin.zip staging darwin-arm64 ./*.tar.gz TIMESTAMP.txt
1919
rm -rf .secrets
2020
}
2121
trap cleanup EXIT
@@ -41,7 +41,7 @@ sign() {
4141
--code-signature-flags runtime \
4242
"darwin-$1/go/bin/$bin"
4343
done
44-
tar cf - -C "darwin-$1" go | gzip -9 > "artifacts/$archive"
44+
tar --exclude='.git' -cf - -C "darwin-$1" go | gzip -9 > "artifacts/$archive"
4545
mkdir staging
4646
cp "darwin-$1/go/bin/gofmt" staging
4747
cp "darwin-$1/go/bin/go" staging
@@ -53,5 +53,4 @@ sign() {
5353
darwin.zip
5454
}
5555

56-
sign amd64
5756
sign arm64

‎pkg/ccl/schemachangerccl/sctestbackupccl/backup_base_generated_test.go‎

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/cli/zip_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ func TestPartialZip(t *testing.T) {
718718
// however low timeouts make race runs flaky with false positives.
719719
skip.UnderShort(t)
720720
skip.UnderRace(t)
721+
skip.UnderDeadlock(t, "flaky under deadlock")
721722

722723
sc := log.ScopeWithoutShowLogs(t)
723724
defer sc.Close(t)
@@ -830,6 +831,7 @@ func TestZipDisallowFullScans(t *testing.T) {
830831

831832
skip.UnderShort(t)
832833
skip.UnderRace(t)
834+
skip.UnderDeadlock(t, "flaky under deadlock")
833835

834836
dir, cleanupFn := testutils.TempDir(t)
835837
defer cleanupFn()
@@ -1501,6 +1503,8 @@ func TestZipIncludeAndExcludeFilesDataDriven(t *testing.T) {
15011503
defer leaktest.AfterTest(t)()
15021504
defer log.Scope(t).Close(t)
15031505

1506+
skip.UnderDeadlock(t, "flaky under deadlock")
1507+
15041508
datadriven.Walk(t, "testdata/zip/file-filters", func(t *testing.T, path string) {
15051509
datadriven.RunTest(t, path, func(t *testing.T, d *datadriven.TestData) string {
15061510
// We want a low timeout so that the test doesn't take forever;

‎pkg/cloud/azure/azure_storage.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var tryTimeout = settings.RegisterDurationSetting(
5555
settings.ApplicationLevel,
5656
"cloudstorage.azure.try.timeout",
5757
"the timeout for individual retry attempts in Azure operations",
58-
60*time.Second)
58+
0)
5959

6060
var reuseSession = settings.RegisterBoolSetting(
6161
settings.ApplicationLevel,

‎pkg/cloud/azure/azure_storage_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ func TestAzureFaultInjection(t *testing.T) {
176176
conf, err := cloud.ExternalStorageConfFromURI(uri, username.RootUserName())
177177
require.NoError(t, err)
178178

179+
settings := cluster.MakeTestingClusterSettings()
180+
tryTimeout.Override(context.Background(), &settings.SV, time.Minute)
181+
179182
args := cloud.EarlyBootExternalStorageContext{
180183
IOConf: base.ExternalIODirConfig{},
181184
Settings: cluster.MakeTestingClusterSettings(),

0 commit comments

Comments
 (0)