Merge pull request #17588 from kungf/aio_submit_size_change

os/bluestore: shrink aio submit size to pending value Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Sep 10, 2017 · 5a3133b · 5a3133b
2 parents 04c0044 + 9388de7
commit 5a3133b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/os/bluestore/KernelDevice.cc b/src/os/bluestore/KernelDevice.cc
@@ -520,7 +520,7 @@ void KernelDevice::aio_submit(IOContext *ioc)
   void *priv = static_cast<void*>(ioc);
   int r, retries = 0;
   r = aio_queue.submit_batch(ioc->running_aios.begin(), e, 
-			     ioc->num_running.load(), priv, &retries);
+			     pending, priv, &retries);
 
   if (retries)
     derr << __func__ << " retries " << retries << dendl;

diff --git a/src/os/bluestore/aio.cc b/src/os/bluestore/aio.cc
@@ -46,6 +46,7 @@ int aio_queue_t::submit_batch(aio_iter begin, aio_iter end,
     ++left;
     ++cur;
   }
+  assert(aios_size >= left);
   int done = 0;
   while (left > 0) {
     int r = io_submit(ctx, left, piocb + done);