Add --force argument to the stop command

include/multipass/exceptions/virtual_machine_state_exceptions.h

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MULTIPASS_VIRTUAL_MACHINE_STATE_EXCEPTIONS_H
+#define MULTIPASS_VIRTUAL_MACHINE_STATE_EXCEPTIONS_H
+
+#include <stdexcept>
+#include <string>
+
+namespace multipass
+{
+class VMStateIdempotentException : public std::runtime_error
+{
+public:
+    explicit VMStateIdempotentException(const std::string& msg) : runtime_error{msg}
+    {
+    }
+};
+
+class VMStateInvalidException : public std::runtime_error
+{
+public:
+    explicit VMStateInvalidException(const std::string& msg) : runtime_error{msg}
+    {
+    }
+};
+
+} // namespace multipass
+
+#endif // MULTIPASS_VIRTUAL_MACHINE_STATE_EXCEPTIONS_H

include/multipass/virtual_machine.h

@@ -63,7 +63,7 @@ class VirtualMachine : private DisabledCopyMove
 
     virtual ~VirtualMachine() = default;
     virtual void start() = 0;
-    virtual void shutdown() = 0;
+    virtual void shutdown(bool force = false) = 0;
     virtual void suspend() = 0;
     virtual State current_state() = 0;
     virtual int ssh_port() = 0;

src/client/cli/cmd/stop.cpp

@@ -62,8 +62,8 @@ QString cmd::Stop::short_help() const
 
 QString cmd::Stop::description() const
 {
-    return QStringLiteral("Stop the named instances, if running. Exits with\n"
-                          "return code 0 if successful.");
+    return QStringLiteral("Stop the named instances. Exits with return code 0 \n"
+                          "if successful.");
 }
 
 mp::ParseCode cmd::Stop::parse_args(mp::ArgParser* parser)
@@ -84,7 +84,10 @@ mp::ParseCode cmd::Stop::parse_args(mp::ArgParser* parser)
     QCommandLineOption time_option({"t", "time"}, "Time from now, in minutes, to delay shutdown of the instance",
                                    "time", "0");
     QCommandLineOption cancel_option({"c", "cancel"}, "Cancel a pending delayed shutdown");
-    parser->addOptions({all_option, time_option, cancel_option});
+    QCommandLineOption force_option("force",
+                                    "Force the instance to shut down immediately. Warning: This could potentially "
+                                    "corrupt a running instance, so use with caution.");
+    parser->addOptions({all_option, time_option, cancel_option, force_option});
 
     auto status = parser->commandParse(this);
     if (status != ParseCode::Ok)
@@ -105,6 +108,14 @@ mp::ParseCode cmd::Stop::parse_args(mp::ArgParser* parser)
         return ParseCode::CommandLineError;
     }
 
+    if (parser->isSet(force_option) && (parser->isSet(time_option) || parser->isSet(cancel_option)))
+    {
+        cerr << "Cannot set \'force\' along with \'time\' or \'cancel\' options at the same time\n";
+        return ParseCode::CommandLineError;
+    }
+
+    request.set_force_stop(parser->isSet(force_option));
+
     auto time = parser->value(time_option);
 
     if (time.startsWith("+"))

src/daemon/daemon.cpp

@@ -2132,10 +2132,13 @@
 
         std::function<grpc::Status(VirtualMachine&)> operation;
         if (request->cancel_shutdown())
-            operation = std::bind(&Daemon::cancel_vm_shutdown, this, std::placeholders::_1);
+            operation = [this](const VirtualMachine& vm) { return this->cancel_vm_shutdown(vm); };
+        else if (request->force_stop())
+            operation = [this](VirtualMachine& vm) { return this->switch_off_vm(vm); };
         else
-            operation = std::bind(&Daemon::shutdown_vm, this, std::placeholders::_1,
-                                  std::chrono::minutes(request->time_minutes()));
+            operation = [this, delay_minutes = std::chrono::minutes(request->time_minutes())](VirtualMachine& vm) {
+                return this->shutdown_vm(vm, delay_minutes);
+            };
 
         status = cmd_vms(instance_selection.operative_selection, operation);
     }
@@ -3071,7 +3074,7 @@
             delayed_shutdown_instances.erase(name);
 
         mounts[name].clear();
