osd/osd_types: include omap and hit_set_archive bytes in pool usage

- Include the hit_set_archive bytes if we're in legacy mode.

- Add in (estimated) omap bytes for both nautilus+ and legacy mode, since
we didn't break out omap usage by pool (oops!).

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

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index bfde9710e0b56d7dcbe308b39d434a9aaf8e55c9..8dea9c96271a5b0d55acaab39c616577f8dfe51e 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -2428,8 +2428,11 @@ struct pool_stat_t {
       allocated_bytes = store_stats.allocated;
     } else {
       // legacy mode, use numbers from 'stats'
-      allocated_bytes = stats.sum.num_bytes;
+      allocated_bytes = stats.sum.num_bytes +
+       stats.sum.num_bytes_hit_set_archive;
     }
+    // omap is not broken out by pool by nautilus bluestore
+    allocated_bytes += stats.sum.num_omap_bytes;
     return allocated_bytes;
   }
   uint64_t get_user_bytes(float raw_used_rate) const {
@@ -2438,8 +2441,11 @@ struct pool_stat_t {
       user_bytes = raw_used_rate ? store_stats.data_stored / raw_used_rate : 0;
     } else {
       // legacy mode, use numbers from 'stats'
-       user_bytes = stats.sum.num_bytes;
+      user_bytes = stats.sum.num_bytes +
+       stats.sum.num_bytes_hit_set_archive;
     }
+    // omap is not broken out by pool by nautilus bluestore
+    user_bytes += stats.sum.num_omap_bytes;
     return user_bytes;
   }