Merge pull request ceph#65585 from cbodley/wip-rgw-lc-bucket-already-run-today

rgw/lc: enforce consistent rgw_lc_debug_interval start times

Reviewed-by: Daniel Gryniewicz <[email protected]>

Author: cbodley

src/rgw/rgw_lc.cc

@@ -2250,11 +2250,11 @@ static inline bool already_run_today(CephContext* cct, time_t start_date)
   utime_t now = ceph_clock_now();
   localtime_r(&start_date, &bdt);
 
-  if (cct->_conf->rgw_lc_debug_interval > 0) {
-    if (now - start_date < cct->_conf->rgw_lc_debug_interval)
-      return true;
-    else
-      return false;
+  if (const auto interval = cct->_conf->rgw_lc_debug_interval; interval > 0) {
+    // compare start_date against the beginning of the current interval
+    const auto remainder = now.sec() % interval;
+    const time_t interval_start = now.sec() - remainder;
+    return start_date >= interval_start;
   }
 
   bdt.tm_hour = 0;
@@ -2609,10 +2609,10 @@ bool RGWLC::going_down()
 
 bool RGWLC::LCWorker::should_work(utime_t& now)
 {
-  int start_hour;
-  int start_minute;
-  int end_hour;
-  int end_minute;
+  int start_hour = 0;
+  int start_minute = 0;
+  int end_hour = 23;
+  int end_minute = 59;
   string worktime = cct->_conf->rgw_lifecycle_work_time;
   sscanf(worktime.c_str(),"%d:%d-%d:%d",&start_hour, &start_minute,
 	 &end_hour, &end_minute);
@@ -2642,17 +2642,19 @@ int RGWLC::LCWorker::schedule_next_start_time(utime_t &start, utime_t& now)
 {
   int secs;
 
-  if (cct->_conf->rgw_lc_debug_interval > 0) {
-	secs = start + cct->_conf->rgw_lc_debug_interval - now;
+  if (const auto interval = cct->_conf->rgw_lc_debug_interval; interval > 0) {
+	// schedule for the next interval
+	const auto remainder = now.sec() % interval;
+	secs = interval - remainder;
 	if (secs < 0)
 	  secs = 0;
 	return (secs);
   }
 
-  int start_hour;
-  int start_minute;
-  int end_hour;
-  int end_minute;
+  int start_hour = 0;
+  int start_minute = 0;
+  int end_hour = 23;
+  int end_minute = 59;
   string worktime = cct->_conf->rgw_lifecycle_work_time;
   sscanf(worktime.c_str(),"%d:%d-%d:%d",&start_hour, &start_minute, &end_hour,
 	 &end_minute);