Merge #151935 #152023

151935: storage, fs: move pebble cluster version compat check to InitEnv r=xinhaoz a=xinhaoz

### storage: move store version checks into fs pkg
Move functions to perform pebble compatibility checks into the fs pkg.

### storage: add cluster version to env config

### storage, fs: move pebble cluster version compat check to InitEnv

Previously, we performed the CRDB version compatibility check for pebble and the
currently running cluster in the pebble constructor. This commit moves that
check to the file system environment initialization so that we can  colocate
with fs encyrption initialization.

We also extend the version checking to validate that pebble's minversion is not
too high for the current cockroach version, to guard against backwards
incompatible changes.

Fixes: #148213

Epic: none
Release note: None

152023: *: revert "upgrade to Go 1.24.5" r=rail a=rickystewart

This reverts commit 8f1144f.

Release note (build change): Revert Go version back to 1.23.7.
Epic: none

Co-authored-by: Xin Hao Zhang <[email protected]>
Co-authored-by: Ricky Stewart <[email protected]>

Author: 3 people

.bazelrc

@@ -101,7 +101,7 @@ build:crosslinuxfips '--workspace_status_command=./build/bazelutil/stamp.sh -t x
 build:crosslinuxfips --config=crosslinuxfipsbase
 build:crosslinuxfipsbase --platforms=//build/toolchains:cross_linux
 build:crosslinuxfipsbase --config=cross
-build:crosslinuxfipsbase --@io_bazel_rules_go//go/toolchain:sdk_version=1.24.5fips
+build:crosslinuxfipsbase --@io_bazel_rules_go//go/toolchain:sdk_version=1.23.7fips
 build:crosswindows '--workspace_status_command=./build/bazelutil/stamp.sh -t x86_64-w64-mingw32'
 build:crosswindows --config=crosswindowsbase
 build:crosswindowsbase --platforms=//build/toolchains:cross_windows

DEPS.bzl

@@ -1730,10 +1730,10 @@ def go_deps():
         ],
         build_file_proto_mode = "default",
         importpath = "github.com/cockroachdb/changefeedpb",
-        sha256 = "64915c79d12f6979066a3ea8208c418daa02b89a4421e888fc1b832397fa4a55",
-        strip_prefix = "github.com/cockroachdb/[email protected]20250807205816-647db5c731b8",
+        sha256 = "8ff68266653f6e8394c5ef53571e7bcf576c797c41b7defdf88784bcb5584d32",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250818184245-aab9e65dff20",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/changefeedpb/com_github_cockroachdb_changefeedpb-v0.0.0-20250807205816-647db5c731b8.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/changefeedpb/com_github_cockroachdb_changefeedpb-v0.0.0-20250818184245-aab9e65dff20.zip",
         ],
     )
     go_repository(
@@ -1850,10 +1850,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "2a9f6fbb608f3db62bdce84934a7707cddb3ba1191dcb6978a8c78395c0ec0db",
-        strip_prefix = "github.com/cockroachdb/[email protected]20250813233102-eaca9d0cc5ea",
+        sha256 = "ac6456517ee2d4fb8a8cb56d8d55efa064d7f4c12891a360740285bd07709fb2",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250818192107-5d018b93e914",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250813233102-eaca9d0cc5ea.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250818192107-5d018b93e914.zip",
         ],
     )
     go_repository(
@@ -6300,6 +6300,16 @@ def go_deps():
             "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mgutz/ansi/com_github_mgutz_ansi-v0.0.0-20200706080929-d51e80ef957d.zip",
         ],
     )
