chore: apply suggestions

GreptimeTeam · Oct 17, 2023 · 009c445 · 009c445
1 parent e5ee291
commit 009c445
Show file tree

Hide file tree

Showing 11 changed files with 199 additions and 164 deletions.
diff --git a/src/cmd/src/error.rs b/src/cmd/src/error.rs
@@ -49,12 +49,6 @@ pub enum Error {
         source: common_procedure::error::Error,
     },
 
-    #[snafu(display("Failed to start procedures"))]
-    RecoverProcedures {
-        location: Location,
-        source: common_procedure::error::Error,
-    },
-
     #[snafu(display("Failed to start datanode"))]
     StartDatanode {
         location: Location,
@@ -229,8 +223,7 @@ impl ErrorExt for Error {
             | Error::CreateDir { .. }
             | Error::ConnectEtcd { .. } => StatusCode::InvalidArguments,
             Error::StartProcedureManager { source, .. }
-            | Error::StopProcedureManager { source, .. }
-            | Error::RecoverProcedures { source, .. } => source.status_code(),
+            | Error::StopProcedureManager { source, .. } => source.status_code(),
             Error::ReplCreation { .. } | Error::Readline { .. } => StatusCode::Internal,
             Error::RequestDatabase { source, .. } => source.status_code(),
             Error::CollectRecordBatches { source, .. }

diff --git a/src/cmd/src/standalone.rs b/src/cmd/src/standalone.rs
@@ -42,9 +42,9 @@ use servers::Mode;
 use snafu::ResultExt;
 
 use crate::error::{
-    CreateDirSnafu, IllegalConfigSnafu, InitMetadataSnafu, RecoverProceduresSnafu, Result,
-    ShutdownDatanodeSnafu, ShutdownFrontendSnafu, StartDatanodeSnafu, StartFrontendSnafu,
-    StartProcedureManagerSnafu, StopProcedureManagerSnafu,
+    CreateDirSnafu, IllegalConfigSnafu, InitMetadataSnafu, Result, ShutdownDatanodeSnafu,
+    ShutdownFrontendSnafu, StartDatanodeSnafu, StartFrontendSnafu, StartProcedureManagerSnafu,
+    StopProcedureManagerSnafu,
 };
 use crate::options::{MixOptions, Options, TopLevelOptions};
 
@@ -172,12 +172,8 @@ impl Instance {
 
         self.procedure_manager
             .start()
-            .context(StartProcedureManagerSnafu)?;
-
-        self.procedure_manager
-            .recover()
             .await
-            .context(RecoverProceduresSnafu)?;
+            .context(StartProcedureManagerSnafu)?;
 
         self.frontend.start().await.context(StartFrontendSnafu)?;
         Ok(())

diff --git a/src/common/procedure/src/error.rs b/src/common/procedure/src/error.rs
@@ -35,7 +35,7 @@ pub enum Error {
     LoaderConflict { name: String, location: Location },
 
     #[snafu(display("Procedure Manager is stopped"))]
-    ProcedureManagerNotStart { location: Location },
+    ManagerNotStart { location: Location },
 
     #[snafu(display("Failed to serialize to json"))]
     ToJson {
@@ -152,7 +152,7 @@ impl ErrorExt for Error {
             | Error::RetryTimesExceeded { .. }
             | Error::RetryLater { .. }
             | Error::WaitWatcher { .. }
-            | Error::ProcedureManagerNotStart { .. } => StatusCode::Internal,
+            | Error::ManagerNotStart { .. } => StatusCode::Internal,
             Error::LoaderConflict { .. } | Error::DuplicateProcedure { .. } => {
                 StatusCode::InvalidArguments
             }