From 9e7b5991eb02d055766a0e878fc03e5d27c41acb Mon Sep 17 00:00:00 2001 From: weisd Date: Fri, 10 Jan 2025 23:49:21 +0800 Subject: [PATCH] fix make_bucket created not set --- ecstore/src/bucket/metadata.rs | 9 +++++++-- ecstore/src/store.rs | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ecstore/src/bucket/metadata.rs b/ecstore/src/bucket/metadata.rs index 44fe33be7..02d25e8f9 100644 --- a/ecstore/src/bucket/metadata.rs +++ b/ecstore/src/bucket/metadata.rs @@ -287,8 +287,13 @@ impl BucketMetadata { Ok(updated) } - pub fn set_created(&mut self, created: OffsetDateTime) { - self.created = created + pub fn set_created(&mut self, created: Option) { + self.created = { + match created { + Some(t) => t, + None => OffsetDateTime::now_utc(), + } + } } pub async fn save(&mut self) -> Result<()> { diff --git a/ecstore/src/store.rs b/ecstore/src/store.rs index 843c81d31..f583a99bd 100644 --- a/ecstore/src/store.rs +++ b/ecstore/src/store.rs @@ -58,7 +58,7 @@ use tokio::select; use tokio::sync::mpsc::Sender; use tokio::sync::{broadcast, mpsc, RwLock}; use tokio::time::{interval, sleep}; -use tracing::{debug, info}; +use tracing::{debug, info, warn}; use uuid::Uuid; const MAX_UPLOADS_LIST: usize = 10000; @@ -1223,8 +1223,10 @@ impl StorageAPI for ECStore { let mut buckets = self.peer_sys.list_bucket(opts).await?; if !opts.no_metadata { + warn!("list_bucket meta"); for bucket in buckets.iter_mut() { if let Ok(created) = metadata_sys::created_at(&bucket.name).await { + warn!("list_bucket created {:?}", &created); bucket.created = Some(created); } } @@ -1287,9 +1289,7 @@ impl StorageAPI for ECStore { let mut meta = BucketMetadata::new(bucket); - if let Some(crd) = opts.created_at { - meta.set_created(crd); - } + meta.set_created(opts.created_at); if opts.lock_enabled { meta.object_lock_config_xml = xml::serialize::(&enableObjcetLockConfig)?;