@@ -32,6 +32,8 @@ using std::vector;
3232using std::ostream;
3333
3434
35+ static const auto & APP_NAME_CEPHFS = pg_pool_t ::APPLICATION_NAME_CEPHFS;
36+
3537class FlagSetHandler : public FileSystemCommandHandler
3638{
3739 public:
@@ -255,11 +257,9 @@ class FsNewHandler : public FileSystemCommandHandler
255257 mon->osdmon ()->wait_for_writeable (op, new PaxosService::C_RetryMessage (mon->mdsmon (), op));
256258 return -EAGAIN;
257259 }
258- mon->osdmon ()->do_application_enable (data,
259- pg_pool_t ::APPLICATION_NAME_CEPHFS,
260- " data" , fs_name, true );
261- mon->osdmon ()->do_application_enable (metadata,
262- pg_pool_t ::APPLICATION_NAME_CEPHFS,
260+ mon->osdmon ()->do_application_enable (data, APP_NAME_CEPHFS, " data" ,
261+ fs_name, true );
262+ mon->osdmon ()->do_application_enable (metadata, APP_NAME_CEPHFS,
263263 " metadata" , fs_name, true );
264264 mon->osdmon ()->do_set_pool_opt (metadata,
265265 pool_opts_t ::RECOVERY_PRIORITY,
@@ -1004,9 +1004,8 @@ class AddDataPoolHandler : public FileSystemCommandHandler
10041004 mon->osdmon ()->wait_for_writeable (op, new PaxosService::C_RetryMessage (mon->mdsmon (), op));
10051005 return -EAGAIN;
10061006 }
1007- mon->osdmon ()->do_application_enable (poolid,
1008- pg_pool_t ::APPLICATION_NAME_CEPHFS,
1009- " data" , fs_name, true );
1007+ mon->osdmon ()->do_application_enable (poolid, APP_NAME_CEPHFS, " data" ,
1008+ fs_name, true );
10101009 mon->osdmon ()->propose_pending ();
10111010
10121011 fsmap.modify_filesystem (
@@ -1235,14 +1234,13 @@ class RenameFilesystemHandler : public FileSystemCommandHandler
12351234 return -EAGAIN;
12361235 }
12371236 for (const auto p : fsp->get_mds_map ().get_data_pools ()) {
1238- mon->osdmon ()->do_application_enable (p,
1239- pg_pool_t ::APPLICATION_NAME_CEPHFS,
1240- " data" , new_fs_name, true );
1237+ mon->osdmon ()->do_application_enable (p, APP_NAME_CEPHFS, " data" ,
1238+ new_fs_name, true );
12411239 }
12421240
1243- mon->osdmon ()->do_application_enable (fsp-> get_mds_map (). get_metadata_pool (),
1244- pg_pool_t ::APPLICATION_NAME_CEPHFS ,
1245- " metadata " , new_fs_name, true );
1241+ mon->osdmon ()->do_application_enable (
1242+ fsp-> get_mds_map (). get_metadata_pool (), APP_NAME_CEPHFS, " metadata " ,
1243+ new_fs_name, true );
12461244 mon->osdmon ()->propose_pending ();
12471245
12481246 auto f = [new_fs_name](auto && fs) {
@@ -1417,22 +1415,20 @@ class SwapFilesystemHandler : public FileSystemCommandHandler
14171415 // Finally, the swap begins.
14181416 // Swap CephFS names on OSD pool application tag
14191417 for (const auto p : fs1p->get_mds_map ().get_data_pools ()) {
1420- mon->osdmon ()->do_application_enable (p,
1421- pg_pool_t ::APPLICATION_NAME_CEPHFS,
1422- " data" , fs2_name, true );
1418+ mon->osdmon ()->do_application_enable (p, APP_NAME_CEPHFS, " data" ,
1419+ fs2_name, true );
14231420 }
1424- mon->osdmon ()->do_application_enable (fs1p-> get_mds_map (). get_metadata_pool (),
1425- pg_pool_t ::APPLICATION_NAME_CEPHFS ,
1426- " metadata " , fs2_name, true );
1421+ mon->osdmon ()->do_application_enable (
1422+ fs1p-> get_mds_map (). get_metadata_pool (), APP_NAME_CEPHFS, " metadata " ,
1423+ fs2_name, true );
14271424
14281425 for (const auto p : fs2p->get_mds_map ().get_data_pools ()) {
1429- mon->osdmon ()->do_application_enable (p,
1430- pg_pool_t ::APPLICATION_NAME_CEPHFS,
1431- " data" , fs1_name, true );
1426+ mon->osdmon ()->do_application_enable (p, APP_NAME_CEPHFS, " data" ,
1427+ fs1_name, true );
14321428 }
1433- mon->osdmon ()->do_application_enable (fs2p-> get_mds_map (). get_metadata_pool (),
1434- pg_pool_t ::APPLICATION_NAME_CEPHFS ,
1435- " metadata " , fs1_name, true );
1429+ mon->osdmon ()->do_application_enable (
1430+ fs2p-> get_mds_map (). get_metadata_pool (), APP_NAME_CEPHFS, " metadata " ,
1431+ fs1_name, true );
14361432 mon->osdmon ()->propose_pending ();
14371433
14381434 // Now swap CephFS names and, optionally, FSCIDs.
@@ -1821,7 +1817,7 @@ int FileSystemCommandHandler::_check_pool(
18211817 auto app_map = pool->application_metadata ;
18221818
18231819 if (!allow_overlay && !force && !app_map.empty ()) {
1824- auto app = app_map.find (pg_pool_t ::APPLICATION_NAME_CEPHFS );
1820+ auto app = app_map.find (APP_NAME_CEPHFS );
18251821 if (app != app_map.end ()) {
18261822 auto & [app_name, app_metadata] = *app;
18271823 auto itr = app_metadata.find (" data" );
@@ -1887,8 +1883,7 @@ int FileSystemCommandHandler::_check_pool(
18871883 }
18881884
18891885 if (!force && !pool->application_metadata .empty () &&
1890- pool->application_metadata .count (
1891- pg_pool_t ::APPLICATION_NAME_CEPHFS) == 0 ) {
1886+ pool->application_metadata .count (APP_NAME_CEPHFS) == 0 ) {
18921887 *ss << " pool '" << pool_name << " ' (id '" << pool_id
18931888 << " ') has a non-CephFS application enabled." ;
18941889 return -EINVAL;
0 commit comments