From: Haomai Wang <haomai@xsky.com>
Date: Thu, 7 Jan 2016 14:24:16 +0000 (+0800)
Subject: NVMEDevice: adjust request/task memory pool size
X-Git-Tag: v10.0.4~81^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=263353bda5fecbf9f62a2618891e0112edd918e7;p=ceph.git

NVMEDevice: adjust request/task memory pool size

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index 7873a2f46b18..ac0ba2dc5e3a 100644
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -229,7 +229,7 @@ int SharedDriverData::try_get(const string &sn_tag, nvme_controller **c, string
       return r;
     }
 
-	  request_mempool = rte_mempool_create("nvme_request", 8192,
+	  request_mempool = rte_mempool_create("nvme_request", 512,
                                          nvme_request_size(), 128, 0,
                                          NULL, NULL, NULL, NULL,
                                          SOCKET_ID_ANY, 0);
@@ -239,7 +239,7 @@ int SharedDriverData::try_get(const string &sn_tag, nvme_controller **c, string
     }
 
  	  task_pool = rte_mempool_create(
-        "task_pool", 8192, sizeof(Task),
+        "task_pool", 512, sizeof(Task),
         64, 0, NULL, NULL, NULL, NULL,
         SOCKET_ID_ANY, 0);
     if (task_pool == NULL) {
@@ -371,7 +371,7 @@ void NVMEDevice::_aio_thread()
     } else if (!inflight_ops.read()) {
       Mutex::Locker l(queue_lock);
       if (queue_empty.read())
-        queue_cond.Wait();
+        queue_cond.Wait(queue_lock);
     }
 
     if (t) {