rgw: swift bucket report returns both bytes size and actual size

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index ee43051fb9b46eb4c5b976acb7ee4c3e6f1aeab9..e48859d4ecbde754a23203de4077753e232cb2b9 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -451,6 +451,7 @@ int bucket_stats(rgw_bucket& bucket, Formatter *formatter)
     const char *cat_name = rgw_obj_category_name(iter->first);
     formatter->open_object_section(cat_name);
     formatter->dump_int("size_kb", s.num_kb);
+    formatter->dump_int("size_kb_actual", s.num_kb_rounded);
     formatter->dump_int("num_objects", s.num_objects);
     formatter->close_section();
     formatter->flush(cout);

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 24bf57c155499321ad8e352307eb313789fedb47..68cd00dc5933c5a0b9a44474539a003bab91b3e6 100644 (file)
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -498,6 +498,7 @@ struct RGWBucketStats
 {
   RGWObjCategory category;
   uint64_t num_kb;
+  uint64_t num_kb_rounded;
   uint64_t num_objects;
 };
 
@@ -594,11 +595,12 @@ struct RGWObjEnt {
 struct RGWBucketEnt {
   rgw_bucket bucket;
   size_t size;
+  size_t size_rounded;
   time_t mtime;
   uint64_t count;
 
   void encode(bufferlist& bl) const {
-    __u8 struct_v = 3;
+    __u8 struct_v = 4;
     ::encode(struct_v, bl);
     uint64_t s = size;
     __u32 mt = mtime;
@@ -607,6 +609,8 @@ struct RGWBucketEnt {
     ::encode(mt, bl);
     ::encode(count, bl);
     ::encode(bucket, bl);
+    s = size_rounded;
+    ::encode(s, bl);
   }
   void decode(bufferlist::iterator& bl) {
     __u8 struct_v;
@@ -622,10 +626,14 @@ struct RGWBucketEnt {
       ::decode(count, bl);
     if (struct_v >= 3)
       ::decode(bucket, bl);
+    if (struct_v >= 4)
+      ::decode(s, bl);
+    size_rounded = s;
   }
   void clear() {
     bucket.clear();
     size = 0;
+    size_rounded = 0;
     mtime = 0;
     count = 0;
   }

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 30be993eccae6e38b98a7b35c843134d2c859dca..e4b868a5e2bc74b2ba7d6e640a74eb8edaf25892 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -296,15 +296,12 @@ void RGWGetObj::execute()
   if (ret < 0)
     goto done;
 
-dout(0) << __FILE__ << ":" << __LINE__ << ": ofs=" << ofs << " end=" << end << " total_len=" << total_len << dendl;
-
   obj.init(s->bucket, s->object_str);
   rgwstore->set_atomic(s->obj_ctx, obj);
   ret = rgwstore->prepare_get_obj(s->obj_ctx, obj, &ofs, &end, &attrs, mod_ptr,
                                   unmod_ptr, &lastmod, if_match, if_nomatch, &total_len, &s->obj_size, &handle, &s->err);
   if (ret < 0)
     goto done;
-dout(0) << __FILE__ << ":" << __LINE__ << ": ofs=" << ofs << " end=" << end << " total_len=" << total_len << dendl;
 
   start = ofs;
 
@@ -314,7 +311,6 @@ dout(0) << __FILE__ << ":" << __LINE__ << ": ofs=" << ofs << " end=" << end << "
   perfcounter->inc(l_rgw_get_b, end - ofs);
 
   while (ofs <= end) {
-dout(0) << __FILE__ << ":" << __LINE__ << ": ofs=" << ofs << " end=" << end << " total_len=" << total_len << dendl;
     data = NULL;
     ret = rgwstore->get_obj(s->obj_ctx, &handle, obj, &data, ofs, end);
     if (ret < 0) {
@@ -421,6 +417,7 @@ void RGWStatAccount::execute()
     for (iter = m.begin(); iter != m.end(); ++iter) {
       RGWBucketEnt& bucket = iter->second;
       buckets_size += bucket.size;
+      buckets_size_rounded += bucket.size_rounded;
       buckets_objcount += bucket.count;
     }
     buckets_count = m.size();

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 6ffe2eaab8dd077f06dbb9a0e4689e2ecd0cc8e8..3e70115434016802a6cf84bb44d01108dd33ee0b 100644 (file)
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -121,6 +121,7 @@ protected:
   uint32_t buckets_count;
   uint64_t buckets_objcount;
   uint64_t buckets_size;
+  uint64_t buckets_size_rounded;
 
 public:
   virtual void init(struct req_state *s) {
@@ -129,6 +130,7 @@ public:
     buckets_count = 0;
     buckets_objcount = 0;
     buckets_size = 0;
+    buckets_size_rounded = 0;
   }
   RGWStatAccount() {}
 

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 018fbd70fafb5501f555fbdda280bfbbedd7f50f..147763d49778fe759d7d5ab5e7948968a8373c17 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1779,7 +1779,8 @@ int RGWRados::get_bucket_stats(rgw_bucket& bucket, map<RGWObjCategory, RGWBucket
     RGWBucketStats& s = stats[category];
     struct rgw_bucket_category_stats& stats = iter->second;
     s.category = (RGWObjCategory)iter->first;
-    s.num_kb = ((stats.total_size_rounded + 1023) / 1024);
+    s.num_kb = ((stats.total_size + 1023) / 1024);
+    s.num_kb_rounded = ((stats.total_size_rounded + 1023) / 1024);
     s.num_objects = stats.num_entries;
   }
 
@@ -1975,7 +1976,8 @@ int RGWRados::update_containers_stats(map<string, RGWBucketEnt>& m)
     if (iter != header.stats.end()) {
       struct rgw_bucket_category_stats& stats = iter->second;
       ent.count = stats.num_entries;
-      ent.size = stats.total_size_rounded;
+      ent.size = stats.total_size;
+      ent.size_rounded = stats.total_size_rounded;
     }
   }
 

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index a8fe03a74572a3c57aecb29a9c5c310b623a2e5c..9a226f32e8ce3f9eb049956d3383436d27879ab8 100644 (file)
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -189,10 +189,12 @@ static void dump_container_metadata(struct req_state *s, RGWBucketEnt& bucket)
   CGI_PRINTF(s,"X-Container-Object-Count: %s\n", buf);
   snprintf(buf, sizeof(buf), "%lld", (long long)bucket.size);
   CGI_PRINTF(s,"X-Container-Bytes-Used: %s\n", buf);
+  snprintf(buf, sizeof(buf), "%lld", (long long)bucket.size_rounded);
+  CGI_PRINTF(s,"X-Container-Bytes-Used-Actual: %s\n", buf);
 }
 
 static void dump_account_metadata(struct req_state *s, uint32_t buckets_count,
-                                  uint64_t buckets_object_count, uint64_t buckets_size)
+                                  uint64_t buckets_object_count, uint64_t buckets_size, uint64_t buckets_size_rounded)
 {
   char buf[32];
   snprintf(buf, sizeof(buf), "%lld", (long long)buckets_count);
@@ -201,13 +203,15 @@ static void dump_account_metadata(struct req_state *s, uint32_t buckets_count,
   CGI_PRINTF(s,"X-Account-Object-Count: %s\n", buf);
   snprintf(buf, sizeof(buf), "%lld", (long long)buckets_size);
   CGI_PRINTF(s,"X-Account-Bytes-Used: %s\n", buf);
+  snprintf(buf, sizeof(buf), "%lld", (long long)buckets_size_rounded);
+  CGI_PRINTF(s,"X-Account-Bytes-Used-Actual: %s\n", buf);
 }
 
 void RGWStatAccount_REST_SWIFT::send_response()
 {
   if (ret >= 0) {
     ret = STATUS_NO_CONTENT;
-    dump_account_metadata(s, buckets_count, buckets_objcount, buckets_size);
+    dump_account_metadata(s, buckets_count, buckets_objcount, buckets_size, buckets_size_rounded);
   }
 
   set_req_state_err(s, ret);