From: Douglas Fuller <dfuller@redhat.com>
Date: Wed, 23 Aug 2017 20:34:21 +0000 (-0400)
Subject: mon/FSCommands: Tag pools used for cephfs by default
X-Git-Tag: v13.0.1~133^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d700f3caa386a6a6ba0f34b3e11dd578006c3688;p=ceph-ci.git

mon/FSCommands: Tag pools used for cephfs by default

On FS creation, add the cephfs application pool tag, plus
key "metadata" : value <fs_name> (for metadata pools)
key "data" : value <fs_name> (for data pools)

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
---

diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc
index 49d4bf5cd9d..26be188458f 100644
--- a/src/mon/FSCommands.cc
+++ b/src/mon/FSCommands.cc
@@ -195,9 +195,11 @@ class FsNewHandler : public FileSystemCommandHandler
       return -EAGAIN;
     }
     mon->osdmon()->do_application_enable(data,
-					 pg_pool_t::APPLICATION_NAME_CEPHFS);
+					 pg_pool_t::APPLICATION_NAME_CEPHFS,
+					 "data", fs_name);
     mon->osdmon()->do_application_enable(metadata,
-					 pg_pool_t::APPLICATION_NAME_CEPHFS);
+					 pg_pool_t::APPLICATION_NAME_CEPHFS,
+					 "metadata", fs_name);
     mon->osdmon()->propose_pending();
 
     // All checks passed, go ahead and create.
@@ -522,7 +524,9 @@ 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);
+    mon->osdmon()->do_application_enable(poolid,
+					 pg_pool_t::APPLICATION_NAME_CEPHFS,
+					 "data", poolname);
     mon->osdmon()->propose_pending();
 
     fsmap.modify_filesystem(