diff options
Diffstat (limited to 'src/rgw/rgw_lc.h')
| -rw-r--r-- | src/rgw/rgw_lc.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/rgw/rgw_lc.h b/src/rgw/rgw_lc.h index 162b839efea..cc6a7e51a1d 100644 --- a/src/rgw/rgw_lc.h +++ b/src/rgw/rgw_lc.h @@ -469,7 +469,7 @@ struct transition_action int days; boost::optional<ceph::real_time> date; std::string storage_class; - transition_action() : days(0) {} + transition_action() : days(-1) {} void dump(Formatter *f) const { if (!date) { f->dump_int("days", days); @@ -628,15 +628,15 @@ public: const std::unique_ptr<rgw::sal::Bucket>& optional_bucket, bool once); int advance_head(const std::string& lc_shard, - rgw::sal::Lifecycle::LCHead& head, - rgw::sal::Lifecycle::LCEntry& entry, + rgw::sal::LCHead& head, + const rgw::sal::LCEntry& entry, time_t start_date); int check_if_shard_done(const std::string& lc_shard, - rgw::sal::Lifecycle::LCHead& head, + rgw::sal::LCHead& head, int worker_ix); int update_head(const std::string& lc_shard, - rgw::sal::Lifecycle::LCHead& head, - rgw::sal::Lifecycle::LCEntry& entry, + rgw::sal::LCHead& head, + rgw::sal::LCEntry& entry, time_t start_date, int worker_ix); int process(int index, int max_lock_secs, LCWorker* worker, bool once); int process_bucket(int index, int max_lock_secs, LCWorker* worker, @@ -644,19 +644,21 @@ public: bool expired_session(time_t started); time_t thread_stop_at(); int list_lc_progress(std::string& marker, uint32_t max_entries, - std::vector<std::unique_ptr<rgw::sal::Lifecycle::LCEntry>>&, + std::vector<rgw::sal::LCEntry>&, int& index); int bucket_lc_process(std::string& shard_id, LCWorker* worker, time_t stop_at, bool once); int bucket_lc_post(int index, int max_lock_sec, - rgw::sal::Lifecycle::LCEntry& entry, int& result, LCWorker* worker); + rgw::sal::LCEntry& entry, int& result, LCWorker* worker); bool going_down(); void start_processor(); void stop_processor(); - int set_bucket_config(rgw::sal::Bucket* bucket, + int set_bucket_config(const DoutPrefixProvider* dpp, optional_yield y, + rgw::sal::Bucket* bucket, const rgw::sal::Attrs& bucket_attrs, RGWLifecycleConfiguration *config); - int remove_bucket_config(rgw::sal::Bucket* bucket, + int remove_bucket_config(const DoutPrefixProvider* dpp, optional_yield y, + rgw::sal::Bucket* bucket, const rgw::sal::Attrs& bucket_attrs, bool merge_attrs = true); |