]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd: haven't take acting into account here, remove unnecessary variable
authorMingxin Liu <mingxin@xsky.com>
Mon, 6 Mar 2017 09:06:45 +0000 (17:06 +0800)
committerMingxin Liu <mingxin@xsky.com>
Fri, 19 May 2017 06:45:43 +0000 (14:45 +0800)
Signed-off-by: Mingxin Liu <mingxin@xsky.com>
src/osd/OSDMap.cc

index 96bfa8a29e483d73fd5b5fc5ebb7af0920de0c18..6cca57b93284c1ae8c37631b3acccd2ff42c3663 100644 (file)
@@ -3169,20 +3169,18 @@ int OSDMap::summarize_mapping_stats(
   vector<unsigned> new_by_osd(get_max_osd(), 0);
   for (int64_t pool_id : ls) {
     const pg_pool_t *pi = get_pg_pool(pool_id);
-    vector<int> up, up2, acting;
-    int up_primary, acting_primary;
+    vector<int> up, up2;
+    int up_primary;
     for (unsigned ps = 0; ps < pi->get_pg_num(); ++ps) {
       pg_t pgid(ps, pool_id, -1);
       total_pg += pi->get_size();
-      pg_to_up_acting_osds(pgid, &up, &up_primary,
-                          &acting, &acting_primary);
+      pg_to_up_acting_osds(pgid, &up, &up_primary, nullptr, nullptr);
       for (int osd : up) {
        if (osd >= 0 && osd < get_max_osd())
          ++base_by_osd[osd];
       }
       if (newmap) {
-       newmap->pg_to_up_acting_osds(pgid, &up2, &up_primary,
-                                    &acting, &acting_primary);
+       newmap->pg_to_up_acting_osds(pgid, &up2, &up_primary, nullptr, nullptr);
        for (int osd : up2) {
          if (osd >= 0 && osd < get_max_osd())
            ++new_by_osd[osd];