Merge pull request ceph#7821 from rzarzynski/wip-rgw-14903

rgw: fix wrong handling of limit=0 during listing of Swift account. Reviewed-by: Yehuda Sadeh <[email protected]>
albertghtoun · Feb 26, 2016 · 8880211 · 8880211
2 parents d7b47c2 + ec186f4
commit 8880211
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
@@ -1307,8 +1307,9 @@ void RGWListBuckets::execute()
     }
 
     op_ret = rgw_read_user_buckets(store, s->user->user_id, buckets,
-				   marker, end_marker, read_count,
-				   should_get_stats(), &is_truncated);
+                                   marker, end_marker, read_count,
+                                   should_get_stats(), &is_truncated,
+                                   get_default_max());
     if (op_ret < 0) {
       /* hmm.. something wrong here.. the user was authenticated, so it
          should exist */

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
@@ -286,6 +286,10 @@ class RGWListBuckets : public RGWOp {
   map<string, bufferlist> attrs;
   bool is_truncated;
 
+  virtual uint64_t get_default_max() const {
+    return 1000;
+  }
+
 public:
   RGWListBuckets() : sent_data(false) {
     limit = limit_max = RGW_LIST_BUCKETS_LIMIT_MAX;

diff --git a/src/rgw/rgw_rest_swift.h b/src/rgw/rgw_rest_swift.h
@@ -21,6 +21,10 @@ class RGWGetObj_ObjStore_SWIFT : public RGWGetObj_ObjStore {
 
 class RGWListBuckets_ObjStore_SWIFT : public RGWListBuckets_ObjStore {
   bool need_stats;
+
+  uint64_t get_default_max() const override {
+    return 0;
+  }
 public:
   RGWListBuckets_ObjStore_SWIFT() : need_stats(true) {}
   ~RGWListBuckets_ObjStore_SWIFT() {}