fix(lifecycle): lifecycle fixes (#1625)

Signed-off-by: likewu <likewu@126.com>
Co-authored-by: loverustfs <hello@rustfs.com>

crates/filemeta/src/fileinfo.rs

@@ -22,6 +22,7 @@ use s3s::header::X_AMZ_RESTORE;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use time::{OffsetDateTime, format_description::well_known::Rfc3339};
+use time::{format_description::FormatItem, macros::format_description};
 use uuid::Uuid;
 
 pub const ERASURE_ALGORITHM: &str = "rs-vandermonde";
@@ -37,6 +38,9 @@ pub const TIER_SKIP_FV_ID: &str = "tier-skip-fvid";
 
 const ERR_RESTORE_HDR_MALFORMED: &str = "x-amz-restore header malformed";
 
+const RFC1123: &[FormatItem<'_>] =
+    format_description!("[weekday repr:short], [day] [month repr:short] [year] [hour]:[minute]:[second] GMT");
+
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
 pub struct ObjectPartInfo {
     pub etag: String,
@@ -580,6 +584,7 @@ pub trait RestoreStatusOps {
     fn on_going(&self) -> bool;
     fn on_disk(&self) -> bool;
     fn to_string(&self) -> String;
+    fn to_string2(&self) -> String;
 }
 
 impl RestoreStatusOps for RestoreStatus {
@@ -618,6 +623,18 @@ impl RestoreStatusOps for RestoreStatus {
                 .unwrap()
         )
     }
+
+    fn to_string2(&self) -> String {
+        if self.on_going() {
+            return "ongoing-request=\"true\"".to_string();
+        }
+        format!(
+            "ongoing-request=\"false\", expiry-date=\"{}\"",
+            OffsetDateTime::from(self.restore_expiry_date.clone().unwrap())
+                .format(&RFC1123)
+                .unwrap()
+        )
+    }
 }
 
 pub fn parse_restore_obj_status(restore_hdr: &str) -> Result<RestoreStatus> {
@@ -650,10 +667,8 @@ pub fn parse_restore_obj_status(restore_hdr: &str) -> Result<RestoreStatus> {
             if expiry_tokens[0].trim() != "expiry-date" {
                 return Err(Error::other(ERR_RESTORE_HDR_MALFORMED));
             }
-            let expiry = OffsetDateTime::parse(expiry_tokens[1].trim_matches('"'), &Rfc3339).unwrap();
-            /*if err != nil {
-                return Err(Error::other(ERR_RESTORE_HDR_MALFORMED));
-            }*/
+            let expiry = OffsetDateTime::parse(expiry_tokens[1].trim_matches('"'), &Rfc3339)
+                .map_err(|_| Error::other(ERR_RESTORE_HDR_MALFORMED))?;
             return Ok(RestoreStatus {
                 is_restore_in_progress: Some(false),
                 restore_expiry_date: Some(Timestamp::from(expiry)),

crates/filemeta/src/filemeta.rs

@@ -14,8 +14,8 @@
 
 use crate::{
     ErasureAlgo, ErasureInfo, Error, FileInfo, FileInfoVersions, InlineData, ObjectPartInfo, RawFileInfo, ReplicationState,
-    ReplicationStatusType, Result, TIER_FV_ID, TIER_FV_MARKER, VersionPurgeStatusType, replication_statuses_map,
-    version_purge_statuses_map,
+    ReplicationStatusType, Result, TIER_FV_ID, TIER_FV_MARKER, VersionPurgeStatusType, is_restored_object_on_disk,
+    replication_statuses_map, version_purge_statuses_map,
 };
 use byteorder::ByteOrder;
 use bytes::Bytes;
@@ -462,7 +462,7 @@ impl FileMeta {
         self.versions
             .iter()
             .filter(|v| {
-                v.header.version_type == VersionType::Object && v.header.version_id != Some(vid) && v.header.user_data_dir()
+                v.header.version_type == VersionType::Object && v.header.version_id != Some(vid) && v.header.uses_data_dir()
             })
             .map(|v| FileMetaVersion::decode_data_dir_from_meta(&v.meta).unwrap_or_default())
             .filter(|v| v == data_dir)
@@ -1201,10 +1201,11 @@ impl FileMeta {
             .filter(|v| {
                 v.header.version_type == VersionType::Object
                     && v.header.version_id != Some(version_id)
-                    && v.header.user_data_dir()
+                    && v.header.uses_data_dir()
             })
             .filter_map(|v| FileMetaVersion::decode_data_dir_from_meta(&v.meta).ok())
-            .filter(|&dir| dir == data_dir)
+            .filter(|&dir| dir.is_none() || dir != data_dir)
+            //.filter(|&dir| dir != data_dir)
             .count()
     }
 
@@ -1588,7 +1589,7 @@ impl FileMetaVersionHeader {
         false
     }
 
-    pub fn user_data_dir(&self) -> bool {
+    pub fn uses_data_dir(&self) -> bool {
         self.flags & Flags::UsesDataDir as u8 != 0
     }
 
@@ -1961,7 +1962,15 @@ impl MetaObject {
     }
 
     pub fn uses_data_dir(&self) -> bool {
-        !self.inlinedata()
+        if let Some(status) = self
+            .meta_sys
+            .get(&format!("{RESERVED_METADATA_PREFIX_LOWER}{TRANSITION_STATUS}"))
+            && *status == TRANSITION_COMPLETE.as_bytes().to_vec()
+        {
+            return false;
+        }
+
+        is_restored_object_on_disk(&self.meta_user)
     }
 
     pub fn inlinedata(&self) -> bool {