This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
The following commit(s) were added to refs/heads/master by this push:
new 61d437fcd KUDU-3371 Unify the 'rdb' directory name
61d437fcd is described below
commit 61d437fcd3723b93c57b039d1fdbb7ed03fc8ae9
Author: Yingchun Lai <laiyingc...@apache.org>
AuthorDate: Mon Apr 15 00:51:38 2024 +0800
KUDU-3371 Unify the 'rdb' directory name
Change-Id: I398bfd4a6a91d95f825362fc55c3b6c7dfe5c724
Reviewed-on: http://gerrit.cloudera.org:8080/21298
Reviewed-by: Yifan Zhang <chinazhangyi...@163.com>
Reviewed-by: KeDeng <kdeng...@gmail.com>
Tested-by: Yingchun Lai <laiyingc...@apache.org>
---
src/kudu/fs/block_manager-test.cc | 8 ++++----
src/kudu/fs/dir_manager.cc | 2 +-
src/kudu/fs/dir_manager.h | 1 +
src/kudu/fs/log_block_manager.cc | 3 ++-
src/kudu/fs/log_block_manager.h | 2 +-
src/kudu/integration-tests/ts_recovery-itest.cc | 3 ++-
src/kudu/tools/kudu-tool-test.cc | 4 ++--
7 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/kudu/fs/block_manager-test.cc
b/src/kudu/fs/block_manager-test.cc
index 3cc55fb4c..3cb093a0b 100644
--- a/src/kudu/fs/block_manager-test.cc
+++ b/src/kudu/fs/block_manager-test.cc
@@ -225,9 +225,9 @@ class BlockManagerTest : public KuduTest {
if (basename == kInstanceMetadataFileName) {
return Status::OK();
}
- // Ignore the 'rdb' directory which contains the RocksDB related files.
+ // Ignore the 'kRocksDBDirName' directory which contains the RocksDB
related files.
string parent_dir = *SplitPath(dirname).rbegin();
- if (parent_dir == "rdb") {
+ if (parent_dir == kRocksDBDirName) {
return Status::OK();
}
if (type == Env::FILE_TYPE) {
@@ -237,7 +237,7 @@ class BlockManagerTest : public KuduTest {
}
// Utility function that counts the number of files within a directory
- // hierarchy, ignoring '.', '..', 'rdb', and file
'kInstanceMetadataFileName'.
+ // hierarchy, ignoring '.', '..', 'kRocksDBDirName', and file
'kInstanceMetadataFileName'.
Status CountFiles(const string& root, int* num_files) {
*num_files = 0;
return env_->Walk(
@@ -421,7 +421,7 @@ void BlockManagerTest<T>::RunMultipathTest(const
vector<string>& paths) {
} else {
// (numPaths * 2) containers were created, each consisting of 1 file.
// Thus, there should be a total of (numPaths * 2) files, ignoring '.',
- // '..', 'rdb', and instance files.
+ // '..', 'kRocksDBDirName', and instance files.
bool is_logr = std::is_same<T, LogBlockManagerRdbMeta>::value;
ASSERT_TRUE(is_logr);
ASSERT_EQ(paths.size() * 2, sum);
diff --git a/src/kudu/fs/dir_manager.cc b/src/kudu/fs/dir_manager.cc
index 767ffa6cd..d24225462 100644
--- a/src/kudu/fs/dir_manager.cc
+++ b/src/kudu/fs/dir_manager.cc
@@ -260,7 +260,7 @@ Status RdbDir::Prepare() {
opts.prefix_extractor.reset(rocksdb::NewFixedPrefixTransform(ObjectIdGenerator::IdLength()));
opts.memtable_prefix_bloom_size_ratio = 0.1;
- rdb_dir_ = JoinPathSegments(dir_, "rdb");
+ rdb_dir_ = JoinPathSegments(dir_, kRocksDBDirName);
rocksdb::DB* db_temp = nullptr;
rocksdb::Status rdb_s = rocksdb::DB::Open(opts, *rdb_dir_, &db_temp);
RETURN_NOT_OK_PREPEND(FromRdbStatus(rdb_s),
diff --git a/src/kudu/fs/dir_manager.h b/src/kudu/fs/dir_manager.h
index 85cca3be5..fd445ac82 100644
--- a/src/kudu/fs/dir_manager.h
+++ b/src/kudu/fs/dir_manager.h
@@ -69,6 +69,7 @@ namespace fs {
static const std::string kDefaultTenantName = "default_tenant_kudu";
static const std::string kDefaultTenantID = "00000000000000000000000000000000";
+static const std::string kRocksDBDirName = "rdb";
typedef std::unordered_map<int, std::string> UuidByUuidIndexMap;
typedef std::unordered_map<std::string, int> UuidIndexByUuidMap;
diff --git a/src/kudu/fs/log_block_manager.cc b/src/kudu/fs/log_block_manager.cc
index 729393474..adeda77d9 100644
--- a/src/kudu/fs/log_block_manager.cc
+++ b/src/kudu/fs/log_block_manager.cc
@@ -903,7 +903,8 @@ class LogBlockContainerNativeMeta final : public
LogBlockContainer {
////////////////////////////////////////////////////////////
// The metadata part is stored in a directory-wide shared RocksDB instance,
located in
-// "<dir>/rdb/", the keys are prefixed by "<id>.", where the "id" is the
container's ID.
+// "<dir>/<kRocksDBDirName>/", the keys are prefixed by "<id>.", where the
"id" is the container's
+// ID.
class LogBlockContainerRdbMeta final : public LogBlockContainer {
public:
// Creates a new LogBlockContainer managed by 'block_manager' in 'dir',
'container' will be set as
diff --git a/src/kudu/fs/log_block_manager.h b/src/kudu/fs/log_block_manager.h
index 00d3ee849..2a6d1ae8c 100644
--- a/src/kudu/fs/log_block_manager.h
+++ b/src/kudu/fs/log_block_manager.h
@@ -622,7 +622,7 @@ class LogBlockManagerRdbMeta : public LogBlockManager {
FRIEND_TEST(LogBlockManagerRdbMetaTest, TestHalfPresentContainer);
size_t EstimateContainerCount(size_t children_count) const override {
- // TODO(yingchun): exclude the "rdb" directory when get the children count.
+ // TODO(yingchun): exclude the kRocksDBDirName directory when get the
children count.
return children_count;
}
diff --git a/src/kudu/integration-tests/ts_recovery-itest.cc
b/src/kudu/integration-tests/ts_recovery-itest.cc
index f501fe349..791cc3ceb 100644
--- a/src/kudu/integration-tests/ts_recovery-itest.cc
+++ b/src/kudu/integration-tests/ts_recovery-itest.cc
@@ -52,6 +52,7 @@
#include "kudu/fs/block_id.h"
#include "kudu/fs/block_manager.h"
#include "kudu/fs/data_dirs.h"
+#include "kudu/fs/dir_manager.h"
#include "kudu/fs/fs.pb.h"
#include "kudu/fs/fs_manager.h"
#include "kudu/gutil/basictypes.h"
@@ -315,7 +316,7 @@ TEST_P(TsRecoveryITest, TestNoBlockIDReuseIfMissingBlocks) {
ASSERT_OK(env_->GetChildren(data_dir, &children));
for (const string& child : children) {
if (child != "." && child != ".." &&
- child != fs::kInstanceMetadataFileName && child != "rdb") {
+ child != fs::kInstanceMetadataFileName && child !=
fs::kRocksDBDirName) {
ASSERT_OK(env_->DeleteFile(JoinPathSegments(data_dir, child)));
}
}
diff --git a/src/kudu/tools/kudu-tool-test.cc b/src/kudu/tools/kudu-tool-test.cc
index 9f980f629..39a0f3baf 100644
--- a/src/kudu/tools/kudu-tool-test.cc
+++ b/src/kudu/tools/kudu-tool-test.cc
@@ -4575,8 +4575,8 @@ TEST_F(ToolTest, TestLocalReplicaDelete) {
if (FLAGS_block_manager == "logr") {
// Exclude the RocksDB data size.
uint64_t size_of_rdb;
- ASSERT_OK(
- env_->GetFileSizeOnDiskRecursively(JoinPathSegments(data_dir,
"rdb"), &size_of_rdb));
+ ASSERT_OK(env_->GetFileSizeOnDiskRecursively(
+ JoinPathSegments(data_dir, fs::kRocksDBDirName), &size_of_rdb));
*total_size -= size_of_rdb;
}
};
