From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 23 Aug 2019 18:45:21 +0000 (-0400)
Subject: test/librbd: set nbd timeout due to newer kernels defaulting it on
X-Git-Tag: v14.2.5~170^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83fe3eafb8b9b9c13528dca7fa74df55d41cf698;p=ceph.git

test/librbd: set nbd timeout due to newer kernels defaulting it on

Fixes: https://tracker.ceph.com/issues/41409
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d1322dba2e74de21388ad524c942288683712599)
---

diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc
index 24b0538e72a..56f8e6c60ca 100644
--- a/src/test/librbd/fsx.cc
+++ b/src/test/librbd/fsx.cc
@@ -1226,6 +1226,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("/");