]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: don't abort on op_ret < 0
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 22 Jan 2016 00:08:51 +0000 (16:08 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 22 Jan 2016 00:08:51 +0000 (16:08 -0800)
We'll later have op->execute() return a status

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_main.cc

index 8955d6769456a344a59088ac68bbbbd466a898f1..e0b4cc6f32307805de6f9a6850b225ae8c57d7e4 100644 (file)
@@ -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: