From b9eb8b0e046bd1e23cd3fd3b7d3b87c99eeb5d13 Mon Sep 17 00:00:00 2001
From: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
Date: Thu, 7 May 2020 19:18:14 +0800
Subject: [PATCH] rgw:  abort multipart date should be round up to midnight
 next day like expiration one

Signed-off-by: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit c314d322f8a0fc628f9d19b69491b54a82c069f0)
---
 src/rgw/rgw_lc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index c6a0dd70c5c..d427f163661 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -1999,7 +1999,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
-- 
2.47.3