]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMOnitor: ignore PRIMARY_AFFINITY
authorSage Weil <sage@redhat.com>
Wed, 25 Oct 2017 22:04:55 +0000 (17:04 -0500)
committerSage Weil <sage@redhat.com>
Fri, 27 Oct 2017 13:31:07 +0000 (08:31 -0500)
Luminous has it.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index 5a93ebaf38afe625bd6df643d93e84c61d61c486..cc3cbbaff2eb026d3bd43e6c5beb48230696f3d4 100644 (file)
@@ -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 << ")";