From: Yuri Weinstein <yuri.weinstein@gmail.com>
Date: Tue, 2 May 2017 16:09:10 +0000 (-0700)
Subject: Merge pull request #13451 from xiexingguo/wip-add-up-primary-sum
X-Git-Tag: v12.0.3~121
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=279050e4eb220826e076172e30a2bc2ee97a6900;p=ceph-ci.git

Merge pull request #13451 from xiexingguo/wip-add-up-primary-sum

mon/PGMap: add up_primary pg number field for pg-dump cmd

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

279050e4eb220826e076172e30a2bc2ee97a6900
diff --cc src/mon/PGMap.h
index 5a0479824f7,ab2b9524beb..6231407b08e
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@@ -122,9 -121,10 +122,10 @@@ public
    ceph::unordered_map<int,pool_stat_t> pg_pool_sum;
    pool_stat_t pg_sum;
    osd_stat_t osd_sum;
 -  mutable epoch_t min_last_epoch_clean;
 +  mutable epoch_t min_last_epoch_clean = 0;
    ceph::unordered_map<int,int> blocked_by_sum;
    ceph::unordered_map<int,set<pg_t> > pg_by_osd;
+   ceph::unordered_map<int,int> num_primary_pg_by_osd;
  
    utime_t stamp;