refactor

risingwavelabs · Nov 11, 2024 · c81820f · c81820f
1 parent a12bce3
commit c81820f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/src/meta/service/src/hummock_service.rs b/src/meta/service/src/hummock_service.rs
@@ -250,7 +250,7 @@ impl HummockManagerService for HummockServiceImpl {
                     Some(backup_manager_2),
                 )
                 .await
-                .inspect_err(|e| tracing::warn!(error = e.as_report(), "Failed to start GC."));
+                .inspect_err(|e| tracing::warn!(error = %e.as_report(), "Failed to start GC."));
         });
         Ok(Response::new(TriggerFullGcResponse { status: None }))
     }

diff --git a/src/meta/src/hummock/manager/tests.rs b/src/meta/src/hummock/manager/tests.rs
@@ -950,7 +950,8 @@ async fn test_hummock_compaction_task_heartbeat() {
     let compactor_manager = hummock_manager.compactor_manager_ref_for_test();
     let _tx = compactor_manager.add_compactor(context_id);
 
-    let (join_handle, shutdown_tx) = HummockManager::hummock_timer_task(hummock_manager.clone());
+    let (join_handle, shutdown_tx) =
+        HummockManager::hummock_timer_task(hummock_manager.clone(), None);
 
     // No compaction task available.
     assert!(hummock_manager
@@ -1079,7 +1080,8 @@ async fn test_hummock_compaction_task_heartbeat_removal_on_node_removal() {
     let compactor_manager = hummock_manager.compactor_manager_ref_for_test();
     let _tx = compactor_manager.add_compactor(context_id);
 
-    let (join_handle, shutdown_tx) = HummockManager::hummock_timer_task(hummock_manager.clone());
+    let (join_handle, shutdown_tx) =
+        HummockManager::hummock_timer_task(hummock_manager.clone(), None);
 
     // No compaction task available.
     assert!(hummock_manager

diff --git a/src/meta/src/hummock/manager/timer_task.rs b/src/meta/src/hummock/manager/timer_task.rs
@@ -449,7 +449,7 @@ impl HummockManager {
                                             )
                                             .await
                                             .inspect_err(|e| {
-                                                warn!(error = e.as_report(), "Failed to start GC.")
+                                                warn!(error = %e.as_report(), "Failed to start GC.")
                                             });
                                     });
                                 }

diff --git a/src/meta/src/hummock/mod.rs b/src/meta/src/hummock/mod.rs
@@ -58,7 +58,7 @@ pub fn start_hummock_workers(
 
 /// Starts a task to periodically vacuum stale metadata.
 pub fn start_vacuum_metadata_loop(
-    vacuum: HummockManagerRef,
+    hummock_manager: HummockManagerRef,
     interval: Duration,
 ) -> (JoinHandle<()>, Sender<()>) {
     let (shutdown_tx, mut shutdown_rx) = tokio::sync::oneshot::channel();
@@ -75,7 +75,7 @@ pub fn start_vacuum_metadata_loop(
                     return;
                 }
             }
-            if let Err(err) = vacuum.delete_metadata().await {
+            if let Err(err) = hummock_manager.delete_metadata().await {
                 tracing::warn!(error = %err.as_report(), "Vacuum metadata error");
             }
         }

diff --git a/src/storage/src/hummock/compactor/mod.rs b/src/storage/src/hummock/compactor/mod.rs
@@ -553,11 +553,11 @@ pub fn start_compactor(
                                     }
                                 });
                             }
-                            ResponseEvent::VacuumTask(vacuum_task) => {
-                                tracing::error!(?vacuum_task, "unexpected vacuum task");
+                            ResponseEvent::VacuumTask(_) => {
+                                unreachable!("unexpected vacuum task");
                             }
-                            ResponseEvent::FullScanTask(full_scan_task) => {
-                                tracing::error!(?full_scan_task, "unexpected scan task");
+                            ResponseEvent::FullScanTask(_) => {
+                                unreachable!("unexpected scan task");
                             }
                             ResponseEvent::ValidationTask(validation_task) => {
                                 let validation_task = ValidationTask::from(validation_task);
@@ -725,11 +725,11 @@ pub fn start_shared_compactor(
                                     }
 
                                 }
-                                dispatch_compaction_task_request::Task::VacuumTask(vacuum_task) => {
-                                    tracing::error!(?vacuum_task, "unexpected vacuum task");
+                                dispatch_compaction_task_request::Task::VacuumTask(_) => {
+                                    unreachable!("unexpected vacuum task");
                                 }
-                                dispatch_compaction_task_request::Task::FullScanTask(full_scan_task) => {
-                                    tracing::error!(?full_scan_task, "unexpected scan task");
+                                dispatch_compaction_task_request::Task::FullScanTask(_) => {
+                                    unreachable!("unexpected scan task");
                                 }
                                 dispatch_compaction_task_request::Task::ValidationTask(validation_task) => {
                                     let validation_task = ValidationTask::from(validation_task);
-Original file line number
+Diff line change
@@ Expand Up / @@ -449,7 +449,7 @@ impl HummockManager { @@
                                                 )
                                                 .await
                                                 .inspect_err(|e| {
-                                                    warn!(error = e.as_report(), "Failed to start GC.")
+                                                    warn!(error = %e.as_report(), "Failed to start GC.")
                                                 });
                                         });
                                     }
@@ Expand Down @@