Merge pull request ceph#29858 from dillaman/wip-41409

test/librbd: set nbd timeout due to newer kernels defaulting it on Reviewed-by: Mike Christie <[email protected]> Reviewed-by: Mykola Golub <[email protected]>
atta · Aug 28, 2019 · a7d8813 · a7d8813
2 parents e81ef76 + 1c40cfc
commit a7d8813
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc
@@ -1230,6 +1230,7 @@ nbd_open(const char *name, struct rbd_ctx *ctx)
 	SubProcess process("rbd-nbd", SubProcess::KEEP, SubProcess::PIPE,
 			   SubProcess::KEEP);
 	process.add_cmd_arg("map");
+	process.add_cmd_arg("--timeout=600");
 	std::string img;
 	img.append(pool);
 	img.append("/");

diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -227,7 +227,7 @@ class NBDServer
   {
     ceph_assert(!reader_thread.is_started());
     std::unique_lock l{lock};
-    cond.wait(l, [this] { return io_finished.empty(); });
+    cond.wait(l, [this] { return io_pending.empty(); });
 
     while(!io_finished.empty()) {
       std::unique_ptr<IOContext> free_ctx(io_finished.front());