From: Kefu Chai <kchai@redhat.com>
Date: Thu, 5 Feb 2015 04:34:42 +0000 (+0800)
Subject: osd: apply affinity if any affinity is not default
X-Git-Tag: v0.93~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3618%2Fhead;p=ceph.git

osd: apply affinity if any affinity is not default
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index d4c45110cd4a..e93040c33c0b 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1570,6 +1570,7 @@ void OSDMap::_apply_primary_affinity(ps_t seed,
     if (*p != CRUSH_ITEM_NONE &&
 	(*osd_primary_affinity)[*p] != CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) {
       any = true;
+      break;
     }
   }
   if (!any)
@@ -2370,7 +2371,7 @@ string OSDMap::get_flag_string(unsigned f)
   if (f & CEPH_OSDMAP_NOTIERAGENT)
     s += ",notieragent";
   if (s.length())
-    s = s.erase(0, 1);
+    s.erase(0, 1);
   return s;
 }