From: David Zafman <dzafman@redhat.com>
Date: Thu, 14 Mar 2019 00:18:16 +0000 (-0700)
Subject: osd: Publish stats after all changes made
X-Git-Tag: v14.2.1~93^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5fae7aebc7c344470d45e488f858485890376cd;p=ceph.git

osd: Publish stats after all changes made

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 06e6ebc7836d0bc65361a7857ba8cf4a31040bc2)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7d67f20617ec..a2a6c790ae59 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5789,7 +5789,6 @@ void PG::scrub_finish()
     dout(25) << __func__ << " shard " << pg_whoami << " num_omap_bytes = "
              << info.stats.stats.sum.num_omap_bytes << " num_omap_keys = "
              << info.stats.stats.sum.num_omap_keys << dendl;
-    publish_stats_to_osd();
   } else {
     info.stats.stats.sum.num_shallow_scrub_errors = scrubber.shallow_errors;
     // XXX: last_clean_scrub_stamp doesn't mean the pg is not inconsistent
@@ -5800,6 +5799,7 @@ void PG::scrub_finish()
   info.stats.stats.sum.num_scrub_errors = 
     info.stats.stats.sum.num_shallow_scrub_errors +
     info.stats.stats.sum.num_deep_scrub_errors;
+  publish_stats_to_osd();
   reg_next_scrub();
 
   {