radosgw-admin: check params for object rewrite

Signed-off-by: Yehuda Sadeh <[email protected]> (cherry picked from commit 28c716b)
devicenull · Apr 11, 2014 · f12bccc · f12bccc
1 parent 43d837d
commit f12bccc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/erasure-code/jerasure/gf-complete b/src/erasure-code/jerasure/gf-complete
diff --git a/src/erasure-code/jerasure/jerasure b/src/erasure-code/jerasure/jerasure
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
@@ -1817,6 +1817,14 @@ int main(int argc, char **argv)
   }
 
   if (opt_cmd == OPT_OBJECT_REWRITE) {
+    if (bucket_name.empty()) {
+      cerr << "ERROR: bucket not specified" << std::endl;
+      return EINVAL;
+    }
+    if (object.empty()) {
+      cerr << "ERROR: object not specified" << std::endl;
+      return EINVAL;
+    }
     int ret = init_bucket(bucket_name, bucket);
     if (ret < 0) {
       cerr << "ERROR: could not init bucket: " << cpp_strerror(-ret) << std::endl;
@@ -1828,7 +1836,7 @@ int main(int argc, char **argv)
 
     if (ret < 0) {
       cerr << "ERROR: object remove returned: " << cpp_strerror(-ret) << std::endl;
-      return 1;
+      return -ret;
     }
   }