rgw: change error output related to orphans

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit cac57caf639236adc9a641a85352eb729b58725a)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 768882a0c5b543a350f2c3ec4dd73bc8eb42f762..dbc26a973c912384ab9aad9c59b4ed3e868e774f 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -2600,12 +2600,7 @@ next:
 
     int ret = search.init(job_id, &info);
     if (ret < 0) {
-      if (ret == -EEXIST) {
-        cerr << "cannot init new search, job already exists" << std::endl;
-      }
-      if (ret == -ENOENT) {
-        cerr << "job not found" << std::endl;
-      }
+      cerr << "could not init search, ret=" << ret << std::endl;
       return -ret;
     }
     ret = search.run();

diff --git a/src/rgw/rgw_orphan.cc b/src/rgw/rgw_orphan.cc
index d048cf6b7330d56efd64be65e13a37e07f5687ca..845d904d3233a98a004a6b082203a1abcae9037b 100644 (file)
--- a/src/rgw/rgw_orphan.cc
+++ b/src/rgw/rgw_orphan.cc
@@ -115,7 +115,7 @@ int RGWOrphanStore::init()
   librados::Rados *rados = store->get_rados();
   int r = rados->ioctx_create(log_pool, ioctx);
   if (r < 0) {
-    cerr << "ERROR: failed to open log pool ret=" << r << std::endl;
+    cerr << "ERROR: failed to open log pool (" << store->get_zone_params().log_pool.name << " ret=" << r << std::endl;
     return r;
   }