fixup

risingwavelabs · Sep 27, 2024 · 3ec1aea · 3ec1aea
1 parent 0aa1fc4
commit 3ec1aea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/meta/src/hummock/manager/gc.rs b/src/meta/src/hummock/manager/gc.rs
@@ -188,9 +188,13 @@ impl HummockManager {
             sst_retention_time,
             Duration::from_secs(self.env.opts.min_sst_retention_time_sec),
         );
+        let start_after = self.full_gc_state.next_start_after();
+        let limit = self.full_gc_state.limit;
         tracing::info!(
             retention_sec = sst_retention_time.as_secs(),
             prefix = prefix.as_ref().unwrap_or(&String::from("")),
+            start_after,
+            limit,
             "run full GC"
         );
 
@@ -205,8 +209,8 @@ impl HummockManager {
             .send_event(ResponseEvent::FullScanTask(FullScanTask {
                 sst_retention_time_sec: sst_retention_time.as_secs(),
                 prefix,
-                start_after: self.full_gc_state.next_start_after(),
-                limit: self.full_gc_state.limit,
+                start_after,
+                limit,
             }))
             .map_err(|_| Error::CompactorUnreachable(compactor.context_id()))?;
         Ok(true)

diff --git a/src/meta/src/hummock/manager/timer_task.rs b/src/meta/src/hummock/manager/timer_task.rs
@@ -340,8 +340,10 @@ impl HummockManager {
                                 }
 
                                 HummockTimerEvent::FullGc => {
+                                    let retention_sec =
+                                        hummock_manager.env.opts.min_sst_retention_time_sec;
                                     if hummock_manager
-                                        .start_full_gc(Duration::from_secs(3600), None)
+                                        .start_full_gc(Duration::from_secs(retention_sec), None)
                                         .is_ok()
                                     {
                                         tracing::info!("Start full GC from meta node.");

diff --git a/src/object_store/src/object/s3.rs b/src/object_store/src/object/s3.rs
@@ -1014,6 +1014,7 @@ impl Stream for S3ObjectIter {
             .bucket(&self.bucket)
             .prefix(&self.prefix);
         if let Some(start_after) = self.start_after.as_ref() {
+            #[cfg(not(madsim))]
             request = request.start_after(start_after);
         }
         if let Some(continuation_token) = self.next_continuation_token.as_ref() {