qa: set rados op timeouts for mds/ceph-fuse

Now that the osdc Objecter obeys updates to these configs, let's use
them to avoid having them block forever on operations that may never
complete (or should complete in a timely manner).

Fixes: https://tracker.ceph.com/issues/47734
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit d060c9a768c6974d3b68e4d408edf78bba9e0e85)

diff --git a/qa/cephfs/conf/client.yaml b/qa/cephfs/conf/client.yaml
index 96026f91a8de949b3d75caf33c26a0420f682496..286706a5c6789998bbed46e205169557d45891b3 100644 (file)
--- a/qa/cephfs/conf/client.yaml
+++ b/qa/cephfs/conf/client.yaml
@@ -5,3 +5,5 @@ overrides:
         client mount timeout: 600
         debug ms: 1
         debug client: 20
+        rados mon op timeout: 15m
+        rados osd op timeout: 15m

diff --git a/qa/cephfs/conf/mds.yaml b/qa/cephfs/conf/mds.yaml
index 0c2f8380547d2b85445b11eb80c28cfe820ce199..922f7167ae4742c742d851582ace9d09d5fde5dd 100644 (file)
--- a/qa/cephfs/conf/mds.yaml
+++ b/qa/cephfs/conf/mds.yaml
@@ -9,3 +9,5 @@ overrides:
         mds op complaint time: 180
         mds verify scatter: true
         osd op complaint time: 180
+        rados mon op timeout: 15m
+        rados osd op timeout: 15m