From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 22 Jan 2016 00:08:51 +0000 (-0800)
Subject: rgw: don't abort on op_ret < 0
X-Git-Tag: v10.0.4~152^2^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d71b70033bcbacc729c1f7cc93a105d35ebdc04d;p=ceph.git

rgw: don't abort on op_ret < 0

We'll later have op->execute() return a status

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 8955d6769456..e0b4cc6f3230 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -657,21 +657,10 @@ static int process_request(RGWRados *store, RGWREST *rest, RGWRequest *req, RGWC
 
   req->log(s, "pre-executing");
   op->pre_exec();
-  ret = op->get_ret();
-  if (ret < 0) {
-    dout(2) << "pre_exec ret=" << ret << dendl;
-    abort_early(s, op, ret, handler);
-    goto done;
-  }
 
   req->log(s, "executing");
   op->execute();
-  ret = op->get_ret();
-  if (ret < 0) {
-    dout(2) << "execute ret=" << ret << dendl;
-    abort_early(s, op, ret, handler);
-    goto done;
-  }
+
   req->log(s, "completing");
   op->complete();
 done: