From: Casey Bodley Date: Tue, 14 Nov 2017 15:34:03 +0000 (-0500) Subject: Merge pull request #18845 from yaozongyou/wip-lifecycle-log-level X-Git-Tag: v13.0.1~229 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ccfc3a23741123629c04eeb9d74a5175e6ab5362;p=ceph-ci.git Merge pull request #18845 from yaozongyou/wip-lifecycle-log-level rgw: update life cycle related log level Reviewed-by: Casey Bodley --- ccfc3a23741123629c04eeb9d74a5175e6ab5362 diff --cc src/rgw/rgw_lc.cc index 05f993ef7b5,c25e22db627..a742ca309b4 --- a/src/rgw/rgw_lc.cc +++ b/src/rgw/rgw_lc.cc @@@ -457,11 -455,8 +457,11 @@@ int RGWLC::bucket_lc_process(string& sh if (ret < 0) { ldout(cct, 0) << "ERROR: remove_expired_obj " << dendl; } else { - ldout(cct, 10) << "DELETED:" << bucket_name << ":" << key << dendl; + ldout(cct, 2) << "DELETED:" << bucket_name << ":" << key << dendl; } + + if (going_down()) + return 0; } } } while (is_truncated); @@@ -562,11 -557,8 +562,11 @@@ if (ret < 0) { ldout(cct, 0) << "ERROR: remove_expired_obj " << dendl; } else { - ldout(cct, 10) << "DELETED:" << bucket_name << ":" << obj_iter->key << dendl; + ldout(cct, 2) << "DELETED:" << bucket_name << ":" << obj_iter->key << dendl; } + + if (going_down()) + return 0; } } } while (is_truncated);