From 3677e62d52ed471906c5229bcd01d66acbf17645 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 8 Sep 2017 15:00:46 -0400 Subject: [PATCH] mon: app labels unconditional Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 3 +-- src/mon/PGMap.cc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 106d2826f577a..259672f8943a5 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3144,8 +3144,7 @@ void OSDMonitor::do_application_enable(int64_t pool_id, dout(20) << __func__ << ": pool_id=" << pool_id << ", app_name=" << app_name << dendl; - assert(osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS || - pending_inc.new_require_osd_release >= CEPH_RELEASE_LUMINOUS); + assert(osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS); auto pp = osdmap.get_pg_pool(pool_id); assert(pp != nullptr); diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index b64d10c4f5417..32ea3a9e178f7 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -2723,8 +2723,7 @@ void PGMap::get_health_checks( const object_stat_sum_t& sum = pstat->stats.sum; // application metadata is not encoded until luminous is minimum // required release - if (osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS && - sum.num_objects > 0 && pool.application_metadata.empty() && + if (sum.num_objects > 0 && pool.application_metadata.empty() && !pool.is_tier()) { stringstream ss; ss << "application not enabled on pool '" << pool_name << "'"; -- 2.39.5