]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix user stats iterative increment 37779/head
authorMark Kogan <mkogan@redhat.com>
Mon, 10 Aug 2020 10:19:19 +0000 (13:19 +0300)
committerNathan Cutler <ncutler@suse.com>
Sat, 24 Oct 2020 11:52:41 +0000 (13:52 +0200)
The RGWBucketCtl::sync_user_stats() function can increment or reset the
stats [1][2]

[1]https://github.com/ceph/ceph/blob/master/src/rgw/rgw_bucket.cc#L3745
[2]https://github.com/ceph/ceph/blob/master/src/rgw/services/svc_bi_rados.cc#L379-L381

fixes: https://tracker.ceph.com/issues/46400

Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 21e877ca67db7840026b1768751b167e2c0a53da)

Conflicts:
src/rgw/rgw_sal.cc
- master's owner->get_id() becomes user.info.user_id in octopus

src/rgw/rgw_sal.cc

index 22cb33fa216b71202dfe4bb7a0ef3b38c0ade83e..2b7a313ed912076232b23ba00d603517f79ca558 100644 (file)
@@ -177,7 +177,7 @@ int RGWRadosBucket::read_bucket_stats(optional_yield y)
 
 int RGWRadosBucket::sync_user_stats()
 {
-      return store->ctl()->bucket->sync_user_stats(user.info.user_id, info, &ent);
+      return store->ctl()->bucket->sync_user_stats(user.info.user_id, info);
 }
 
 int RGWRadosBucket::update_container_stats(void)