From 2710e7a665a7cb1839929424bce641461f8be407 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 6 Aug 2018 12:15:25 -0700 Subject: [PATCH] rgw: api adjustments following rebase Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_cr_tools.cc | 2 ++ src/rgw/rgw_sync_module_pubsub.cc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/rgw/rgw_cr_tools.cc b/src/rgw/rgw_cr_tools.cc index 1d5565acf22..d25c3166caf 100644 --- a/src/rgw/rgw_cr_tools.cc +++ b/src/rgw/rgw_cr_tools.cc @@ -1,3 +1,5 @@ +#include "common/errno.h" + #include "rgw_cr_tools.h" #include "rgw_bucket.h" #include "rgw_user.h" diff --git a/src/rgw/rgw_sync_module_pubsub.cc b/src/rgw/rgw_sync_module_pubsub.cc index d58a8678c91..7a7bcf05b5f 100644 --- a/src/rgw/rgw_sync_module_pubsub.cc +++ b/src/rgw/rgw_sync_module_pubsub.cc @@ -1215,13 +1215,13 @@ public: class RGWPSHandleRemoteObjCBCR : public RGWStatRemoteObjCBCR { RGWDataSyncEnv *sync_env; PSEnvRef env; - uint64_t versioned_epoch; + std::optional versioned_epoch; EventRef event; TopicsRef topics; public: RGWPSHandleRemoteObjCBCR(RGWDataSyncEnv *_sync_env, RGWBucketInfo& _bucket_info, rgw_obj_key& _key, - PSEnvRef _env, uint64_t _versioned_epoch, + PSEnvRef _env, std::optional _versioned_epoch, TopicsRef& _topics) : RGWStatRemoteObjCBCR(_sync_env, _bucket_info, _key), sync_env(_sync_env), env(_env), @@ -1260,12 +1260,12 @@ public: class RGWPSHandleRemoteObjCR : public RGWCallStatRemoteObjCR { PSEnvRef env; - uint64_t versioned_epoch; + std::optional versioned_epoch; TopicsRef topics; public: RGWPSHandleRemoteObjCR(RGWDataSyncEnv *_sync_env, RGWBucketInfo& _bucket_info, rgw_obj_key& _key, - PSEnvRef _env, uint64_t _versioned_epoch, + PSEnvRef _env, std::optional _versioned_epoch, TopicsRef& _topics) : RGWCallStatRemoteObjCR(_sync_env, _bucket_info, _key), env(_env), versioned_epoch(_versioned_epoch), topics(_topics) { @@ -1284,12 +1284,12 @@ class RGWPSHandleObjCreateCR : public RGWCoroutine { RGWBucketInfo bucket_info; rgw_obj_key key; PSEnvRef env; - uint64_t versioned_epoch; + std::optional versioned_epoch; TopicsRef topics; public: RGWPSHandleObjCreateCR(RGWDataSyncEnv *_sync_env, RGWBucketInfo& _bucket_info, rgw_obj_key& _key, - PSEnvRef _env, uint64_t _versioned_epoch) : RGWCoroutine(_sync_env->cct), + PSEnvRef _env, std::optional _versioned_epoch) : RGWCoroutine(_sync_env->cct), sync_env(_sync_env), bucket_info(_bucket_info), key(_key), @@ -1393,8 +1393,8 @@ public: ldout(sync_env->cct, 5) << conf->id << ": start" << dendl; return new RGWPSInitEnvCBCR(sync_env, env); } - RGWCoroutine *sync_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, uint64_t versioned_epoch, rgw_zone_set *zones_trace) override { - ldout(sync_env->cct, 10) << conf->id << ": sync_object: b=" << bucket_info.bucket << " k=" << key << " versioned_epoch=" << versioned_epoch << dendl; + RGWCoroutine *sync_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, std::optional versioned_epoch, rgw_zone_set *zones_trace) override { + ldout(sync_env->cct, 10) << conf->id << ": sync_object: b=" << bucket_info.bucket << " k=" << key << " versioned_epoch=" << versioned_epoch.value_or(0) << dendl; return new RGWPSHandleObjCreateCR(sync_env, bucket_info, key, env, versioned_epoch); } RGWCoroutine *remove_object(RGWDataSyncEnv *sync_env, RGWBucketInfo& bucket_info, rgw_obj_key& key, real_time& mtime, bool versioned, uint64_t versioned_epoch, rgw_zone_set *zones_trace) override { -- 2.39.5