]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: abort multipart date should be round up to midnight next day like expiration one
authorzhangshaowen <zhangshaowen@cmss.chinamobile.com>
Thu, 7 May 2020 11:18:14 +0000 (19:18 +0800)
committerzhangshaowen <zhangshaowen@cmss.chinamobile.com>
Thu, 7 May 2020 11:18:14 +0000 (19:18 +0800)
Signed-off-by: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
src/rgw/rgw_lc.cc

index 53b7ef45432665f5a8b4414ba9481746717e5bb3..443a7929da084f6a14039e51d0a83ea7b70ddd17 100644 (file)
@@ -1735,7 +1735,7 @@ bool s3_multipart_abort_header(
     std::optional<ceph::real_time> rule_abort_date;
     if (mp_expiration.has_days()) {
       rule_abort_date = std::optional<ceph::real_time>(
-              mtime + make_timespan(mp_expiration.get_days()*24*60*60));
+              mtime + make_timespan(mp_expiration.get_days()*24*60*60 - ceph::real_clock::to_time_t(mtime)%(24*60*60) + 24*60*60));
     }
 
     // update earliest abort date