Skip to content

Update RocksDB to 8.6.7 for release-7.1#11160

Merged
ammolitor merged 5 commits into
release-7.1from
update_rocksdb_71
Feb 2, 2024
Merged

Update RocksDB to 8.6.7 for release-7.1#11160
ammolitor merged 5 commits into
release-7.1from
update_rocksdb_71

Conversation

@ammolitor
Copy link
Copy Markdown
Contributor

This PR replaces #11052

@ammolitor ammolitor changed the base branch from main to release-7.1 January 31, 2024 00:14
@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@ammolitor ammolitor changed the title Update RocksDN to 8.6.7 for release-7.1 Update RocksDB to 8.6.7 for release-7.1 Jan 31, 2024
@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

xy-54321
xy-54321 previously approved these changes Feb 1, 2024
@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci

This comment was marked as outdated.

@xis19
Copy link
Copy Markdown
Collaborator

xis19 commented Feb 1, 2024

@neethuhaneesha I am not quite sure about the motivation for the test. Maybe we can talk to @liquid-helium about it. I feel uneasy understanding the following issues:

  • rocksdB::LiveFileMetaData is not compatible with our LiveFileMetaData
  • Plus, LiveFileMetaData is inheriting from SetFileMetaData, yet SetFileMetaData is also not compatible with our counterpart.
  • The origin of the magic numbers 32 and 280
  • Perhaps we could change the code to static_assert to capture the issue during the compile time, e.g.
-TEST_CASE("noSim/fdbserver/KeyValueStoreRocksDB/RocksDBTypes") {
-       // If the following assertion fails, update SstFileMetaData and LiveFileMetaData in RocksDBCheckpointUtils.actor.h
-       // to be the same as rocksdb::SstFileMetaData and rocksdb::LiveFileMetaData.
-       ASSERT_EQ(sizeof(rocksdb::LiveFileMetaData), 208);
-       ASSERT_EQ(sizeof(rocksdb::ExportImportFilesMetaData), 32);
-       return Void();
-}
+static_assert(sizeof(rocksdb::LiveFileMetaData) == 208,
+              "If this assert fials, update LiveFileMetaData in RocksDBCheckpointUtils.actor.h to be the same as "
+              "rocksdb::LiveFileMetadata");
+static_assert(sizeof(rocksdb::ExportImportFilesMetaData) == 32,
+              "If this assert fials, update ExportImportFilesMetaData in RocksDBCheckpointUtils.actor.h to be the same "
+              "as rocksdb::ExportImportFilesMetaData");
  • Following the instructions in the comment will not fix the issue.

@foundationdb-ci

This comment was marked as outdated.

@foundationdb-ci
Copy link
Copy Markdown
Contributor

Result of foundationdb-pr on Linux CentOS 7

  • Commit ID: 684c67e
  • Duration 1:08:09
  • Result: ✅ SUCCEEDED
  • Error: N/A
  • Build Log terminal output (available for 30 days)
  • Build Workspace zip file of the working directory (available for 30 days)

@foundationdb-ci
Copy link
Copy Markdown
Contributor

Result of foundationdb-pr-cluster-tests on Linux CentOS 7

  • Commit ID: 684c67e
  • Duration 2:07:36
  • Result: ✅ SUCCEEDED
  • Error: N/A
  • Build Log terminal output (available for 30 days)
  • Build Workspace zip file of the working directory (available for 30 days)
  • Cluster Test Logs zip file of the test logs (available for 30 days)

@foundationdb-ci
Copy link
Copy Markdown
Contributor

Result of foundationdb-pr-clang on Linux CentOS 7

  • Commit ID: 684c67e
  • Duration 0:40:48
  • Result: ✅ SUCCEEDED
  • Error: N/A
  • Build Log terminal output (available for 30 days)
  • Build Workspace zip file of the working directory (available for 30 days)

@ammolitor ammolitor merged commit 94e0a14 into release-7.1 Feb 2, 2024
@ammolitor ammolitor deleted the update_rocksdb_71 branch February 2, 2024 22:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants