From 6e7358b3958b7ee11ef612302b300d07f3982d54 Mon Sep 17 00:00:00 2001 From: huangjun Date: Thu, 16 Jul 2015 09:17:59 +0800 Subject: [PATCH 1/2] rest_bench: drain the work queue to fix a crash Fixes: #3896 Signed-off-by: huangjun (cherry picked from commit f3d34d8ff921dbd2ff21f6b72af7c73bb9c6940e) --- src/tools/rest_bench.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/tools/rest_bench.cc b/src/tools/rest_bench.cc index 50340d94f921d9..46a72c5b35c333 100644 --- a/src/tools/rest_bench.cc +++ b/src/tools/rest_bench.cc @@ -281,6 +281,11 @@ class RESTDispatcher { list_bucket_handler.listBucketCallback = list_bucket_callback; } + ~RESTDispatcher() + { + req_wq.drain(); + m_tp.stop(); + } void process_context(req_context *ctx); void get_obj(req_context *ctx); void put_obj(req_context *ctx); From 7bddf5d4dad09b1f6d3b4e80e4bdd895191560b0 Mon Sep 17 00:00:00 2001 From: huangjun Date: Thu, 16 Jul 2015 09:42:55 +0800 Subject: [PATCH 2/2] rest_bench: bucketname is not mandatory as we have a default name Signed-off-by: huangjun (cherry picked from commit bc56a87ea3b69b4856a2b9f9fb2a63dbfb1211c3) --- src/tools/rest_bench.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/tools/rest_bench.cc b/src/tools/rest_bench.cc index 46a72c5b35c333..6da5cf8f4b348b 100644 --- a/src/tools/rest_bench.cc +++ b/src/tools/rest_bench.cc @@ -743,10 +743,6 @@ int main(int argc, const char **argv) } } - if (bucket.empty()) { - cerr << "rest-bench: bucket not specified" << std::endl; - usage_exit(); - } if (args.empty()) usage_exit(); int operation = 0;