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>

diff --cc src/mon/PGMap.cc
Simple merge

diff --cc src/mon/PGMap.h
index 5a0479824f71dd57b358e5e23fbca80cb57eb461,ab2b9524beb0485c7d03dd4e936cff558704c3d8..6231407b08e2595a14220dba71e854ae880b3a21
--- 1/src/mon/PGMap.h
--- 2/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;