]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fixes following code review 25137/head
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 21 Jan 2019 23:11:23 +0000 (15:11 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Thu, 24 Jan 2019 21:42:11 +0000 (13:42 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
doc/radosgw/archive-sync-module.rst
src/rgw/rgw_bucket.cc
src/rgw/rgw_data_sync.cc

index e3130e82f0be13825d3ea56cc44217a0abc00424..31b5ce37c03c61124e65b6263c4a89877afd1b84 100644 (file)
@@ -2,7 +2,7 @@
 Archive Sync Module
 ===================
 
-.. versionadded:: Mimic
+.. versionadded:: Nautilus
 
 This sync module leverages the versioning feature of the S3 objects in RGW to
 have an archive zone that captures the different versions of the S3 objects
index 55c4995174a381c5f4fe959c228e6c77622b4cd4..e73efee7fa3593c4a9fe79e180517a7746cd51d2 100644 (file)
@@ -2545,7 +2545,7 @@ WRITE_CLASS_ENCODER(archive_meta_info)
 class RGWArchiveBucketMetadataHandler : public RGWBucketMetadataHandler {
 public:
   int remove(RGWRados *store, string& entry, RGWObjVersionTracker& objv_tracker) override {
-    ldout(store->ctx(), 0) << "SKIP: bucket removal is not allowed on archive zone: bucket:" << entry << " ... proceeding to rename" << dendl;
+    ldout(store->ctx(), 5) << "SKIP: bucket removal is not allowed on archive zone: bucket:" << entry << " ... proceeding to rename" << dendl;
 
     string tenant_name, bucket_name;
     parse_bucket(entry, &tenant_name, &bucket_name);
index 7986565c8eaacf5218927101567719ca8ff1e419..68218082a93441553f04a1fd8ad37d7d2bfeb79a 100644 (file)
@@ -1720,7 +1720,7 @@ int RGWArchiveSyncModule::create_instance(CephContext *cct, const JSONFormattabl
 
 RGWCoroutine *RGWArchiveDataSyncModule::sync_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, std::optional<uint64_t> versioned_epoch, rgw_zone_set *zones_trace)
 {
-  ldout(sync_env->cct, 0) << "SYNC_ARCHIVE: sync_object: b=" << bucket_info.bucket << " k=" << key << " versioned_epoch=" << versioned_epoch.value_or(0) << dendl;
+  ldout(sync_env->cct, 5) << "SYNC_ARCHIVE: sync_object: b=" << bucket_info.bucket << " k=" << key << " versioned_epoch=" << versioned_epoch.value_or(0) << dendl;
   if (!bucket_info.versioned() ||
      (bucket_info.flags & BUCKET_VERSIONS_SUSPENDED)) {
       ldout(sync_env->cct, 0) << "SYNC_ARCHIVE: sync_object: enabling object versioning for archive bucket" << dendl;