Merge pull request ceph#11963 from zhangsw/fix-rgw-lifecycle-bug

rgw: LCWorker's worktime is not the same as config rgw_lifecycle_work_time. Reviewed-by: Daniel Gryniewicz <[email protected]>
senax · Apr 4, 2017 · 1e8b763 · 1e8b763
2 parents b4c0fc7 + a491710
commit 1e8b763
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
@@ -638,7 +638,7 @@ bool RGWLC::LCWorker::should_work(utime_t& now)
   if (cct->_conf->rgw_lc_debug_interval > 0) {
 	  /* We're debugging, so say we can run */
 	  return true;
-  } else if ((bdt.tm_hour*60 + bdt.tm_min >= start_hour*60 + start_minute) ||
+  } else if ((bdt.tm_hour*60 + bdt.tm_min >= start_hour*60 + start_minute) &&
 		     (bdt.tm_hour*60 + bdt.tm_min <= end_hour*60 + end_minute)) {
 	  return true;
   } else {