From 5876a2ba2dc9ba5444c64ae86eb2610aca363ab1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 30 Jan 2018 09:12:39 -0600 Subject: [PATCH] rados: only suggest changing mon_allow_pool_delete on EPERM Signed-off-by: Sage Weil --- src/tools/rados/rados.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index a9235bc2639..c1fe40cc98c 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -2918,10 +2918,12 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, ret = rados.pool_delete(nargs[1]); if (ret >= 0) { cout << "successfully deleted pool " << nargs[1] << std::endl; - } else { //error + } else { cerr << "pool " << nargs[1] << " could not be removed" << std::endl; - cerr << "Check your monitor configuration - `mon allow pool delete` is set to false by default," - << " change it to true to allow deletion of pools" << std::endl; + if (ret == -EPERM) { + cerr << "Check your monitor configuration - `mon allow pool delete` is set to false by default," + << " change it to true to allow deletion of pools" << std::endl; + } } } else if (strcmp(nargs[0], "purge") == 0) { -- 2.39.5