Merge #32931

32931: c-deps: bump RocksDB from 5.13 to 5.17.2 r=benesch a=petermattis

Pass `USE_RTTI=1` to the RocksDB build. 5.13 was built with rtti
enabled (there was no way to disable it), but 5.17.2 defaults to
disabling rtti. Unfortunately, the rest of our C++ dependencies build
with rtti enabled and C++ requires consistently specifying `-fno-rtti`
for all compilation, otherwise you get strange `undefined reference to
typeinfo` errors at link time. At least one of our C++
dependencies (cryptopp) does not allow easily disabling usage of rtti.

Verified that the `RocksDBDeleteRangeIterate` benchmark was unchanged
which indicates the RocksDB delete range patches are in effect.

Release note: None

Co-authored-by: Peter Mattis <petermattis@gmail.com>

Makefile

@@ -83,6 +83,9 @@ STRESSFLAGS :=
 ## Cluster to use for `make roachprod-stress`
 CLUSTER :=
 
+## Verbose allows turning on verbose output from the cmake builds.
+VERBOSE :=
+
 DUPLFLAGS    := -t 100
 GOFLAGS      :=
 TAGS         :=
@@ -551,7 +554,8 @@ $(ROCKSDB_DIR)/Makefile: $(C_DEPS_DIR)/rocksdb-rebuild | bin/.submodules-initial
 	  $(if $(findstring release,$(BUILDTYPE)),-DPORTABLE=ON) -DWITH_GFLAGS=OFF \
 	  -DSNAPPY_LIBRARIES=$(LIBSNAPPY) -DSNAPPY_INCLUDE_DIR="$(SNAPPY_SRC_DIR);$(SNAPPY_DIR)" -DWITH_SNAPPY=ON \
 	  $(if $(use-stdmalloc),,-DJEMALLOC_LIBRARIES=$(LIBJEMALLOC) -DJEMALLOC_INCLUDE_DIR=$(JEMALLOC_DIR)/include -DWITH_JEMALLOC=ON) \
-	  -DCMAKE_BUILD_TYPE=$(if $(ENABLE_ROCKSDB_ASSERTIONS),Debug,Release)
+	  -DCMAKE_BUILD_TYPE=$(if $(ENABLE_ROCKSDB_ASSERTIONS),Debug,Release) \
+	  -DUSE_RTTI=1
 
 $(SNAPPY_DIR)/Makefile: $(C_DEPS_DIR)/snappy-rebuild | bin/.submodules-initialized
 	rm -rf $(SNAPPY_DIR)

build/variables.mk

@@ -142,6 +142,7 @@ define VALID_VARS
   UI_TS_OSS
   UNAME
   USE_ROCKSDB_ASSERTIONS
+  VERBOSE
   WEBPACK
   WEBPACK_DASHBOARD
   WEBPACK_DEV_SERVER

c-deps/rocksdb-rebuild

@@ -1,4 +1,4 @@
 Bump the version below when changing rocksdb CMake flags. Search for "BUILD
 ARTIFACT CACHING" in build/common.mk for rationale.
 
-10
+11

pkg/storage/engine/rocksdb_error_test.go

@@ -63,7 +63,7 @@ func TestRocksDBErrorSafeMessage(t *testing.T) {
 		{
 			err: rErr,
 			// "locks" is redacted because this last part of the message is actually from `strerror` (ANSI-C).
-			expMsg: "io error while lock file <redacted> no <redacted> available",
+			expMsg: "io error lock <redacted> <redacted> no <redacted> available",
 		},
 		{
 			// A real-world example.