rgw: fix usage log read

The usage log read got broken in a recent cleanup work.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc
index f7975ed8fa64ba680fdd1fd6a7dbb04a2cb7351f..29cf389431b0966361740715eafddc643a593c37 100644 (file)
--- a/src/cls/rgw/cls_rgw_client.cc
+++ b/src/cls/rgw/cls_rgw_client.cc
@@ -116,6 +116,8 @@ int cls_rgw_usage_log_read(IoCtx& io_ctx, string& oid, string& user,
     read_iter = result.next_iter;
     if (is_truncated)
       *is_truncated = result.truncated;
+
+    usage = result.usage;
   } catch (buffer::error& e) {
     return -EINVAL;
   }

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 9b105b87fbd3835d547ecc90b5057ecdb1717a9a..22fd0eccbe0af56949d076466f6289fe43c13ceb 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -508,20 +508,20 @@ int RGWRados::read_usage(string& user, uint64_t start_epoch, uint64_t end_epoch,
   }
 
   do {
-    map<rgw_user_bucket, rgw_usage_log_entry> usage;
+    map<rgw_user_bucket, rgw_usage_log_entry> ret_usage;
     map<rgw_user_bucket, rgw_usage_log_entry>::iterator iter;
 
     int ret =  cls_obj_usage_log_read(hash, user, start_epoch, end_epoch, num,
-                                    usage_iter.read_iter, usage, is_truncated);
+                                    usage_iter.read_iter, ret_usage, is_truncated);
     if (ret == -ENOENT)
       goto next;
 
     if (ret < 0)
       return ret;
 
-    num -= usage.size();
+    num -= ret_usage.size();
 
-    for (iter = usage.begin(); iter != usage.end(); ++iter) {
+    for (iter = ret_usage.begin(); iter != ret_usage.end(); ++iter) {
       usage[iter->first].aggregate(iter->second);
     }