]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: adjust avg_size calculation in agent_choose_mode 2293/head
authorZhiqiang Wang <wonzhq@hotmail.com>
Wed, 20 Aug 2014 09:41:31 +0000 (17:41 +0800)
committerSage Weil <sage@redhat.com>
Fri, 29 Aug 2014 23:52:38 +0000 (16:52 -0700)
Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
src/osd/ReplicatedPG.cc

index bd55f1057f259bd6fb01475b94de3b0342a4127d..963a71335074063fcf690af63e5533a21abb4645 100644 (file)
@@ -11617,9 +11617,8 @@ void ReplicatedPG::agent_choose_mode(bool restart)
   // get dirty, full ratios
   uint64_t dirty_micro = 0;
   uint64_t full_micro = 0;
-  if (pool.info.target_max_bytes && info.stats.stats.sum.num_objects > 0) {
-    uint64_t avg_size = info.stats.stats.sum.num_bytes /
-      info.stats.stats.sum.num_objects;
+  if (pool.info.target_max_bytes && num_user_objects > 0) {
+    uint64_t avg_size = num_user_bytes / num_user_objects;
     dirty_micro =
       num_dirty * avg_size * 1000000 /
       MAX(pool.info.target_max_bytes / divisor, 1);