From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 19 Sep 2013 17:41:07 +0000 (-0700)
Subject: radosgw-admin: check params for object rewrite
X-Git-Tag: v0.81~110^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f12bccc98bbde408d69a36358bd7a14d151fdd0c;p=ceph.git

radosgw-admin: check params for object rewrite

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
(cherry picked from commit 28c716bccd955eaf68e9c739139c901ca4f419f7)
---

diff --git a/src/erasure-code/jerasure/gf-complete b/src/erasure-code/jerasure/gf-complete
index c70286782425..191e7105b2b7 160000
--- a/src/erasure-code/jerasure/gf-complete
+++ b/src/erasure-code/jerasure/gf-complete
@@ -1 +1 @@
-Subproject commit c70286782425b1f792313e4fd1ce1773c72dcd76
+Subproject commit 191e7105b2b75f7f48ef23dfab9ae72275363168
diff --git a/src/erasure-code/jerasure/jerasure b/src/erasure-code/jerasure/jerasure
index c893bdfb1f7c..3135db11ec8f 160000
--- a/src/erasure-code/jerasure/jerasure
+++ b/src/erasure-code/jerasure/jerasure
@@ -1 +1 @@
-Subproject commit c893bdfb1f7cfdd805aea636e4aabf25ee7f4f33
+Subproject commit 3135db11ec8f042e502d0765b64bc3a44145a2df
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 202b9ef27910..8b7372705229 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1817,6 +1817,14 @@ next:
   }
 
   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 @@ next:
 
     if (ret < 0) {
       cerr << "ERROR: object remove returned: " << cpp_strerror(-ret) << std::endl;
-      return 1;
+      return -ret;
     }
   }