Merge #465

465: shell to machine in delayed-shutdown state r=saviq a=pekof Fix bug #461 ssh_info returns connection data if machine is still running Co-authored-by: pekof <[email protected]>
canonical · Oct 30, 2018 · 90a7057 · 90a7057
2 parents 6e0f992 + b88cff6
commit 90a7057
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/include/multipass/virtual_machine.h b/include/multipass/virtual_machine.h
@@ -60,6 +60,7 @@ class VirtualMachine
     virtual void wait_until_ssh_up(std::chrono::milliseconds timeout) = 0;
     virtual void wait_for_cloud_init(std::chrono::milliseconds timeout) = 0;
     virtual void update_state() = 0;
+    virtual bool is_running() { return current_state() == State::running || current_state() == State::delayed_shutdown; }
 
     VirtualMachine::State state;
     const SSHKeyProvider& key_provider;

diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
@@ -1245,7 +1245,7 @@ try // clang-format on
                                 "");
         }
 
-        if (it->second->current_state() != mp::VirtualMachine::State::running)
+        if (!it->second->is_running())
         {
             return grpc::Status(grpc::StatusCode::FAILED_PRECONDITION,
                                 fmt::format("instance \"{}\" is not running", name), "");