+    go_repository(
+        name = "com_github_mibk_dupl",
+        build_file_proto_mode = "disable_global",
+        importpath = "github.com/mibk/dupl",
+        sha256 = "73f61090c1cbee024b771fc60804cbedc5c2861f232bd34eff719afd9ac6e098",
+        strip_prefix = "github.com/mibk/[email protected]",
+        urls = [
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mibk/dupl/com_github_mibk_dupl-v1.0.0.zip",
+        ],
+    )
     go_repository(
         name = "com_github_michaeltjones_walk",
         build_file_proto_mode = "disable_global",

WORKSPACE

@@ -167,15 +167,15 @@ load(
 go_download_sdk(
     name = "go_sdk",
     sdks = {
-        "darwin_amd64": ("go1.24.5.darwin-amd64.tar.gz", "fe734af1e334e3dcf0a56905b7aac464a84520c651deb1d590560ca1cdd1d6d9"),
-        "darwin_arm64": ("go1.24.5.darwin-arm64.tar.gz", "61585ac4a6d3f1154e664e9639b16d3c715d5364a9d5a297ada93a34991cd785"),
-        "linux_amd64": ("go1.24.5.linux-amd64.tar.gz", "65b0631fc8121287cacbfb65ebe65bfa6896336882445ee4577b68378b80b08b"),
-        "linux_arm64": ("go1.24.5.linux-arm64.tar.gz", "de29f7d0591a83d93f587b03008817d0968c0e92c03b17197f782ded9a80f980"),
-        "linux_s390x": ("go1.24.5.linux-s390x.tar.gz", "88cc416c2e9480def4ca2d9a1ef89524a1955a77dba13e1cd70c20a741a5ac9f"),
-        "windows_amd64": ("go1.24.5.windows-amd64.tar.gz", "ee3641b9e28ecd14d0bfaeb7f796548010bedab70a307e59c6acee86eb520b60"),
+        "darwin_amd64": ("go1.23.7.darwin-amd64.tar.gz", "d26ec0c7ce5975a334b1c343de8eb7aa8777fac278440cc2204b76eab867b3ef"),
+        "darwin_arm64": ("go1.23.7.darwin-arm64.tar.gz", "3c1ab410d0828951cddde4959b72ef33aedbce8e3c8aa9c76cc4a094043fef43"),
+        "linux_amd64": ("go1.23.7.linux-amd64.tar.gz", "b69a06004491883f176b0ec600a7efbb3ec9450561653d8f509fc10d43176492"),
+        "linux_arm64": ("go1.23.7.linux-arm64.tar.gz", "4b0922c371650ec1fda259f41abc98412abf149b8d358daa5e5bc7c553bc6e52"),
+        "linux_s390x": ("go1.23.7.linux-s390x.tar.gz", "25f0cb7d7683cd9df1e194852a1856ac905be5c001759bab7862dad7aedc626d"),
+        "windows_amd64": ("go1.23.7.windows-amd64.tar.gz", "265efcbe685b3737f317c52e13eaa444bc205ad6a5e676f59d229ec4dc5821d1"),
     },
-    urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/{}"],
-    version = "1.24.5",
+    urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/{}"],
+    version = "1.23.7",
 )
 
 # To point to a local SDK path, use the following instead. We'll call the
@@ -659,8 +659,8 @@ go_download_sdk(
     # able to provide additional diagnostic information such as the expected version of OpenSSL.
     experiments = ["boringcrypto"],
     sdks = {
-        "linux_amd64": ("go1.24.5fips.linux-amd64.tar.gz", "85f2fefb498ff4449ba560cf71cb2067e14c504ea91f613cf369f5028a58e034"),
+        "linux_amd64": ("go1.23.7fips.linux-amd64.tar.gz", "f7bb32b36090ba9e632a7ee9fa414214c79a2d1b0be609ac12975b448d973961"),
     },
-    urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/{}"],
-    version = "1.24.5fips",
+    urls = ["https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/{}"],
+    version = "1.23.7fips",
 )

build/bazelutil/distdir_files.bzl

@@ -344,7 +344,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/com_github_cockroachdb_apd-v1.1.0.zip": "fef7ec2fae220f84bfacb17fbfc1b04a666ab7f6fc04f3ff6d2b1e05c380777d",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/v3/com_github_cockroachdb_apd_v3-v3.2.1.zip": "6ad54bb71a36fba8ca6725a00d916e51815a4c68de54096313ca6fffda6c87c2",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/bubbletea/com_github_cockroachdb_bubbletea-v0.23.1-bracketed-paste2.zip": "d7916a0e7d8d814566e8f8d162c3764aea947296396a0a669564ff3ee53414bc",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/changefeedpb/com_github_cockroachdb_changefeedpb-v0.0.0-20250807205816-647db5c731b8.zip": "64915c79d12f6979066a3ea8208c418daa02b89a4421e888fc1b832397fa4a55",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/changefeedpb/com_github_cockroachdb_changefeedpb-v0.0.0-20250818184245-aab9e65dff20.zip": "8ff68266653f6e8394c5ef53571e7bcf576c797c41b7defdf88784bcb5584d32",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/client_golang/com_github_cockroachdb_client_golang-v0.0.0-20250124161916-2d4b7d300341.zip": "b4fc2d09aab49c3315b442db09b08bbc7f164d5536404443cbb57203d1cd461f",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/cmux/com_github_cockroachdb_cmux-v0.0.0-20250514152509-914d3bf9ec58.zip": "c1cf4cd99a1ad6a00f2ccd4188cbcf004cb0d56895670b2c171061ce564cd791",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/cockroach-go/v2/com_github_cockroachdb_cockroach_go_v2-v2.4.1.zip": "ba646db91152f3121a6812c7b74d12d8c0e126f7b4d3b927618b159692ceb424",
@@ -359,7 +359,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250813233102-eaca9d0cc5ea.zip": "2a9f6fbb608f3db62bdce84934a7707cddb3ba1191dcb6978a8c78395c0ec0db",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250818192107-5d018b93e914.zip": "ac6456517ee2d4fb8a8cb56d8d55efa064d7f4c12891a360740285bd07709fb2",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",
@@ -783,6 +783,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/matttproud/golang_protobuf_extensions/com_github_matttproud_golang_protobuf_extensions-v1.0.4.zip": "0b44aabaa9aea5d28e667849ad4d9821351466c3591dd7beddb2d025db6d55f2",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mediocregopher/radix/v3/com_github_mediocregopher_radix_v3-v3.4.2.zip": "5be7566cd32610078fa12461b09b674061efb955b2400625ba8ebf3f6182c287",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mgutz/ansi/com_github_mgutz_ansi-v0.0.0-20200706080929-d51e80ef957d.zip": "2e0c063f9597cb225904292981732f10298e95aa22a1b815297e318ba103dc1d",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/mibk/dupl/com_github_mibk_dupl-v1.0.0.zip": "73f61090c1cbee024b771fc60804cbedc5c2861f232bd34eff719afd9ac6e098",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/microcosm-cc/bluemonday/com_github_microcosm_cc_bluemonday-v1.0.23.zip": "d720813b959b6713e000407778188cdc3b88cf3235a3dfda6543d7c5e748da6d",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/miekg/dns/com_github_miekg_dns-v1.1.43.zip": "98eaddff5c30e475850f8f9c170bfb1adf33f0aaeeb280f71e77808a1dd902aa",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/miekg/pkcs11/com_github_miekg_pkcs11-v1.1.1.zip": "81cfc2922f7d5c59dc1e688d6247ec8dc35246d646ab27088847a232570c76e6",
@@ -1208,13 +1209,13 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macos.20250801-193032.tar.gz": "8d28434cd175f0a32dfdd8ba8a5fa44c3d04d1e53cccfe9dbb3c6e301a03a47c",
     "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.macosarm.20250801-193032.tar.gz": "a4b0bbb056bb462682b49ec34816f02c71047b38733d50d8de78b737c892db61",
     "https://storage.googleapis.com/public-bazel-artifacts/c-deps/20250801-193032/libproj_foreign.windows.20250801-193032.tar.gz": "a61f4faf7a7d017a194c64b453a38c982423ef3678fa049dbf114920759da59c",
-    "https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.darwin-amd64.tar.gz": "fe734af1e334e3dcf0a56905b7aac464a84520c651deb1d590560ca1cdd1d6d9",
-    "https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.darwin-arm64.tar.gz": "61585ac4a6d3f1154e664e9639b16d3c715d5364a9d5a297ada93a34991cd785",
-    "https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.linux-amd64.tar.gz": "65b0631fc8121287cacbfb65ebe65bfa6896336882445ee4577b68378b80b08b",
-    "https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.linux-arm64.tar.gz": "de29f7d0591a83d93f587b03008817d0968c0e92c03b17197f782ded9a80f980",
-    "https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.linux-s390x.tar.gz": "88cc416c2e9480def4ca2d9a1ef89524a1955a77dba13e1cd70c20a741a5ac9f",
-    "https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5.windows-amd64.tar.gz": "ee3641b9e28ecd14d0bfaeb7f796548010bedab70a307e59c6acee86eb520b60",
-    "https://storage.googleapis.com/public-bazel-artifacts/go/20250729-211914/go1.24.5fips.linux-amd64.tar.gz": "85f2fefb498ff4449ba560cf71cb2067e14c504ea91f613cf369f5028a58e034",
+    "https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.darwin-amd64.tar.gz": "d26ec0c7ce5975a334b1c343de8eb7aa8777fac278440cc2204b76eab867b3ef",
+    "https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.darwin-arm64.tar.gz": "3c1ab410d0828951cddde4959b72ef33aedbce8e3c8aa9c76cc4a094043fef43",
+    "https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-amd64.tar.gz": "b69a06004491883f176b0ec600a7efbb3ec9450561653d8f509fc10d43176492",
+    "https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-arm64.tar.gz": "4b0922c371650ec1fda259f41abc98412abf149b8d358daa5e5bc7c553bc6e52",
+    "https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.linux-s390x.tar.gz": "25f0cb7d7683cd9df1e194852a1856ac905be5c001759bab7862dad7aedc626d",
+    "https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7.windows-amd64.tar.gz": "265efcbe685b3737f317c52e13eaa444bc205ad6a5e676f59d229ec4dc5821d1",
+    "https://storage.googleapis.com/public-bazel-artifacts/go/20250714-192942/go1.23.7fips.linux-amd64.tar.gz": "f7bb32b36090ba9e632a7ee9fa414214c79a2d1b0be609ac12975b448d973961",
     "https://storage.googleapis.com/public-bazel-artifacts/java/railroad/rr-1.63-java8.zip": "d2791cd7a44ea5be862f33f5a9b3d40aaad9858455828ebade7007ad7113fb41",
     "https://storage.googleapis.com/public-bazel-artifacts/js/rules_jest-v0.18.4.tar.gz": "d3bb833f74b8ad054e6bff5e41606ff10a62880cc99e4d480f4bdfa70add1ba7",
     "https://storage.googleapis.com/public-bazel-artifacts/js/rules_js-v1.42.3.tar.gz": "2cfb3875e1231cefd3fada6774f2c0c5a99db0070e0e48ea398acbff7c6c765b",

build/bootstrap/bootstrap-debian.sh

@@ -45,9 +45,9 @@ sudo tar -C /usr --strip-components=1 -zxf /tmp/cmake.tgz && rm /tmp/cmake.tgz
 
 # Install Go.
 trap 'rm -f /tmp/go.tgz' EXIT
-curl -fsSL https://dl.google.com/go/go1.24.5.linux-amd64.tar.gz >/tmp/go.tgz
+curl -fsSL https://dl.google.com/go/go1.23.7.linux-amd64.tar.gz >/tmp/go.tgz
 sha256sum -c - <<EOF
-10ad9e86233e74c0f6590fe5426895de6bf388964210eac34a6d83f38918ecdc  /tmp/go.tgz
+4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3  /tmp/go.tgz
 EOF
 sudo tar -C /usr/local -zxf /tmp/go.tgz && rm /tmp/go.tgz
 

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

@@ -1 +1 @@
-8f7bb0bc7314580dd8c2f2c975abafb4a20350cd
+4eca4292cae8f25b834db7001ff25284b1f9ccfa

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

@@ -9,7 +9,7 @@
 set -xeuo pipefail
 
 GO_FIPS_REPO=https://github.com/golang-fips/go
-GO_FIPS_COMMIT=48249927ea35f749f185b659c60f308d2142bf5b
+GO_FIPS_COMMIT=12327118900b0833266189a293cba8ad674901c1
 GOCOMMIT=$(grep -v ^# /bootstrap/commit.txt | head -n1)
 
 # Install build dependencies
@@ -29,7 +29,13 @@ git checkout $GO_FIPS_COMMIT
 # to Ubuntu 24.04. Without this removal, attempting to run the binary on our
 # current build infrastructure results in the following error:
 #     version `GLIBC_2.32' not found (required by external/go_sdk_fips/bin/go)
-rm ./patches/001-fix-linkage.patch
+rm ./patches/017-fix-linkage.patch
+# This patch doesn't apply on Go 1.23.6, but all the files are test-only, so
+# they shouldn't make a difference for the purpose of building the SDK.
+# When golang-fips supports Go 1.23.6, this line can be deleted.
+rm ./patches/023-crypto-tls-fix-config-time.patch
+# Lower the requirements in case we need to bootstrap with an older Go version
+sed -i "s/go mod tidy/go mod tidy -go=1.16/g" scripts/create-secondary-patch.sh
 GOLANG_REPO=https://github.com/cockroachdb/go.git ./scripts/full-initialize-repo.sh "$GOCOMMIT"
 cd go/src
 # add a special version modifier so we can explicitly use it in bazel

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

@@ -9,12 +9,12 @@
 set -xeuo pipefail
 
 # When updating to a new Go version, update all of these variables.
-GOVERS=1.24.5
+GOVERS=1.23.7
 GOCOMMIT=$(grep -v ^# /bootstrap/commit.txt | head -n1)
 # We use this for bootstrapping (this is NOT re-published). Note the version
 # matches the version we're publishing, although it doesn't technically have to.
 GOLINUXLINK=https://go.dev/dl/go$GOVERS.linux-amd64.tar.gz
-LINUXSHASUM=10ad9e86233e74c0f6590fe5426895de6bf388964210eac34a6d83f38918ecdc
+LINUXSHASUM=4741525e69841f2e22f9992af25df0c1112b07501f61f741c12c6389fcb119f3
 
 apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \