[kudu] branch master updated: [fs] update on FsManager's constructor

[la...@apache.org]

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 614eba154 [fs] update on FsManager's constructor
614eba154 is described below

commit 614eba154da5f4c3ad13ae85925ccc0e5316bdf8
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Wed Mar 1 20:01:14 2023 -0800

    [fs] update on FsManager's constructor
    
    While reviewing on of the recent patches, I noticed that the signature
    of FsManager's constructors might be improved to avoid specifying
    default instance of FsManagerOpts as the second parameter.  This patch
    addresses that and also cleans up instantiation of FsManagerOpts in a
    couple of places in kudu CLI tools.
    
    This patch doesn't contain any functional modifications.
    
    Change-Id: Ib76723a230142a4903cca4f47fbde44afa15abed
    Reviewed-on: http://gerrit.cloudera.org:8080/19570
    Reviewed-by: Yingchun Lai <la...@apache.org>
    Tested-by: Yingchun Lai <la...@apache.org>
---
 src/kudu/fs/fs_manager.h                    | 2 +-
 src/kudu/master/master_runner.cc            | 2 +-
 src/kudu/tools/tool_action_fs.cc            | 2 +-
 src/kudu/tools/tool_action_local_replica.cc | 8 ++++----
 src/kudu/tools/tool_action_perf.cc          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/kudu/fs/fs_manager.h b/src/kudu/fs/fs_manager.h
index 30a15626d..42fa2d840 100644
--- a/src/kudu/fs/fs_manager.h
+++ b/src/kudu/fs/fs_manager.h
@@ -160,7 +160,7 @@ class FsManager {
   static const char *kWalFileNamePrefix;
   static const char *kWalsRecoveryDirSuffix;
 
-  FsManager(Env* env, FsManagerOpts opts);
+  explicit FsManager(Env* env, FsManagerOpts opts = {});
   ~FsManager();
 
   // ==========================================================================
diff --git a/src/kudu/master/master_runner.cc b/src/kudu/master/master_runner.cc
index 851531257..018b6349d 100644
--- a/src/kudu/master/master_runner.cc
+++ b/src/kudu/master/master_runner.cc
@@ -302,7 +302,7 @@ Status VerifyMastersGetHostPorts(const vector<HostPort>& master_addrs,
 // Deletes the local system catalog tablet and performs a copy from 'src_hp'.
 Status ClearLocalSystemCatalogAndCopy(const HostPort& src_hp) {
   LOG(INFO) << "Clearing existing system tablet";
-  FsManager fs_manager(Env::Default(), FsManagerOpts());
+  FsManager fs_manager(Env::Default());
   RETURN_NOT_OK(fs_manager.Open());
   scoped_refptr<ConsensusMetadataManager> cmeta_manager(
       new ConsensusMetadataManager(&fs_manager));
diff --git a/src/kudu/tools/tool_action_fs.cc b/src/kudu/tools/tool_action_fs.cc
index 987535ef6..98de4c9ff 100644
--- a/src/kudu/tools/tool_action_fs.cc
+++ b/src/kudu/tools/tool_action_fs.cc
@@ -245,7 +245,7 @@ Status Check(const RunnerContext& /*context*/) {
 }
 
 Status Format(const RunnerContext& /*context*/) {
-  FsManager fs_manager(Env::Default(), FsManagerOpts());
+  FsManager fs_manager(Env::Default());
   optional<string> uuid;
   optional<string> server_key;
   optional<string> server_key_iv;
diff --git a/src/kudu/tools/tool_action_local_replica.cc b/src/kudu/tools/tool_action_local_replica.cc
index 320b83f3e..821796cff 100644
--- a/src/kudu/tools/tool_action_local_replica.cc
+++ b/src/kudu/tools/tool_action_local_replica.cc
@@ -545,7 +545,7 @@ Status RewriteRaftConfig(const RunnerContext& context) {
   DCHECK(!peers.empty());
 
   Env* env = Env::Default();
-  FsManagerOpts fs_opts = FsManagerOpts();
+  FsManagerOpts fs_opts;
   fs_opts.skip_block_manager = true;
   FsManager fs_manager(env, std::move(fs_opts));
   RETURN_NOT_OK(fs_manager.Open());
@@ -588,9 +588,9 @@ Status SetRaftTerm(const RunnerContext& context) {
 
   // Load the current metadata from disk and verify that the intended operation is safe.
   Env* env = Env::Default();
-  FsManagerOpts fs_opts = FsManagerOpts();
+  FsManagerOpts fs_opts;
   fs_opts.skip_block_manager = true;
-  FsManager fs_manager(env, fs_opts);
+  FsManager fs_manager(env, std::move(fs_opts));
   RETURN_NOT_OK(fs_manager.Open());
   // Load the cmeta file and rewrite the raft config.
   scoped_refptr<ConsensusMetadataManager> cmeta_manager(new ConsensusMetadataManager(&fs_manager));
@@ -671,7 +671,7 @@ Status CopyFromRemote(const RunnerContext& context) {
   HostPort hp;
   RETURN_NOT_OK(ParseHostPortString(rpc_address, &hp));
 
-  FsManager fs_manager(Env::Default(), FsManagerOpts());
+  FsManager fs_manager(Env::Default());
   RETURN_NOT_OK(fs_manager.Open());
   scoped_refptr<ConsensusMetadataManager> cmeta_manager(new ConsensusMetadataManager(&fs_manager));
 
diff --git a/src/kudu/tools/tool_action_perf.cc b/src/kudu/tools/tool_action_perf.cc
index 09cf70ac5..4a8b59793 100644
--- a/src/kudu/tools/tool_action_perf.cc
+++ b/src/kudu/tools/tool_action_perf.cc
@@ -956,7 +956,7 @@ Status TabletScan(const RunnerContext& context) {
   //
   // Note: we need a read-write FsManager because bootstrapping will do
   // destructive things (e.g. rename the tablet's WAL segment directory).
-  FsManager fs(Env::Default(), FsManagerOpts());
+  FsManager fs(Env::Default());
   RETURN_NOT_OK(fs.Open());
 
   scoped_refptr<TabletMetadata> tmeta;