-        instance->shutdown();
+        instance->shutdown(purge);
 
         if (!purge)
         {
@@ -3116,12 +3119,14 @@
 grpc::Status mp::Daemon::shutdown_vm(VirtualMachine& vm, const std::chrono::milliseconds delay)
 {
     const auto& name = vm.vm_name;
-    const auto& state = vm.current_state();
+    const auto& current_state = vm.current_state();
 
     using St = VirtualMachine::State;
     const auto skip_states = {St::off, St::stopped, St::suspended};
 
-    if (std::none_of(cbegin(skip_states), cend(skip_states), [&state](const auto& st) { return state == st; }))
+    if (std::none_of(cbegin(skip_states), cend(skip_states), [&current_state](const auto& skip_state) {
+            return current_state == skip_state;
+        }))
     {
         delayed_shutdown_instances.erase(name);
 
@@ -3140,6 +3145,28 @@
     return grpc::Status::OK;
 }
 
+grpc::Status mp::Daemon::switch_off_vm(VirtualMachine& vm)
+{
+    const auto& name = vm.vm_name;
+    const auto& current_state = vm.current_state();
+
+    using St = VirtualMachine::State;
+    const auto skip_states = {St::off, St::stopped};
+
+    if (std::none_of(cbegin(skip_states), cend(skip_states), [&current_state](const auto& skip_state) {
+            return current_state == skip_state;
+        }))
+    {
+        delayed_shutdown_instances.erase(name);
+
+        vm.shutdown(true);
+    }
+    else
+        mpl::log(mpl::Level::debug, category, fmt::format("instance \"{}\" does not need stopping", name));
+
+    return grpc::Status::OK;
+}
+
 grpc::Status mp::Daemon::cancel_vm_shutdown(const VirtualMachine& vm)
 {
     auto it = delayed_shutdown_instances.find(vm.vm_name);

src/daemon/daemon.h

@@ -156,6 +156,7 @@ public slots:
     bool delete_vm(InstanceTable::iterator vm_it, bool purge, DeleteReply& response);
     grpc::Status reboot_vm(VirtualMachine& vm);
     grpc::Status shutdown_vm(VirtualMachine& vm, const std::chrono::milliseconds delay);
+    grpc::Status switch_off_vm(VirtualMachine& vm);
     grpc::Status cancel_vm_shutdown(const VirtualMachine& vm);
     grpc::Status get_ssh_info_for_vm(VirtualMachine& vm, SSHInfoReply& response);
 

src/platform/backends/libvirt/libvirt_virtual_machine.cpp

@@ -18,6 +18,7 @@
 #include "libvirt_virtual_machine.h"
 
 #include <multipass/exceptions/start_exception.h>
+#include <multipass/exceptions/virtual_machine_state_exceptions.h>
 #include <multipass/format.h>
 #include <multipass/logging/log.h>
 #include <multipass/memory_size.h>
@@ -345,41 +346,50 @@ void mp::LibVirtVirtualMachine::start()
     monitor->on_resume();
 }
 
-void mp::LibVirtVirtualMachine::shutdown()
+void mp::LibVirtVirtualMachine::shutdown(bool force)
 {
-    std::unique_lock<decltype(state_mutex)> lock{state_mutex};
-    auto domain = domain_by_name_for(vm_name, open_libvirt_connection(libvirt_wrapper).get(), libvirt_wrapper);
+    std::unique_lock<std::mutex> lock{state_mutex};
+    auto domain = checked_vm_domain();
+
     state = refresh_instance_state_for_domain(domain.get(), state, libvirt_wrapper);
-    if (state == State::suspended)
+
+    try
     {
-        mpl::log(mpl::Level::info, vm_name, fmt::format("Ignoring shutdown issued while suspended"));
+        check_state_for_shutdown(force);
     }
-    else
+    catch (const VMStateIdempotentException& e)
     {
-        drop_ssh_session();
+        mpl::log(mpl::Level::info, vm_name, e.what());
+        return;
+    }
 
-        if (state == State::running || state == State::delayed_shutdown || state == State::unknown)
-        {
-            if (!domain || libvirt_wrapper->virDomainShutdown(domain.get()) == -1)
-            {
-                auto warning_string{
-                    fmt::format("Cannot shutdown '{}': {}", vm_name, libvirt_wrapper->virGetLastErrorMessage())};
-                mpl::log(mpl::Level::warning, vm_name, warning_string);
-                throw std::runtime_error(warning_string);
-            }
-
-            state = State::off;
-            update_state();
-        }
-        else if (state == State::starting)
+    if (force) // TODO delete suspension state if it exists
+    {
+        mpl::log(mpl::Level::info, vm_name, "Forcing shutdown");
+
+        libvirt_wrapper->virDomainDestroy(domain.get());
+
+        if (state == State::starting || state == State::restarting)
         {
             libvirt_wrapper->virDomainDestroy(domain.get());
             state_wait.wait(lock, [this] { return shutdown_while_starting; });
-            update_state();
         }
     }
+    else
+    {
+        drop_ssh_session();
 
-    lock.unlock();
+        if (libvirt_wrapper->virDomainShutdown(domain.get()) == -1)
+        {
+            auto warning_string{
+                fmt::format("Cannot shutdown '{}': {}", vm_name, libvirt_wrapper->virGetLastErrorMessage())};
+            mpl::log(mpl::Level::warning, vm_name, warning_string);
+            throw std::runtime_error(warning_string);
+        }
+    }
+
+    state = State::off;
+    update_state();
     monitor->on_shutdown();
 }
 

src/platform/backends/libvirt/libvirt_virtual_machine.h

@@ -44,7 +44,7 @@ class LibVirtVirtualMachine final : public BaseVirtualMachine
     ~LibVirtVirtualMachine();
 
     void start() override;
-    void shutdown() override;
+    void shutdown(bool force = false) override;
     void suspend() override;
     State current_state() override;
     int ssh_port() override;

src/platform/backends/lxd/lxd_virtual_machine.cpp

@@ -25,6 +25,7 @@
 #include <multipass/exceptions/local_socket_connection_exception.h>
 #include <multipass/exceptions/snap_environment_exception.h>
 #include <multipass/exceptions/start_exception.h>
+#include <multipass/exceptions/virtual_machine_state_exceptions.h>
 #include <multipass/format.h>
 #include <multipass/logging/log.h>
 #include <multipass/memory_size.h>
@@ -261,26 +262,25 @@ void mp::LXDVirtualMachine::start()
     update_state();
 }
 
-void mp::LXDVirtualMachine::shutdown()
+void mp::LXDVirtualMachine::shutdown(bool force)
 {
-    std::unique_lock<decltype(state_mutex)> lock{state_mutex};
-    auto present_state = current_state();
+    std::unique_lock<std::mutex> lock{state_mutex};
 
-    if (present_state == State::stopped)
+    const auto present_state = current_state();
+
+    try
     {
-        mpl::log(mpl::Level::debug, vm_name, "Ignoring stop request since instance is already stopped");
-        return;
+        check_state_for_shutdown(force);
     }
-
-    if (present_state == State::suspended)
+    catch (const VMStateIdempotentException& e)
     {
-        mpl::log(mpl::Level::info, vm_name, fmt::format("Ignoring shutdown issued while suspended"));
+        mpl::log(mpl::Level::info, vm_name, e.what());
         return;
     }
 
-    request_state("stop");
+    request_state("stop", {{"force", force}});
 
-    state = State::stopped;
+    state = State::off;
 
     if (present_state == State::starting)
     {
@@ -407,9 +407,13 @@ const QUrl mp::LXDVirtualMachine::network_leases_url()
     return base_url.toString() + "/networks/" + bridge_name + "/leases";
 }
 
-void mp::LXDVirtualMachine::request_state(const QString& new_state)
+void mp::LXDVirtualMachine::request_state(const QString& new_state, const QJsonObject& args)
 {
-    const QJsonObject state_json{{"action", new_state}};
+    QJsonObject state_json{{"action", new_state}};
+    for (auto it = args.constBegin(); it != args.constEnd(); it++)
+    {
+        state_json.insert(it.key(), it.value());
+    }
 
     auto state_task = lxd_request(manager, "PUT", state_url(), state_json, 5000);
 

src/platform/backends/lxd/lxd_virtual_machine.h

@@ -41,8 +41,9 @@ class LXDVirtualMachine : public BaseVirtualMachine
                       const SSHKeyProvider& key_provider,
                       const Path& instance_dir);
     ~LXDVirtualMachine() override;
+
     void start() override;
-    void shutdown() override;
+    void shutdown(bool force = false) override;
     void suspend() override;
     State current_state() override;
     int ssh_port() override;
@@ -85,7 +86,7 @@ class LXDVirtualMachine : public BaseVirtualMachine
     const QUrl url() const;
     const QUrl state_url();
     const QUrl network_leases_url();
-    void request_state(const QString& new_state);
+    void request_state(const QString& new_state, const QJsonObject& args = {});
 };
 } // namespace multipass
 #endif // MULTIPASS_LXD_VIRTUAL_MACHINE_H