Skip to content

Commit

Permalink
Merge pull request ceph#44232 from Huber-ming/admin_fixlogs
Browse files Browse the repository at this point in the history
radosgw-admin: fix some error logs
  • Loading branch information
dang authored Dec 8, 2021
2 parents 4cdf6d4 + 51cde60 commit a09886f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/rgw/rgw_admin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4399,7 +4399,7 @@ int main(int argc, const char **argv)
cout << "No default realm is set" << std::endl;
return -ret;
} else if (ret < 0) {
cerr << "Error reading default realm:" << cpp_strerror(-ret) << std::endl;
cerr << "Error reading default realm: " << cpp_strerror(-ret) << std::endl;
return -ret;
}
cout << "default realm: " << default_id << std::endl;
Expand Down Expand Up @@ -4624,7 +4624,7 @@ int main(int argc, const char **argv)
RGWZoneGroup zonegroup(zonegroup_id,zonegroup_name);
int ret = zonegroup.init(dpp(), g_ceph_context, static_cast<rgw::sal::RadosStore*>(store)->svc()->sysobj, null_yield);
if (ret < 0) {
cerr << "failed to initialize zonegroup " << zonegroup_name << " id " << zonegroup_id << " :"
cerr << "failed to initialize zonegroup " << zonegroup_name << " id " << zonegroup_id << ": "
<< cpp_strerror(-ret) << std::endl;
return -ret;
}
Expand Down Expand Up @@ -5324,7 +5324,7 @@ int main(int argc, const char **argv)
}

if( !zone_name.empty() && !zone.get_name().empty() && zone.get_name() != zone_name) {
cerr << "Error: zone name" << zone_name << " is different than the zone name " << zone.get_name() << " in the provided json " << std::endl;
cerr << "Error: zone name " << zone_name << " is different than the zone name " << zone.get_name() << " in the provided json " << std::endl;
return EINVAL;
}

Expand Down

0 comments on commit a09886f

Please sign in to comment.