From ffd92d20caefb50412f9e3ec0fe708ec880164be Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 20 Jul 2011 13:24:25 -0700 Subject: [PATCH] rgw: dump is_truncated when listing bucket --- src/rgw/rgw_op.cc | 2 +- src/rgw/rgw_op.h | 2 ++ src/rgw/rgw_rest_s3.cc | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index e628b53375149..63130dd1dffe1 100644 --- 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 c5c835c6bbd66..ca3faf1e4f3a8 100644 --- 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 6d8f562d01b7b..153ed4fc615ce 100644 --- 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::iterator iter; for (iter = objs.begin(); iter != objs.end(); ++iter) { -- 2.39.5