From: Rishabh Dave <ridave@redhat.com>
Date: Thu, 28 Sep 2023 13:26:22 +0000 (+0530)
Subject: mon/FSCommands: use alias for higher brevity
X-Git-Tag: v19.0.0~123^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a12f6eb6c16722f1d68e0949390cd7d30f44bc6;p=ceph.git

mon/FSCommands: use alias for higher brevity

Create an alias so "APP_NAME_CEPHFS" can be written instead of
"pg_pool_t::APPLICATION_NAME_CEPHFS".

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc
index 7944aa4bd386..300c025486a4 100644
--- a/src/mon/FSCommands.cc
+++ b/src/mon/FSCommands.cc
@@ -32,6 +32,8 @@ using std::vector;
 using std::ostream;
 
 
+static const auto& APP_NAME_CEPHFS = pg_pool_t::APPLICATION_NAME_CEPHFS;
+
 class FlagSetHandler : public FileSystemCommandHandler
 {
   public:
@@ -255,11 +257,9 @@ class FsNewHandler : public FileSystemCommandHandler
       mon->osdmon()->wait_for_writeable(op, new PaxosService::C_RetryMessage(mon->mdsmon(), op));
       return -EAGAIN;
     }
-    mon->osdmon()->do_application_enable(data,
-					 pg_pool_t::APPLICATION_NAME_CEPHFS,
-					 "data", fs_name, true);
-    mon->osdmon()->do_application_enable(metadata,
-					 pg_pool_t::APPLICATION_NAME_CEPHFS,
+    mon->osdmon()->do_application_enable(data, APP_NAME_CEPHFS, "data",
+					 fs_name, true);
+    mon->osdmon()->do_application_enable(metadata, APP_NAME_CEPHFS,
 					 "metadata", fs_name, true);
     mon->osdmon()->do_set_pool_opt(metadata,
 				   pool_opts_t::RECOVERY_PRIORITY,
@@ -1004,9 +1004,8 @@ class AddDataPoolHandler : public FileSystemCommandHandler
       mon->osdmon()->wait_for_writeable(op, new PaxosService::C_RetryMessage(mon->mdsmon(), op));
       return -EAGAIN;
     }
-    mon->osdmon()->do_application_enable(poolid,
-					 pg_pool_t::APPLICATION_NAME_CEPHFS,
-					 "data", fs_name, true);
+    mon->osdmon()->do_application_enable(poolid, APP_NAME_CEPHFS, "data",
+					 fs_name, true);
     mon->osdmon()->propose_pending();
 
     fsmap.modify_filesystem(
@@ -1235,14 +1234,13 @@ class RenameFilesystemHandler : public FileSystemCommandHandler
       return -EAGAIN;
     }
     for (const auto p : fsp->get_mds_map().get_data_pools()) {
-      mon->osdmon()->do_application_enable(p,
-					   pg_pool_t::APPLICATION_NAME_CEPHFS,
-					   "data", new_fs_name, true);
+      mon->osdmon()->do_application_enable(p, APP_NAME_CEPHFS, "data",
+					   new_fs_name, true);
     }
 
-    mon->osdmon()->do_application_enable(fsp->get_mds_map().get_metadata_pool(),
-					 pg_pool_t::APPLICATION_NAME_CEPHFS,
-					 "metadata", new_fs_name, true);
+    mon->osdmon()->do_application_enable(
+      fsp->get_mds_map().get_metadata_pool(), APP_NAME_CEPHFS, "metadata",
+      new_fs_name, true);
     mon->osdmon()->propose_pending();
 
     auto f = [new_fs_name](auto&& fs) {
@@ -1417,22 +1415,20 @@ class SwapFilesystemHandler : public FileSystemCommandHandler
     // Finally, the swap begins.
     // Swap CephFS names on OSD pool application tag
     for (const auto p : fs1p->get_mds_map().get_data_pools()) {
-      mon->osdmon()->do_application_enable(p,
-					   pg_pool_t::APPLICATION_NAME_CEPHFS,
-					   "data", fs2_name, true);
+      mon->osdmon()->do_application_enable(p, APP_NAME_CEPHFS, "data",
+					   fs2_name, true);
     }
-    mon->osdmon()->do_application_enable(fs1p->get_mds_map().get_metadata_pool(),
-					 pg_pool_t::APPLICATION_NAME_CEPHFS,
-					 "metadata", fs2_name, true);
+    mon->osdmon()->do_application_enable(
+      fs1p->get_mds_map().get_metadata_pool(), APP_NAME_CEPHFS, "metadata",
+      fs2_name, true);
 
     for (const auto p : fs2p->get_mds_map().get_data_pools()) {
-      mon->osdmon()->do_application_enable(p,
-					   pg_pool_t::APPLICATION_NAME_CEPHFS,
-					   "data", fs1_name, true);
+      mon->osdmon()->do_application_enable(p, APP_NAME_CEPHFS, "data",
+					   fs1_name, true);
     }
-    mon->osdmon()->do_application_enable(fs2p->get_mds_map().get_metadata_pool(),
-					 pg_pool_t::APPLICATION_NAME_CEPHFS,
-					 "metadata", fs1_name, true);
+    mon->osdmon()->do_application_enable(
+      fs2p->get_mds_map().get_metadata_pool(), APP_NAME_CEPHFS, "metadata",
+      fs1_name, true);
     mon->osdmon()->propose_pending();
 
     // Now swap CephFS names and, optionally, FSCIDs.
@@ -1821,7 +1817,7 @@ int FileSystemCommandHandler::_check_pool(
   auto app_map = pool->application_metadata;
 
   if (!allow_overlay && !force && !app_map.empty()) {
-    auto app = app_map.find(pg_pool_t::APPLICATION_NAME_CEPHFS);
+    auto app = app_map.find(APP_NAME_CEPHFS);
     if (app != app_map.end()) {
       auto& [app_name, app_metadata] = *app;
       auto itr = app_metadata.find("data");
@@ -1887,8 +1883,7 @@ int FileSystemCommandHandler::_check_pool(
   }
 
   if (!force && !pool->application_metadata.empty() &&
-      pool->application_metadata.count(
-        pg_pool_t::APPLICATION_NAME_CEPHFS) == 0) {
+      pool->application_metadata.count(APP_NAME_CEPHFS) == 0) {
     *ss << " pool '" << pool_name << "' (id '" << pool_id
         << "') has a non-CephFS application enabled.";
     return -EINVAL;