qa: do not use any time related suffix for *_op_timeouts

When testing the upgration, for the old version the *_op_timeouts
options' type is TYPE_FLOAT, but when parsing them by strict_strtod
it will failed with error:

  strict_strtod: garbage at end of string. got: '15m'

This commit will remove the 'm' suffix by switch the time to 900,
thus the old version still could parse it successfully.

Introduced-by: d060c9a768c6974d3b68e4d408edf78bba9e0e85
https://tracker.ceph.com/issues/51705
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit bff813671603c02fdd7e51e88c4d701c2b56983b)

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

diff --git a/qa/cephfs/conf/mds.yaml b/qa/cephfs/conf/mds.yaml
index 922f7167ae4742c742d851582ace9d09d5fde5dd..46403ffa0f358f662eae279428dcb930bedcbea2 100644 (file)
--- a/qa/cephfs/conf/mds.yaml
+++ b/qa/cephfs/conf/mds.yaml
@@ -9,5 +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
+        rados mon op timeout: 900
+        rados osd op timeout: 900