[daemon][cli] changed to grpc::StatusCode::FAILED_PRECONDITION instea…

…d of INVALID_ARGUMENT to avoid unwanted matches.
canonical · Sep 2, 2024 · fc103db · fc103db
1 parent 23cdac3
commit fc103db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/client/cli/cmd/delete.cpp b/src/client/cli/cmd/delete.cpp
@@ -69,8 +69,8 @@ mp::ReturnCode cmd::Delete::run(mp::ArgParser* parser)
     };
 
     auto on_failure = [this](grpc::Status& status) {
-        // grpc::StatusCode::INVALID_ARGUMENT matches mp::VMStateInvalidException
-        return status.error_code() == grpc::StatusCode::INVALID_ARGUMENT
+        // grpc::StatusCode::FAILED_PRECONDITION matches mp::VMStateInvalidException
+        return status.error_code() == grpc::StatusCode::FAILED_PRECONDITION
                    ? standard_failure_handler_for(name(), cerr, status, "Use --purge to forcefully delete it.")
                    : standard_failure_handler_for(name(), cerr, status);
     };

diff --git a/src/client/cli/cmd/stop.cpp b/src/client/cli/cmd/stop.cpp
@@ -45,8 +45,8 @@ mp::ReturnCode cmd::Stop::run(mp::ArgParser* parser)
     auto on_failure = [this, &spinner](grpc::Status& status) {
         spinner.stop();
 
-        // grpc::StatusCode::INVALID_ARGUMENT matches mp::VMStateInvalidException
-        return status.error_code() == grpc::StatusCode::INVALID_ARGUMENT
+        // grpc::StatusCode::FAILED_PRECONDITION matches mp::VMStateInvalidException
+        return status.error_code() == grpc::StatusCode::FAILED_PRECONDITION
                    ? standard_failure_handler_for(name(), cerr, status, "Use --force to power it off.")
                    : standard_failure_handler_for(name(), cerr, status);
     };

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
@@ -2148,11 +2148,11 @@ try // clang-format on
 }
 catch (const mp::VMStateInvalidException& e)
 {
-    status_promise->set_value(grpc::Status{grpc::StatusCode::INVALID_ARGUMENT, e.what()});
+    status_promise->set_value(grpc::Status{grpc::StatusCode::FAILED_PRECONDITION, e.what()});
 }
 catch (const std::exception& e)
 {
-    status_promise->set_value(grpc::Status(grpc::StatusCode::FAILED_PRECONDITION, e.what(), ""));
+    status_promise->set_value(grpc::Status(grpc::StatusCode::INTERNAL, e.what()));
 }
 
 void mp::Daemon::suspend(const SuspendRequest* request,
@@ -2301,11 +2301,11 @@ try // clang-format on
 }
 catch (const mp::VMStateInvalidException& e)
 {
-    status_promise->set_value(grpc::Status{grpc::StatusCode::INVALID_ARGUMENT, e.what()});
+    status_promise->set_value(grpc::Status{grpc::StatusCode::FAILED_PRECONDITION, e.what()});
 }
 catch (const std::exception& e)
 {
-    status_promise->set_value(grpc::Status(grpc::StatusCode::FAILED_PRECONDITION, e.what(), ""));
+    status_promise->set_value(grpc::Status(grpc::StatusCode::INTERNAL, e.what()));
 }
 
 void mp::Daemon::umount(const UmountRequest* request,