[cli][daemon] make multipass delete error message right.

src/client/cli/cmd/delete.cpp

@@ -68,7 +68,12 @@ mp::ReturnCode cmd::Delete::run(mp::ArgParser* parser)
         return mp::ReturnCode::Ok;
     };
 
-    auto on_failure = [this](grpc::Status& status) { return standard_failure_handler_for(name(), cerr, status); };
+    auto on_failure = [this](grpc::Status& status) {
+        // grpc::StatusCode::INVALID_ARGUMENT matches mp::VMStateInvalidException
+        return status.error_code() == grpc::StatusCode::INVALID_ARGUMENT
+                   ? standard_failure_handler_for(name(), cerr, status, "Use --purge to forcefully delete it.")
+                   : standard_failure_handler_for(name(), cerr, status);
+    };
 
     using Client = grpc::ClientReaderWriterInterface<DeleteRequest, DeleteReply>;
     auto streaming_callback = [this](const mp::DeleteReply& reply, Client* client) {

src/daemon/daemon.cpp

@@ -2299,6 +2299,10 @@ try // clang-format on
     server->Write(response);
     status_promise->set_value(status);
 }
+catch (const mp::VMStateInvalidException& e)
+{
+    status_promise->set_value(grpc::Status{grpc::StatusCode::INVALID_ARGUMENT, e.what()});
+}
 catch (const std::exception& e)
 {
     status_promise->set_value(grpc::Status(grpc::StatusCode::FAILED_PRECONDITION, e.what(), ""));
@@ -3080,14 +3084,12 @@ bool mp::Daemon::delete_vm(InstanceTable::iterator vm_it, bool purge, DeleteRepl
 
         mounts[name].clear();
 
-        try
+        // Temporary solution to make multipass delete behave right.
+        // TODO, move this check into check_state_for_shutdown
+        if (!(instance->current_state() == VirtualMachine::State::suspended) || purge)
         {
             instance->shutdown(purge);
         }
-        catch (const VMStateInvalidException& exception)
-        {
-            // in the case of VMStateInvalidException, we simply just skip shutdown call
-        }
 
         if (!purge)
         {