Skip to content

Commit

Permalink
Merge pull request #17061 from shashalu/fix-rgw-lc
Browse files Browse the repository at this point in the history
rgw: fix lc process only schdule the first item of lc objects

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: fang.yuxiang <fang.yuxiang@eisoo.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
  • Loading branch information
yuriw committed Sep 13, 2017
2 parents b7e9473 + 9561dc0 commit 06b8556
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/rgw/rgw_lc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,10 @@ bool RGWLC::if_already_run_today(time_t& start_date)
localtime_r(&start_date, &bdt);

if (cct->_conf->rgw_lc_debug_interval > 0) {
/* We're debugging, so say we can run */
return false;
if (now - start_date < cct->_conf->rgw_lc_debug_interval)
return true;
else
return false;
}

bdt.tm_hour = 0;
Expand Down Expand Up @@ -674,13 +676,11 @@ int RGWLC::process(int index, int max_lock_secs)
l.unlock(&store->lc_pool_ctx, obj_names[index]);
ret = bucket_lc_process(entry.first);
bucket_lc_post(index, max_lock_secs, entry, ret);
return 0;
}while(1);

exit:
l.unlock(&store->lc_pool_ctx, obj_names[index]);
return 0;

}while(1);

}

void RGWLC::start_processor()
Expand Down

0 comments on commit 06b8556

Please sign in to comment.