rgw: stop async_rados thread first

Need to shut this thread first, so that async callbacks don't
occur when we shut down the data/meta sync processors.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/mstart.sh b/src/mstart.sh
index 0f344ba5d14507f72ef8997597ed20456ea418a9..0e5d4d322bc9e79b66e0e9edf438f1795899e1aa 100755 (executable)
--- a/src/mstart.sh
+++ b/src/mstart.sh
@@ -38,7 +38,7 @@ if [ $? -ne 0 ]; then
 fi
 
 pos=`echo $pos | cut -d: -f1`
-base_port=$((6800+pos*10))
+base_port=$((6800+pos*20))
 
 export VSTART_DEST=$RUN_ROOT_PATH/$instance
 export CEPH_PORT=$base_port

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index de53b563b9309a30b11b2ea598fdda6ab3202846..f0e15226b5ad80f8598f0939813f78269d5c0ad2 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3065,6 +3065,9 @@ int RGWRados::get_max_chunk_size(rgw_bucket& bucket, uint64_t *max_chunk_size)
 
 void RGWRados::finalize()
 {
+  if (async_rados) {
+    async_rados->stop();
+  }
   if (run_sync_thread) {
     Mutex::Locker l(meta_sync_thread_lock);
     meta_sync_processor_thread->stop();
@@ -3104,7 +3107,6 @@ void RGWRados::finalize()
   delete meta_mgr;
   delete data_log;
   if (async_rados) {
-    async_rados->stop();
     delete async_rados;
   }
   if (use_gc_thread) {