From 3f938630c37c3d8dacd7eb3e2757a4fd37689b9b Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Thu, 13 Dec 2018 15:57:40 +0100 Subject: [PATCH] rgw: sync module: avoid printing attrs of objects in log Since attrs are verbose and not necessarily needed as a debug info (as they can be obtained from the required object itself) avoid logging them. Also additionally removed another place where such a log is done by the ES sync module Fixes: http://tracker.ceph.com/issues/37646 Signed-off-by: Abhishek Lekshmanan (cherry picked from commit 8f37b70630ceb62aff4019e9ad2508977590a873) Conflicts: src/rgw/rgw_sync_module.cc : Resolved in RGWCallStatRemoteObjCR::operate --- src/rgw/rgw_sync_module.cc | 4 ++-- src/rgw/rgw_sync_module_es.cc | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_sync_module.cc b/src/rgw/rgw_sync_module.cc index 215dcf2fee0..5608878417e 100644 --- a/src/rgw/rgw_sync_module.cc +++ b/src/rgw/rgw_sync_module.cc @@ -35,8 +35,8 @@ int RGWCallStatRemoteObjCR::operate() { return set_cr_error(retcode); } ldout(sync_env->cct, 20) << "stat of remote obj: z=" << sync_env->source_zone - << " b=" << bucket_info.bucket << " k=" << key << " size=" << size << " mtime=" << mtime - << " attrs=" << attrs << dendl; + << " b=" << bucket_info.bucket << " k=" << key + << " size=" << size << " mtime=" << mtime << dendl; yield { RGWStatRemoteObjCBCR *cb = allocate_callback(); if (cb) { diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc index aa58219b5a9..f3a1df95742 100644 --- a/src/rgw/rgw_sync_module_es.cc +++ b/src/rgw/rgw_sync_module_es.cc @@ -491,8 +491,9 @@ public: int operate() override { reenter(this) { ldout(sync_env->cct, 10) << ": stat of remote obj: z=" << sync_env->source_zone - << " b=" << bucket_info.bucket << " k=" << key << " size=" << size << " mtime=" << mtime - << " attrs=" << attrs << dendl; + << " b=" << bucket_info.bucket << " k=" << key + << " size=" << size << " mtime=" << mtime << dendl; + yield { string path = conf->get_obj_path(bucket_info, key); es_obj_metadata doc(sync_env->cct, conf, bucket_info, key, mtime, size, attrs, versioned_epoch); -- 2.47.3