From d71b70033bcbacc729c1f7cc93a105d35ebdc04d Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 21 Jan 2016 16:08:51 -0800 Subject: [PATCH] rgw: don't abort on op_ret < 0 We'll later have op->execute() return a status Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_main.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 8955d676945..e0b4cc6f323 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: -- 2.47.3