From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Sep 2019 16:50:21 +0000 (-0500)
Subject: osd/osd_types: fix {omap,hitset_bytes}_stats_invalid handling on split/merge
X-Git-Tag: v15.1.0~1469^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5685bed71e1aad1bccb23bd237267de09b468221;p=ceph.git

osd/osd_types: fix {omap,hitset_bytes}_stats_invalid handling on split/merge

Fixes: https://tracker.ceph.com/issues/41936
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index bf663fe3fdc3..dc37e96d62c3 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -2159,7 +2159,9 @@ struct pg_stat_t {
     // adding (or subtracting!) invalid stats render our stats invalid too
     stats_invalid |= o.stats_invalid;
     dirty_stats_invalid |= o.dirty_stats_invalid;
+    omap_stats_invalid |= o.omap_stats_invalid;
     hitset_stats_invalid |= o.hitset_stats_invalid;
+    hitset_bytes_stats_invalid |= o.hitset_bytes_stats_invalid;
     pin_stats_invalid |= o.pin_stats_invalid;
     manifest_stats_invalid |= o.manifest_stats_invalid;
   }