From: Babu Shanmugam Date: Thu, 30 May 2013 04:58:23 +0000 (+0530) Subject: flushed the formatter after closing the primary section in MDLOG, BILOG and GETSHARDI... X-Git-Tag: v0.67-rc1~128^2~91^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d20e30a74493b1c694a6a792d8a31e18ad4408df;p=ceph.git flushed the formatter after closing the primary section in MDLOG, BILOG and GETSHARDINFO :: list() Signed-off-by: Babu Shanmugam --- diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/rgw_rest_log.cc index f5ffce19f37..97af495e652 100644 --- a/src/rgw/rgw_rest_log.cc +++ b/src/rgw/rgw_rest_log.cc @@ -88,6 +88,7 @@ void RGWOp_MDLog_List::send_response() { flusher.flush(); } s->formatter->close_section(); + flusher.flush(); } void RGWOp_MDLog_GetShardsInfo::execute() { @@ -103,6 +104,7 @@ void RGWOp_MDLog_GetShardsInfo::send_response() { s->formatter->open_object_section("num_objects"); s->formatter->dump_unsigned("num_objects", num_objects); s->formatter->close_section(); + flusher.flush(); } void RGWOp_MDLog_Delete::execute() { @@ -278,6 +280,7 @@ void RGWOp_BILog_List::send_response(list& entries, string& ma void RGWOp_BILog_List::send_response_end() { s->formatter->close_section(); + flusher.flush(); } void RGWOp_BILog_Delete::execute() { diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc index a2a3c2ad56b..d3d312b7c5f 100644 --- a/src/test/test_rgw_admin_log.cc +++ b/src/test/test_rgw_admin_log.cc @@ -54,7 +54,7 @@ using namespace std; #define HTTP_RESPONSE_STR "RespCode" #define CEPH_CRYPTO_HMACSHA1_DIGESTSIZE 20 #define RGW_ADMIN_RESP_PATH "/tmp/.test_rgw_admin_resp" -#define TEST_BUCKET_NAME "test_bucket1" +#define TEST_BUCKET_NAME "test_bucket" #define TEST_BUCKET_OBJECT "test_object" #define TEST_BUCKET_OBJECT_1 "test_object1" #define TEST_BUCKET_OBJECT_SIZE 1024