From: Venky Shankar <vshankar@redhat.com>
Date: Fri, 4 Sep 2020 12:36:59 +0000 (-0400)
Subject: cephfs-mirror: s/dir_name/dir_path/
X-Git-Tag: v16.1.0~786^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbd5a35788e1ec7b2f6950ce405ad2e48b272f35;p=ceph.git

cephfs-mirror: s/dir_name/dir_path/

Signed-off-by: Venky Shankar <vshankar@redhat.com>
---

diff --git a/src/tools/cephfs_mirror/FSMirror.cc b/src/tools/cephfs_mirror/FSMirror.cc
index 121d9a179dc0..68cb5789b31e 100644
--- a/src/tools/cephfs_mirror/FSMirror.cc
+++ b/src/tools/cephfs_mirror/FSMirror.cc
@@ -360,19 +360,19 @@ void FSMirror::handle_shutdown_instance_watcher(int r) {
   }
 }
 
-void FSMirror::handle_acquire_directory(string_view dir_name) {
-  dout(5) << ": dir_name=" << dir_name << dendl;
+void FSMirror::handle_acquire_directory(string_view dir_path) {
+  dout(5) << ": dir_path=" << dir_path << dendl;
 
   std::scoped_lock locker(m_lock);
-  m_directories.emplace(dir_name);
+  m_directories.emplace(dir_path);
   m_cond.notify_all();
 }
 
-void FSMirror::handle_release_directory(string_view dir_name) {
-  dout(5) << ": dir_name=" << dir_name << dendl;
+void FSMirror::handle_release_directory(string_view dir_path) {
+  dout(5) << ": dir_path=" << dir_path << dendl;
 
   std::scoped_lock locker(m_lock);
-  auto it = m_directories.find(dir_name);
+  auto it = m_directories.find(dir_path);
   if (it != m_directories.end()) {
     m_directories.erase(it);
   }
diff --git a/src/tools/cephfs_mirror/FSMirror.h b/src/tools/cephfs_mirror/FSMirror.h
index 7f08c83860e4..28e5d127a651 100644
--- a/src/tools/cephfs_mirror/FSMirror.h
+++ b/src/tools/cephfs_mirror/FSMirror.h
@@ -47,12 +47,12 @@ private:
       : fs_mirror(fs_mirror) {
     }
 
-    void acquire_directory(string_view dir_name) override {
-      fs_mirror->handle_acquire_directory(dir_name);
+    void acquire_directory(string_view dir_path) override {
+      fs_mirror->handle_acquire_directory(dir_path);
     }
 
-    void release_directory(string_view dir_name) override {
-      fs_mirror->handle_release_directory(dir_name);
+    void release_directory(string_view dir_path) override {
+      fs_mirror->handle_release_directory(dir_path);
     }
   };
 
@@ -115,8 +115,8 @@ private:
   void shutdown_instance_watcher();
   void handle_shutdown_instance_watcher(int r);
 
-  void handle_acquire_directory(string_view dir_name);
-  void handle_release_directory(string_view dir_name);
+  void handle_acquire_directory(string_view dir_path);
+  void handle_release_directory(string_view dir_path);
 };
 
 } // namespace mirror
diff --git a/src/tools/cephfs_mirror/InstanceWatcher.cc b/src/tools/cephfs_mirror/InstanceWatcher.cc
index 459698266f10..29335e4ae4e8 100644
--- a/src/tools/cephfs_mirror/InstanceWatcher.cc
+++ b/src/tools/cephfs_mirror/InstanceWatcher.cc
@@ -82,23 +82,23 @@ void InstanceWatcher::handle_notify(uint64_t notify_id, uint64_t handle,
                                     uint64_t notifier_id, bufferlist& bl) {
   dout(20) << dendl;
 
-  std::string dir_name;
+  std::string dir_path;
   std::string mode;
   try {
     JSONDecoder jd(bl);
-    JSONDecoder::decode_json("dir_name", dir_name, &jd.parser, true);
+    JSONDecoder::decode_json("dir_path", dir_path, &jd.parser, true);
     JSONDecoder::decode_json("mode", mode, &jd.parser, true);
   } catch (const JSONDecoder::err &e) {
     derr << ": failed to decode notify json: " << e.what() << dendl;
   }
 
-  dout(20) << ": notifier_id=" << notifier_id << ", dir_name=" << dir_name
+  dout(20) << ": notifier_id=" << notifier_id << ", dir_path=" << dir_path
            << ", mode=" << mode << dendl;
 
   if (mode == "acquire") {
-    m_listener.acquire_directory(dir_name);
+    m_listener.acquire_directory(dir_path);
   } else if (mode == "release") {
-    m_listener.release_directory(dir_name);
+    m_listener.release_directory(dir_path);
   } else {
     derr << ": unknown mode" << dendl;
   }
diff --git a/src/tools/cephfs_mirror/InstanceWatcher.h b/src/tools/cephfs_mirror/InstanceWatcher.h
index 116ecafda053..f88e87abb2b1 100644
--- a/src/tools/cephfs_mirror/InstanceWatcher.h
+++ b/src/tools/cephfs_mirror/InstanceWatcher.h
@@ -25,8 +25,8 @@ public:
     virtual ~Listener() {
     }
 
-    virtual void acquire_directory(string_view dir_name) = 0;
-    virtual void release_directory(string_view dir_name) = 0;
+    virtual void acquire_directory(string_view dir_path) = 0;
+    virtual void release_directory(string_view dir_path) = 0;
   };
 
   static InstanceWatcher *create(librados::IoCtx &ioctx,