diff options
author | Dan Mick <dan.mick@inktank.com> | 2012-08-20 15:02:57 -0700 |
---|---|---|
committer | Josh Durgin <josh.durgin@inktank.com> | 2012-09-18 10:42:53 -0700 |
commit | 54788d0da40608fb8ccf8f16039536729881d542 (patch) | |
tree | eba54107607e77ac1a421e02045b886b7519abdd /src/rbd.cc | |
parent | a179ccee8848fe9bc8d622cba13fab1a99f6eb63 (diff) | |
download | ceph-54788d0da40608fb8ccf8f16039536729881d542.tar.gz |
rbd: force all exiting paths through main()/return
This properly destroys objects. In the process, remove usage_exit();
also kill error-handling in set_conf_param (never relevant for rbd.cc,
and if you call it with both pointers NULL, well...)
Also switch to EXIT_FAILURE for consistency.
Backported from fed8aea662bf919f35a5a72e4e2a2a685af2b2ed.
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Fixes: #2948
Diffstat (limited to 'src/rbd.cc')
-rw-r--r-- | src/rbd.cc | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/src/rbd.cc b/src/rbd.cc index 88e34079712..294292574c2 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -104,13 +104,6 @@ void usage() << " --secret <path> file containing secret key for use with cephx\n"; } -void usage_exit() -{ - assert(1); - usage(); - exit(1); -} - static void print_info(const char *imgname, librbd::image_info_t& info) { cout << "rbd image '" << imgname << "':\n" @@ -930,8 +923,6 @@ static void set_conf_param(const char *param, const char **var1, const char **va *var1 = param; else if (var2 && !*var2) *var2 = param; - else - usage_exit(); } int main(int argc, const char **argv) @@ -965,7 +956,7 @@ int main(int argc, const char **argv) break; } else if (ceph_argparse_flag(args, i, "-h", "--help", (char*)NULL)) { usage(); - exit(0); + return 0; } else if (ceph_argparse_flag(args, i, "--new-format", (char*)NULL)) { old_format = false; } else if (ceph_argparse_witharg(args, i, &val, "-p", "--pool", (char*)NULL)) { @@ -979,13 +970,13 @@ int main(int argc, const char **argv) } else if (ceph_argparse_withlonglong(args, i, &sizell, &err, "-s", "--size", (char*)NULL)) { if (!err.str().empty()) { cerr << err.str() << std::endl; - exit(EXIT_FAILURE); + return EXIT_FAILURE; } size = sizell << 20; // bytes to MB } else if (ceph_argparse_withint(args, i, &order, &err, "--order", (char*)NULL)) { if (!err.str().empty()) { cerr << err.str() << std::endl; - exit(EXIT_FAILURE); + return EXIT_FAILURE; } } else if (ceph_argparse_witharg(args, i, &val, "--path", (char*)NULL)) { path = strdup(val.c_str()); @@ -1003,13 +994,15 @@ int main(int argc, const char **argv) i = args.begin(); if (i == args.end()) { cerr << "you must specify a command." << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } else if (strcmp(*i, "snap") == 0) { i = args.erase(i); if (i == args.end()) { cerr << "which snap command do you want?" << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } opt_cmd = get_cmd(*i, true); } @@ -1018,7 +1011,8 @@ int main(int argc, const char **argv) } if (opt_cmd == OPT_NO_CMD) { cerr << "error parsing command '" << *i << "'" << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } for (i = args.erase(i); i != args.end(); ++i) { @@ -1054,8 +1048,8 @@ int main(int argc, const char **argv) set_conf_param(v, &imgname, &destname); break; case OPT_SHOWMAPPED: - usage_exit(); - break; + usage(); + return EXIT_FAILURE; default: assert(0); break; @@ -1066,12 +1060,14 @@ int main(int argc, const char **argv) if (opt_cmd == OPT_EXPORT && !imgname) { cerr << "error: image name was not specified" << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } if (opt_cmd == OPT_IMPORT && !path) { cerr << "error: path was not specified" << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } if (opt_cmd == OPT_IMPORT && !destname) { @@ -1083,7 +1079,8 @@ int main(int argc, const char **argv) if (opt_cmd != OPT_LIST && opt_cmd != OPT_IMPORT && opt_cmd != OPT_UNMAP && opt_cmd != OPT_SHOWMAPPED && !imgname) { cerr << "error: image name was not specified" << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } // do this unconditionally so we can parse pool/image@snapshot into @@ -1095,12 +1092,14 @@ int main(int argc, const char **argv) opt_cmd != OPT_EXPORT && opt_cmd != OPT_COPY && opt_cmd != OPT_MAP) { cerr << "error: snapname specified for a command that doesn't use it" << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } if ((opt_cmd == OPT_SNAP_CREATE || opt_cmd == OPT_SNAP_ROLLBACK || opt_cmd == OPT_SNAP_REMOVE) && !snapname) { cerr << "error: snap name was not specified" << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } set_pool_image_name(dest_poolname, destname, (char **)&dest_poolname, (char **)&destname, NULL); @@ -1115,14 +1114,15 @@ int main(int argc, const char **argv) if (opt_cmd == OPT_COPY && !destname ) { cerr << "error: destination image name was not specified" << std::endl; - usage_exit(); + usage(); + return EXIT_FAILURE; } if ((opt_cmd == OPT_RENAME) && (strcmp(poolname, dest_poolname) != 0)) { cerr << "error: mv/rename across pools not supported" << std::endl; cerr << "source pool: " << poolname << " dest pool: " << dest_poolname << std::endl; - exit(EXIT_FAILURE); + return EXIT_FAILURE; } bool talk_to_cluster = (opt_cmd != OPT_MAP && @@ -1130,12 +1130,12 @@ int main(int argc, const char **argv) opt_cmd != OPT_SHOWMAPPED); if (talk_to_cluster && rados.init_with_context(g_ceph_context) < 0) { cerr << "error: couldn't initialize rados!" << std::endl; - exit(1); + return EXIT_FAILURE; } if (talk_to_cluster && rados.connect() < 0) { cerr << "error: couldn't connect to the cluster!" << std::endl; - exit(1); + return EXIT_FAILURE; } int r; @@ -1143,7 +1143,7 @@ int main(int argc, const char **argv) r = rados.ioctx_create(poolname, io_ctx); if (r < 0) { cerr << "error opening pool " << poolname << ": " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } } @@ -1155,7 +1155,7 @@ int main(int argc, const char **argv) r = rbd.open(io_ctx, image, imgname); if (r < 0) { cerr << "error opening image " << imgname << ": " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } } @@ -1164,7 +1164,7 @@ int main(int argc, const char **argv) r = image.snap_set(snapname); if (r < 0) { cerr << "error setting snapshot context: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } } @@ -1172,7 +1172,7 @@ int main(int argc, const char **argv) r = rados.ioctx_create(dest_poolname, dest_io_ctx); if (r < 0) { cerr << "error opening pool " << dest_poolname << ": " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } } @@ -1187,7 +1187,7 @@ int main(int argc, const char **argv) default: cerr << "error: " << cpp_strerror(-r) << std::endl; } - exit(1); + return EXIT_FAILURE; } break; @@ -1195,17 +1195,17 @@ int main(int argc, const char **argv) if (!size) { cerr << "must specify size in MB to create an rbd image" << std::endl; usage(); - exit(1); + return EXIT_FAILURE; } if (order && (order < 12 || order > 25)) { cerr << "order must be between 12 (4 KB) and 25 (32 MB)" << std::endl; usage(); - exit(1); + return EXIT_FAILURE; } r = do_create(rbd, io_ctx, imgname, size, &order, old_format, 0); if (r < 0) { cerr << "create error: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; @@ -1213,7 +1213,7 @@ int main(int argc, const char **argv) r = do_rename(rbd, io_ctx, imgname, destname); if (r < 0) { cerr << "rename error: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; @@ -1221,7 +1221,7 @@ int main(int argc, const char **argv) r = do_show_info(imgname, image); if (r < 0) { cerr << "error: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; @@ -1242,7 +1242,7 @@ int main(int argc, const char **argv) } else { cerr << "delete error: " << cpp_strerror(-r) << std::endl; } - exit(-r); + return -r ; } break; @@ -1250,92 +1250,92 @@ int main(int argc, const char **argv) r = do_resize(image, size); if (r < 0) { cerr << "resize error: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; case OPT_SNAP_LIST: if (!imgname) { usage(); - exit(1); + return EXIT_FAILURE; } r = do_list_snaps(image); if (r < 0) { cerr << "failed to list snapshots: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; case OPT_SNAP_CREATE: if (!imgname || !snapname) { usage(); - exit(1); + return EXIT_FAILURE; } r = do_add_snap(image, snapname); if (r < 0) { cerr << "failed to create snapshot: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; case OPT_SNAP_ROLLBACK: if (!imgname) { usage(); - exit(1); + return EXIT_FAILURE; } r = do_rollback_snap(image, snapname); if (r < 0) { cerr << "rollback failed: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; case OPT_SNAP_REMOVE: if (!imgname) { usage(); - exit(1); + return EXIT_FAILURE; } r = do_remove_snap(image, snapname); if (r < 0) { - cerr << "rollback failed: " << cpp_strerror(-r) << std::endl; - exit(1); + cerr << "failed to remove snapshot: " << cpp_strerror(-r) << std::endl; + return EXIT_FAILURE; } break; case OPT_SNAP_PURGE: if (!imgname) { usage(); - exit(1); + return EXIT_FAILURE; } r = do_purge_snaps(image); if (r < 0) { cerr << "removing snaps failed: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; case OPT_EXPORT: if (!path) { cerr << "pathname should be specified" << std::endl; - exit(1); + return EXIT_FAILURE; } r = do_export(image, path); if (r < 0) { cerr << "export error: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; case OPT_IMPORT: if (!path) { cerr << "pathname should be specified" << std::endl; - exit(1); + return EXIT_FAILURE; } r = do_import(rbd, dest_io_ctx, destname, &order, path, old_format, 0, size); if (r < 0) { cerr << "import failed: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; @@ -1343,7 +1343,7 @@ int main(int argc, const char **argv) r = do_copy(image, dest_io_ctx, destname); if (r < 0) { cerr << "copy failed: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; @@ -1351,7 +1351,7 @@ int main(int argc, const char **argv) r = do_watch(io_ctx, imgname); if (r < 0) { cerr << "watch failed: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; @@ -1359,7 +1359,7 @@ int main(int argc, const char **argv) r = do_kernel_add(poolname, imgname, snapname, secretfile, user); if (r < 0) { cerr << "add failed: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; @@ -1367,7 +1367,7 @@ int main(int argc, const char **argv) r = do_kernel_rm(devpath); if (r < 0) { cerr << "remove failed: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; @@ -1375,7 +1375,7 @@ int main(int argc, const char **argv) r = do_kernel_showmapped(); if (r < 0) { cerr << "showmapped failed: " << cpp_strerror(-r) << std::endl; - exit(1); + return EXIT_FAILURE; } break; } |