From: Sage Weil <sage@redhat.com>
Date: Tue, 30 Jan 2018 15:12:39 +0000 (-0600)
Subject: rados: only suggest changing mon_allow_pool_delete on EPERM
X-Git-Tag: v13.0.2~78^2~41
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5876a2ba2dc9ba5444c64ae86eb2610aca363ab1;p=ceph.git

rados: only suggest changing mon_allow_pool_delete on EPERM

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index a9235bc26399..c1fe40cc98c6 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) {