s3 api: also ensure increasing timestamps for create_multipart_upload

1 files changed, 9 insertions, 5 deletions

diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs
index 62a1f76a..c4df7561 100644
--- a/src/api/s3/put.rs
+++ b/src/api/s3/put.rs
@@ -86,11 +86,7 @@ pub(crate) async fn save_stream<S: Stream<Item = Result<Bytes, Error>> + Unpin>(
 
 	// Generate identity of new version
 	let version_uuid = gen_uuid();
-	let version_timestamp = existing_object
-		.as_ref()
-		.and_then(|obj| obj.versions().iter().map(|v| v.timestamp).max())
-		.map(|t| std::cmp::max(t + 1, now_msec()))
-		.unwrap_or_else(now_msec);
+	let version_timestamp = next_timestamp(&existing_object);
 
 	// If body is small enough, store it directly in the object table
 	// as "inline data". We can then return immediately.
@@ -532,3 +528,11 @@ pub(crate) fn get_headers(headers: &HeaderMap<HeaderValue>) -> Result<ObjectVers
 		other,
 	})
 }
+
+pub(crate) fn next_timestamp(existing_object: &Option<Object>) -> u64 {
+	existing_object
+		.as_ref()
+		.and_then(|obj| obj.versions().iter().map(|v| v.timestamp).max())
+		.map(|t| std::cmp::max(t + 1, now_msec()))
+		.unwrap_or_else(now_msec)
+}