]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Fix a bug that LCWorker's worktime is not the same as config 11963/head
authorZhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Mon, 14 Nov 2016 09:15:47 +0000 (17:15 +0800)
committerZhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Wed, 30 Nov 2016 02:07:46 +0000 (10:07 +0800)
rgw_lifecycle_work_time.

Fixes: http://tracker.ceph.com/issues/18087
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
src/rgw/rgw_lc.cc

index 8c5ec60a143dee2c5dc4d0e1011d24a4cd82794b..ddd404e46c9c3701b9c5fe5ee69c79a64fc7b505 100644 (file)
@@ -529,7 +529,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 {