From 4228df3f35f2bad107770ebffe57939dda0393c7 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 28 Sep 2023 19:59:24 +0530 Subject: [PATCH] mds/MDSAuthCaps: re-word an error message for better clarity Signed-off-by: Rishabh Dave --- qa/tasks/cephfs/test_admin.py | 4 ++-- src/mds/MDSAuthCaps.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephfs/test_admin.py b/qa/tasks/cephfs/test_admin.py index 4a18faa273178..923871f88e3ac 100644 --- a/qa/tasks/cephfs/test_admin.py +++ b/qa/tasks/cephfs/test_admin.py @@ -1806,8 +1806,8 @@ class TestPermErrMsg(CephFSTestCase): FS1_NAME, FS2_NAME, FS3_NAME = 'abcd', 'efgh', 'ijkl' EXPECTED_ERRNO = 22 - EXPECTED_ERRMSG = ("Permission flags in MDS caps must start with 'r' or " - "'rw' or be '*' or 'all'") + EXPECTED_ERRMSG = ("Permission flags in MDS capability string must be '*' " + "or 'all' or must start with 'r'") MONCAP = f'allow r fsname={FS1_NAME}' OSDCAP = f'allow rw tag cephfs data={FS1_NAME}' diff --git a/src/mds/MDSAuthCaps.cc b/src/mds/MDSAuthCaps.cc index df415f17d626d..7ddad41a08fa2 100644 --- a/src/mds/MDSAuthCaps.cc +++ b/src/mds/MDSAuthCaps.cc @@ -356,8 +356,8 @@ bool MDSAuthCaps::parse(string_view str, ostream *err) if (err) { if (string(iter, end).find("allow") != string::npos) { - *err << "Permission flags in MDS caps must start with 'r' or " << - "'rw' or be '*' or 'all'"; + *err << "Permission flags in MDS capability string must be '*' or " + << "'all' or must start with 'r'"; } else { *err << "mds capability parse failed, stopped at '" << string(iter, end) << "' of '" << str << "'"; -- 2.39.5