rgw: dump is_truncated when listing bucket

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index e628b5337514943a29103cf8e31ae9de3e535d8c..63130dd1dffe1f66708cfaca32364946fbbd12dd 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -394,7 +394,7 @@ void RGWListBucket::execute()
   }
 
   ret = rgwstore->list_objects(s->user.user_id, s->bucket_str, max, prefix, delimiter, marker, objs, common_prefixes,
-                               !!(s->prot_flags & RGW_REST_OPENSTACK), no_ns, NULL, NULL);
+                               !!(s->prot_flags & RGW_REST_OPENSTACK), no_ns, &is_truncated, NULL);
 
 done:
   send_response();

diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index c5c835c6bbd66cd0c2f40a0ab86c0c0bcd59ccee..ca3faf1e4f3a8eb746a3900d375e93921861f365 100644 (file)
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -137,6 +137,7 @@ protected:
 
   string limit_opt_name;
   int default_max;
+  bool is_truncated;
 
 public:
   RGWListBucket() {}
@@ -151,6 +152,7 @@ public:
     ret = 0;
     objs.clear();
     common_prefixes.clear();
+    is_truncated = false;
   }
   int verify_permission();
   void execute();

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 6d8f562d01b7b489a8b0d17c404a359ea20bba9c..153ed4fc615ceae741d8a78fbeb78f2abf6de998 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -136,6 +136,8 @@ void RGWListBucket_REST_S3::send_response()
   if (!delimiter.empty())
     s->formatter->dump_value_str("Delimiter", delimiter.c_str());
 
+  s->formatter->dump_value_str("IsTruncated", (is_truncated ? "true" : "false"));
+
   if (ret >= 0) {
     vector<RGWObjEnt>::iterator iter;
     for (iter = objs.begin(); iter != objs.end(); ++iter) {