From 0b047f97b1932138054fb7826b602214e355fbe9 Mon Sep 17 00:00:00 2001
From: Dan Wang <wangdan@apache.org>
Date: Wed, 4 Sep 2024 17:49:21 +0800
Subject: [PATCH] rename parameter

---
 src/replica/replica_stub.cpp | 12 ++++++------
 src/replica/replica_stub.h   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/replica/replica_stub.cpp b/src/replica/replica_stub.cpp
index 89447072cf..5d22bbb05c 100644
--- a/src/replica/replica_stub.cpp
+++ b/src/replica/replica_stub.cpp
@@ -2172,7 +2172,7 @@ bool replica_stub::validate_replica_dir(const std::string &dir,
     return true;
 }
 
-replica_ptr replica_stub::load_replica(dir_node *dn, const char *dir)
+replica_ptr replica_stub::load_replica(dir_node *dn, const char *replica_dir)
 {
     FAIL_POINT_INJECT_F("mock_replica_load",
                         [&](std::string_view) -> replica * { return nullptr; });
@@ -2180,13 +2180,13 @@ replica_ptr replica_stub::load_replica(dir_node *dn, const char *dir)
     app_info ai;
     gpid pid;
     std::string hint_message;
-    if (!validate_replica_dir(dir, ai, pid, hint_message)) {
-        LOG_ERROR("invalid replica dir '{}', hint: {}", dir, hint_message);
+    if (!validate_replica_dir(replica_dir, ai, pid, hint_message)) {
+        LOG_ERROR("invalid replica dir '{}', hint: {}", replica_dir, hint_message);
         return nullptr;
     }
 
     // The replica's directory must exist when creating a replica.
-    CHECK_EQ(dir, dn->replica_dir(ai.app_type, pid));
+    CHECK_EQ(replica_dir, dn->replica_dir(ai.app_type, pid));
     auto *rep = new replica(this, pid, ai, dn, false);
     const auto err = rep->initialize_on_load();
     if (err != ERR_OK) {
@@ -2195,8 +2195,8 @@ replica_ptr replica_stub::load_replica(dir_node *dn, const char *dir)
         rep = nullptr;
 
         // clear work on failure
-        if (dsn::utils::filesystem::directory_exists(dir)) {
-            move_to_err_path(dir, "load replica");
+        if (dsn::utils::filesystem::directory_exists(replica_dir)) {
+            move_to_err_path(replica_dir, "load replica");
             METRIC_VAR_INCREMENT(moved_error_replicas);
             _fs_manager.remove_replica(pid);
         }
diff --git a/src/replica/replica_stub.h b/src/replica/replica_stub.h
index 77c413492c..ab2748f635 100644
--- a/src/replica/replica_stub.h
+++ b/src/replica/replica_stub.h
@@ -385,10 +385,10 @@ class replica_stub : public serverlet<replica_stub>, public ref_counter
     static bool
     parse_replica_dir_name(const std::string &dir_name, gpid &pid, std::string &app_type);
 
-    // Load an existing replica which is located in `dn` with `dir`. Usually each different
-    // `dn` represents a unique disk. `dir` is the absolute path of the directory for a
-    // replica.
-    virtual replica_ptr load_replica(dir_node *dn, const char *dir);
+    // Load an existing replica which is located in `dn` with `replica_dir`. Usually each
+    // different `dn` represents a unique disk. `dir` is the absolute path of the directory
+    // for a replica.
+    virtual replica_ptr load_replica(dir_node *dn, const char *replica_dir);
 
     // The same as the above `load_replica` function, except that this function is to load
     // each replica to `reps` with protection from `reps_lock`.