From: Sage Weil <sage@newdream.net>
Date: Tue, 2 May 2017 15:54:19 +0000 (-0500)
Subject: Merge pull request #12669 from hjwsm1989/unfound-objects
X-Git-Tag: v12.0.3~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94a873090e923e764acd994adb55520eefc58658;p=ceph.git

Merge pull request #12669 from hjwsm1989/unfound-objects

osd/PG: fix possible overflow on unfound objects

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

94a873090e923e764acd994adb55520eefc58658
diff --cc src/osd/PG.cc
index 553be2ab1cc,9661594fb1c..ba15491bf53
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -479,9 -470,9 +479,9 @@@ bool PG::search_for_missing
    pg_shard_t from,
    RecoveryCtx *ctx)
  {
-   unsigned num_unfound_before = missing_loc.num_unfound();
+   uint64_t num_unfound_before = missing_loc.num_unfound();
    bool found_missing = missing_loc.add_source_info(
 -    from, oinfo, omissing, get_sort_bitwise(), ctx->handle);
 +    from, oinfo, omissing, ctx->handle);
    if (found_missing && num_unfound_before != missing_loc.num_unfound())
      publish_stats_to_osd();
    if (found_missing &&
diff --cc src/osd/PG.h
index 65423ac8208,4e30023bdbf..e14cbde4636
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@@ -1058,9 -1041,9 +1058,9 @@@ public
    void proc_primary_info(ObjectStore::Transaction &t, const pg_info_t &info);
  
    bool have_unfound() const { 
 -    return missing_loc.num_unfound() > 0;
 +    return missing_loc.have_unfound();
    }
-   int get_num_unfound() const {
+   uint64_t get_num_unfound() const {
      return missing_loc.num_unfound();
    }