From d6657403f6d092ff27810c71b964f641c84bc942 Mon Sep 17 00:00:00 2001 From: Yan Jun Date: Wed, 18 May 2016 09:45:58 +0800 Subject: [PATCH] rgw/admin: fix some return values and indents Maybe we should unify the return values to positive number. Signed-off-by: Yan Jun --- src/rgw/rgw_admin.cc | 162 +++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 7dfbcb6412a4f..8938346e9d8ee 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -2379,11 +2379,11 @@ int main(int argc, char **argv) /* check key parameter conflict */ if ((!access_key.empty()) && gen_access_key) { cerr << "ERROR: key parameter conflict, --access-key & --gen-access-key" << std::endl; - return -EINVAL; + return EINVAL; } if ((!secret_key.empty()) && gen_secret_key) { cerr << "ERROR: key parameter conflict, --secret & --gen-secret" << std::endl; - return -EINVAL; + return EINVAL; } } @@ -2463,18 +2463,18 @@ int main(int argc, char **argv) int ret = realm.init(g_ceph_context, store); if (ret < 0) { cerr << "could not init realm " << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } RGWPeriod period; ret = period.init(g_ceph_context, store, realm.get_id(), realm.get_name(), false); if (ret < 0) { cerr << "failed to init period " << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } ret = period.create(); if (ret < 0) { cerr << "ERROR: couldn't create period " << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } encode_json("period", period, formatter); formatter->flush(cout); @@ -2484,7 +2484,7 @@ int main(int argc, char **argv) { if (period_id.empty()) { cerr << "missing period id" << std::endl; - return -EINVAL; + return EINVAL; } RGWPeriod period(period_id); int ret = period.init(g_ceph_context, store); @@ -2495,7 +2495,7 @@ int main(int argc, char **argv) ret = period.delete_obj(); if (ret < 0) { cerr << "ERROR: couldn't delete period: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } } @@ -2511,7 +2511,7 @@ int main(int argc, char **argv) int ret = realm.init(g_ceph_context, store); if (ret < 0 ) { cerr << "Error initializing realm " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } realm_id = realm.get_id(); realm_name = realm.get_name(); @@ -2533,7 +2533,7 @@ int main(int argc, char **argv) { int ret = read_current_period_id(store, realm_id, realm_name, &period_id); if (ret < 0) { - return ret; + return -ret; } formatter->open_object_section("period_get_current"); encode_json("current_period", period_id, formatter); @@ -2562,7 +2562,7 @@ int main(int argc, char **argv) commit, remote, url, access_key, secret_key, formatter); if (ret < 0) { - return ret; + return -ret; } } break; @@ -2570,7 +2570,7 @@ int main(int argc, char **argv) { if (url.empty()) { cerr << "A --url or --remote must be provided." << std::endl; - return -EINVAL; + return EINVAL; } RGWPeriod period; int ret = do_period_pull(remote, url, access_key, secret_key, @@ -2578,7 +2578,7 @@ int main(int argc, char **argv) &period); if (ret < 0) { cerr << "period pull failed: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } encode_json("period", period, formatter); @@ -2590,14 +2590,14 @@ int main(int argc, char **argv) { if (realm_name.empty()) { cerr << "missing realm name" << std::endl; - return -EINVAL; + return EINVAL; } RGWRealm realm(realm_name, g_ceph_context, store); int ret = realm.create(); if (ret < 0) { cerr << "ERROR: couldn't create realm " << realm_name << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } if (set_default) { @@ -2617,7 +2617,7 @@ int main(int argc, char **argv) RGWRealm realm(realm_id, realm_name); if (realm_name.empty() && realm_id.empty()) { cerr << "missing realm name or id" << std::endl; - return -EINVAL; + return EINVAL; } int ret = realm.init(g_ceph_context, store); if (ret < 0) { @@ -2627,7 +2627,7 @@ int main(int argc, char **argv) ret = realm.delete_obj(); if (ret < 0) { cerr << "ERROR: couldn't : " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } } @@ -2656,10 +2656,10 @@ int main(int argc, char **argv) int ret = realm.read_default_id(default_id); if (ret == -ENOENT) { cout << "No default realm is set" << std::endl; - return ret; + return -ret; } else if (ret < 0) { cerr << "Error reading default realm:" << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } cout << "default realm: " << default_id << std::endl; } @@ -2712,11 +2712,11 @@ int main(int argc, char **argv) RGWRealm realm(realm_id, realm_name); if (realm_new_name.empty()) { cerr << "missing realm new name" << std::endl; - return -EINVAL; + return EINVAL; } if (realm_name.empty() && realm_id.empty()) { cerr << "missing realm name or id" << std::endl; - return -EINVAL; + return EINVAL; } int ret = realm.init(g_ceph_context, store); if (ret < 0) { @@ -2734,11 +2734,11 @@ int main(int argc, char **argv) { if (realm_id.empty() && realm_name.empty()) { cerr << "no realm name or id provided" << std::endl; - return -EINVAL; + return EINVAL; } if (infile.empty()) { cerr << "no realm input file provided" << std::endl; - return -EINVAL; + return EINVAL; } RGWRealm realm(realm_id, realm_name); int ret = realm.init(g_ceph_context, store, false); @@ -2809,7 +2809,7 @@ int main(int argc, char **argv) "master zone's gateway may need to be restarted to recognize " "this user." << std::endl; } - return ret; + return -ret; } RGWRealm realm; realm.init(g_ceph_context, store, false); @@ -2817,7 +2817,7 @@ int main(int argc, char **argv) decode_json_obj(realm, &p); } catch (JSONDecoder::err& e) { cerr << "failed to decode JSON response: " << e.message << std::endl; - return -EINVAL; + return EINVAL; } RGWPeriod period; auto& current_period = realm.get_current_period(); @@ -2835,7 +2835,7 @@ int main(int argc, char **argv) if (ret < 0 && ret != -EEXIST) { cerr << "Error storing realm " << realm.get_id() << ": " << cpp_strerror(ret) << std::endl; - return ret; + return -ret; } else if (ret ==-EEXIST) { ret = realm.update(); if (ret < 0) { @@ -2861,7 +2861,7 @@ int main(int argc, char **argv) { if (zonegroup_id.empty() && zonegroup_name.empty()) { cerr << "no zonegroup name or id provided" << std::endl; - return -EINVAL; + return EINVAL; } RGWZoneGroup zonegroup(zonegroup_id,zonegroup_name); @@ -2869,7 +2869,7 @@ int main(int argc, char **argv) if (ret < 0) { cerr << "failed to initialize zonegroup " << zonegroup_name << " id " << zonegroup_id << " :" << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } RGWZoneParams zone(zone_id, zone_name); ret = zone.init(g_ceph_context, store); @@ -2884,7 +2884,7 @@ int main(int argc, char **argv) if (ret < 0) { cerr << "failed to add zone " << zone_name << " to zonegroup " << zonegroup.get_name() << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } encode_json("zonegroup", zonegroup, formatter); @@ -2895,7 +2895,7 @@ int main(int argc, char **argv) { if (zonegroup_name.empty()) { cerr << "Missing zonegroup name" << std::endl; - return -EINVAL; + return EINVAL; } RGWRealm realm(realm_id, realm_name); int ret = realm.init(g_ceph_context, store); @@ -2928,7 +2928,7 @@ int main(int argc, char **argv) { if (zonegroup_id.empty() && zonegroup_name.empty()) { cerr << "no zonegroup name or id provided" << std::endl; - return -EINVAL; + return EINVAL; } RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name); @@ -2949,7 +2949,7 @@ int main(int argc, char **argv) { if (zonegroup_id.empty() && zonegroup_name.empty()) { cerr << "no zonegroup name or id provided" << std::endl; - return -EINVAL; + return EINVAL; } RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name); int ret = zonegroup.init(g_ceph_context, store); @@ -2960,7 +2960,7 @@ int main(int argc, char **argv) ret = zonegroup.delete_obj(); if (ret < 0) { cerr << "ERROR: couldn't delete zonegroup: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } } break; @@ -3152,11 +3152,11 @@ int main(int argc, char **argv) { if (zonegroup_new_name.empty()) { cerr << " missing zonegroup new name" << std::endl; - return -EINVAL; + return EINVAL; } if (zonegroup_id.empty() && zonegroup_name.empty()) { cerr << "no zonegroup name or id provided" << std::endl; - return -EINVAL; + return EINVAL; } RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name); int ret = zonegroup.init(g_ceph_context, store); @@ -3178,7 +3178,7 @@ int main(int argc, char **argv) int ret = zonegroupmap.read(g_ceph_context, store); if (ret < 0 && ret != -ENOENT) { cerr << "failed to read zonegroupmap info: " << cpp_strerror(ret); - return ret; + return -ret; } encode_json("zonegroup-map", zonegroupmap, formatter); @@ -3191,14 +3191,14 @@ int main(int argc, char **argv) int ret = read_decode_json(infile, zonegroupmap); if (ret < 0) { cerr << "ERROR: failed to read map json: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } RGWPeriod period; ret = period.init(g_ceph_context, store); if (ret < 0) { cerr << "ERROR: failed to read current period info: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } period.fork(); @@ -3247,7 +3247,7 @@ int main(int argc, char **argv) { if (zone_name.empty()) { cerr << "zone name not provided" << std::endl; - return -EINVAL; + return EINVAL; } int ret; RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name); @@ -3256,7 +3256,7 @@ int main(int argc, char **argv) ret = zonegroup.init(g_ceph_context, store); if (ret < 0) { cerr << "unable to initialize zonegroup " << zonegroup_name << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } if (realm_id.empty() && realm_name.empty()) { realm_id = zonegroup.realm_id; @@ -3277,7 +3277,7 @@ int main(int argc, char **argv) ret = zone.create(); if (ret < 0) { cerr << "failed to create zone " << zone_name << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } if (!zonegroup_id.empty() || !zonegroup_name.empty()) { @@ -3288,7 +3288,7 @@ int main(int argc, char **argv) if (ret < 0) { cerr << "failed to add zone " << zone_name << " to zonegroup " << zonegroup.get_name() << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } } @@ -3313,7 +3313,7 @@ int main(int argc, char **argv) } if (zone_id.empty() && zone_name.empty()) { cerr << "no zone name or id provided" << std::endl; - return -EINVAL; + return EINVAL; } RGWZoneParams zone(zone_id, zone_name); ret = zone.init(g_ceph_context, store); @@ -3332,7 +3332,7 @@ int main(int argc, char **argv) { if (zone_id.empty() && zone_name.empty()) { cerr << "no zone name or id provided" << std::endl; - return -EINVAL; + return EINVAL; } RGWZoneParams zone(zone_id, zone_name); int ret = zone.init(g_ceph_context, store); @@ -3365,7 +3365,7 @@ int main(int argc, char **argv) ret = zone.delete_obj(); if (ret < 0) { cerr << "failed to delete zone " << zone_name << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } } break; @@ -3414,7 +3414,7 @@ int main(int argc, 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; - return -EINVAL; + return EINVAL; } if (zone.get_name().empty()) { @@ -3445,7 +3445,7 @@ int main(int argc, char **argv) ret = zone.fix_pool_names(); if (ret < 0) { cerr << "ERROR: couldn't fix zone: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } ret = zone.write(false); if (ret < 0) { @@ -3564,11 +3564,11 @@ int main(int argc, char **argv) { if (zone_new_name.empty()) { cerr << " missing zone new name" << std::endl; - return -EINVAL; + return EINVAL; } if (zone_id.empty() && zone_name.empty()) { cerr << "no zonegroup name or id provided" << std::endl; - return -EINVAL; + return EINVAL; } RGWZoneParams zone(zone_id,zone_name); int ret = zone.init(g_ceph_context, store); @@ -3580,7 +3580,7 @@ int main(int argc, char **argv) if (ret < 0) { cerr << "failed to rename zone " << zone_name << " to " << zone_new_name << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name); ret = zonegroup.init(g_ceph_context, store); @@ -3590,7 +3590,7 @@ int main(int argc, char **argv) ret = zonegroup.rename_zone(zone); if (ret < 0 && ret ) { cerr << "Error in zonegroup rename for " << zone_name << ": " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } } } @@ -3810,7 +3810,7 @@ int main(int argc, char **argv) int ret = period.init(g_ceph_context, store); if (ret < 0) { cerr << "period init failed: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } // json format into a bufferlist JSONFormatter jf(false); @@ -3822,7 +3822,7 @@ int main(int argc, char **argv) ret = send_to_remote_gateway(url, info, bl, p); if (ret < 0) { cerr << "request failed: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } } return 0; @@ -3834,13 +3834,13 @@ int main(int argc, char **argv) int ret = realm.init(g_ceph_context, store); if (ret < 0) { cerr << "failed to init realm: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } RGWPeriod current_period(realm.get_current_period()); ret = current_period.init(g_ceph_context, store); if (ret < 0) { cerr << "failed to init current period: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } remote = current_period.get_master_zonegroup(); } @@ -3850,7 +3850,7 @@ int main(int argc, char **argv) &period); if (ret < 0) { cerr << "period pull failed: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } encode_json("period", period, formatter); @@ -3864,7 +3864,7 @@ int main(int argc, char **argv) commit, remote, url, access_key, secret_key, formatter); if (ret < 0) { - return ret; + return -ret; } } return 0; @@ -3875,18 +3875,18 @@ int main(int argc, char **argv) int ret = realm.init(g_ceph_context, store); if (ret < 0) { cerr << "Error initializing realm: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } RGWPeriod period(RGWPeriod::get_staging_id(realm.get_id()), 1); ret = period.init(g_ceph_context, store, realm.get_id()); if (ret < 0) { cerr << "period init failed: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } ret = commit_period(realm, period, remote, url, access_key, secret_key); if (ret < 0) { cerr << "failed to commit period: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } encode_json("period", period, formatter); @@ -4006,7 +4006,7 @@ int main(int argc, char **argv) // filter by date? if (date.size() && date.size() != 10) { cerr << "bad date format for '" << date << "', expect YYYY-MM-DD" << std::endl; - return -EINVAL; + return EINVAL; } formatter->reset(); @@ -4017,19 +4017,19 @@ int main(int argc, char **argv) // no logs. } else { if (r < 0) { - cerr << "log list: error " << r << std::endl; - return r; + cerr << "log list: error " << r << std::endl; + return -r; } while (true) { - string name; - int r = store->log_list_next(h, &name); - if (r == -ENOENT) - break; - if (r < 0) { - cerr << "log list: error " << r << std::endl; - return r; - } - formatter->dump_string("object", name); + string name; + int r = store->log_list_next(h, &name); + if (r == -ENOENT) + break; + if (r < 0) { + cerr << "log list: error " << r << std::endl; + return -r; + } + formatter->dump_string("object", name); } } formatter->close_section(); @@ -4162,7 +4162,7 @@ next: int ret = store->list_placement_set(pools); if (ret < 0) { cerr << "could not list placement set: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } formatter->reset(); formatter->open_array_section("pools"); @@ -4282,7 +4282,7 @@ next: int ret = store->get_obj_state(&rctx, obj, &state, false); /* don't follow olh */ if (ret < 0) { - return ret; + return -ret; } ret = store->bucket_index_read_olh_log(*state, obj, 0, &log, &is_truncated); @@ -4806,7 +4806,7 @@ next: int ret = read_input(infile, bl); if (ret < 0) { cerr << "ERROR: failed to read input: " << cpp_strerror(-ret) << std::endl; - return ret; + return -ret; } ret = store->meta_mgr->put(metadata_key, bl, RGWMetadataHandler::APPLY_ALWAYS); if (ret < 0) { @@ -4918,7 +4918,7 @@ next: if (period_id.empty()) { int ret = read_current_period_id(store, realm_id, realm_name, &period_id); if (ret < 0) { - return ret; + return -ret; } std::cerr << "No --period given, using current period=" << period_id << std::endl; @@ -5224,7 +5224,7 @@ next: if (opt_cmd == OPT_BILOG_LIST) { if (bucket_name.empty()) { cerr << "ERROR: bucket not specified" << std::endl; - return -EINVAL; + return EINVAL; } RGWBucketInfo bucket_info; int ret = init_bucket(tenant, bucket_name, bucket_id, bucket_info, bucket); @@ -5341,7 +5341,7 @@ next: if (opt_cmd == OPT_BILOG_TRIM) { if (bucket_name.empty()) { cerr << "ERROR: bucket not specified" << std::endl; - return -EINVAL; + return EINVAL; } RGWBucketInfo bucket_info; int ret = init_bucket(tenant, bucket_name, bucket_id, bucket_info, bucket); @@ -5359,7 +5359,7 @@ next: if (opt_cmd == OPT_BILOG_STATUS) { if (bucket_name.empty()) { cerr << "ERROR: bucket not specified" << std::endl; - return -EINVAL; + return EINVAL; } RGWBucketInfo bucket_info; int ret = init_bucket(tenant, bucket_name, bucket_id, bucket_info, bucket); @@ -5571,7 +5571,7 @@ next: } else if (replica_log_type == ReplicaLog_Bucket) { if (bucket_name.empty()) { cerr << "ERROR: bucket not specified" << std::endl; - return -EINVAL; + return EINVAL; } RGWBucketInfo bucket_info; int ret = init_bucket(tenant, bucket_name, bucket_id, bucket_info, bucket); @@ -5622,7 +5622,7 @@ next: } else if (replica_log_type == ReplicaLog_Bucket) { if (bucket_name.empty()) { cerr << "ERROR: bucket not specified" << std::endl; - return -EINVAL; + return EINVAL; } RGWBucketInfo bucket_info; int ret = init_bucket(tenant, bucket_name, bucket_id, bucket_info, bucket); @@ -5684,7 +5684,7 @@ next: } else if (replica_log_type == ReplicaLog_Bucket) { if (bucket_name.empty()) { cerr << "ERROR: bucket not specified" << std::endl; - return -EINVAL; + return EINVAL; } RGWBucketInfo bucket_info; int ret = init_bucket(tenant, bucket_name, bucket_id, bucket_info, bucket); -- 2.39.5