From 8487c8282fd89f86086d4149fef295c1cb1a5a74 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Wed, 29 Dec 2021 12:31:48 +0800 Subject: [PATCH] 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 (cherry picked from commit bff813671603c02fdd7e51e88c4d701c2b56983b) --- qa/cephfs/conf/client.yaml | 4 ++-- qa/cephfs/conf/mds.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/cephfs/conf/client.yaml b/qa/cephfs/conf/client.yaml index 286706a5c6789..4b37d03b45a46 100644 --- 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 922f7167ae474..46403ffa0f358 100644 --- 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 -- 2.39.5