From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Oct 2017 22:04:55 +0000 (-0500)
Subject: mon/OSDMOnitor: ignore PRIMARY_AFFINITY
X-Git-Tag: v13.0.1~348^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5f147f15b6a3b56628c75de935876ff4cba905cc;p=ceph.git

mon/OSDMOnitor: ignore PRIMARY_AFFINITY

Luminous has it.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5a93ebaf38a..cc3cbbaff2e 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -9363,11 +9363,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = -EPERM;
       goto reply;
     }
-    err = check_cluster_features(CEPH_FEATURE_OSD_PRIMARY_AFFINITY, ss);
-    if (err == -EAGAIN)
-      goto wait;
-    if (err < 0)
-      goto reply;
     if (osdmap.exists(id)) {
       pending_inc.new_primary_affinity[id] = ww;
       ss << "set osd." << id << " primary-affinity to " << w << " (" << ios::hex << ww << ios::dec << ")";