From 6240c0c4cdc76d2d2c3d9dc30919b6cca922144f Mon Sep 17 00:00:00 2001 From: Yao Zongyou Date: Mon, 28 Jan 2019 18:17:15 +0800 Subject: [PATCH] rgw: check lc objs not empty after fetching During lifecycle processing, the bucket's objects may be deleted by other clients, so we need to check objs not empty after each fetch. Signed-off-by: Yao Zongyou --- src/rgw/rgw_lc.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc index 8abb73a27a9..4f0aa8cac3e 100644 --- a/src/rgw/rgw_lc.cc +++ b/src/rgw/rgw_lc.cc @@ -466,8 +466,10 @@ public: if (ret < 0) { ldout(store->ctx(), 0) << "ERROR: list_op returned ret=" << ret << dendl; return ret; - } else { - obj_iter = objs.begin(); + } + obj_iter = objs.begin(); + if (obj_iter == objs.end()) { + return false; } delay(); } -- 2.39.5