Merge pull request #5383: rest-bench common/WorkQueue.cc: 54: FAILED …

…assert(_threads.empty()) Reviewed-by:
ceph · Jul 29, 2015 · 51f24b1 · 51f24b1
2 parents db2c81b + 7bddf5d
commit 51f24b1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git 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);
@@ -738,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;