From bb1d4cc3a3e9af3bf8cd8fd80085fbbbaeb8b89f Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 5 May 2015 14:43:05 -0700 Subject: [PATCH] rgw: change error output related to orphans Signed-off-by: Yehuda Sadeh (cherry picked from commit cac57caf639236adc9a641a85352eb729b58725a) --- src/rgw/rgw_admin.cc | 7 +------ src/rgw/rgw_orphan.cc | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 768882a0c5b54..dbc26a973c912 100644 --- 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 d048cf6b7330d..845d904d3233a 100644 --- 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; } -- 2.39.5