Add `--force` argument to the `stop` command #1946

luis4a0 · 2021-01-28T19:51:22Z

Add a new parameter to force the shutdown instances (i.e., power down them).

Fixes #1909, Fixes #2492

townsend2010 · 2021-01-28T20:10:31Z

I know this is still in draft, but I always envisioned just adding a bool force flag to shutdown() and stop() (it also can be argued that either shutdown() or stop() can be dropped altogether, but that's for a different day). That way, you are not having to duplicate any special handling or logic that you are currently doing if some of the force_shutdown() implementations.

codecov · 2021-01-28T20:13:13Z

Codecov Report

Attention: Patch coverage is 91.79104% with 11 lines in your changes are missing coverage. Please review.

Project coverage is 88.90%. Comparing base (2a16af2) to head (ece9a6c).

Files	Patch %	Lines
src/daemon/daemon.cpp	8.33%	11 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1946      +/-   ##
==========================================
+ Coverage   88.82%   88.90%   +0.08%     
==========================================
  Files         254      255       +1     
  Lines       14115    14164      +49     
==========================================
+ Hits        12537    12593      +56     
+ Misses       1578     1571       -7

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

luis4a0 · 2021-01-29T13:16:35Z

Hey @townsend2010, thanks a lot for your comment! What you propose makes complete sense, I'll finish testing if the commands I used indeed work to turn off VM's and then rework the code.

sharder996 · 2022-08-19T15:58:23Z

Added a few small changes; mostly refactoring with the current state of main and some wiring that got missed.

Fixes #2492

and

#2693 can be closed as its no longer needed

ricab · 2023-01-30T18:32:04Z

Once this is in, I think we should also change delete such that running instances get force-stopped if a regular stop is not enough. I don't think it makes a lot of sense for deleted instances to keep running...

ricab

Hey @townsend2010, thanks for the PR! Not a proper review, but I was looking in order to base my work on top, so leaving a couple of comments.

src/platform/backends/qemu/qemu_virtual_machine.cpp

src/client/cli/cmd/stop.cpp

src/daemon/daemon.cpp

This will make it explicit that the user wants to force stop an instance.

Change "Forced" to "Forcing" Co-authored-by: Ricardo Abreu <6698114+ricab@users.noreply.github.com> Signed-off-by: Chris Townsend <christopher.townsend@canonical.com>

If the instance is suspended when a force shutdown is issued, then delete the suspend image.

This will account for the case if an instance is starting and getting stuck when resuming from a suspend image.

This is fit in with the style used in other implementations.

luis4a0 force-pushed the add-force-stop branch from 1f21eac to 3a7b09d Compare January 29, 2021 15:15

Base automatically changed from master to main March 3, 2021 13:41

luis4a0 force-pushed the add-force-stop branch from 3a7b09d to fecc2be Compare March 3, 2021 17:07

luis4a0 force-pushed the add-force-stop branch 2 times, most recently from 36d6cec to a4f04ff Compare May 26, 2021 14:30

luis4a0 force-pushed the add-force-stop branch from a4f04ff to b572ebe Compare May 28, 2021 18:59

luis4a0 force-pushed the add-force-stop branch from b572ebe to b10bc1a Compare July 1, 2022 15:11

luis4a0 force-pushed the add-force-stop branch from b10bc1a to 69ebeca Compare August 16, 2022 14:31

sharder996 marked this pull request as ready for review August 19, 2022 15:56

sharder996 mentioned this pull request Jan 30, 2023

delete should force-stop running instances when a regular stop isn't enough #2906

Open

ricab mentioned this pull request Jan 12, 2024

Unable to stop/shutdown primary instance #3370

Closed

townsend2010 force-pushed the add-force-stop branch from 65903a3 to 708bd3a Compare March 21, 2024 20:16

townsend2010 force-pushed the add-force-stop branch 7 times, most recently from 41f273e to b1a5b88 Compare April 5, 2024 20:27

ricab reviewed Apr 11, 2024

View reviewed changes

src/platform/backends/qemu/qemu_virtual_machine.cpp Outdated Show resolved Hide resolved

src/client/cli/cmd/stop.cpp Outdated Show resolved Hide resolved

townsend2010 force-pushed the add-force-stop branch from 4be3838 to 8ac8d93 Compare April 12, 2024 18:01

ricab reviewed Apr 15, 2024

View reviewed changes

src/daemon/daemon.cpp Show resolved Hide resolved

townsend2010 force-pushed the add-force-stop branch from 8ac8d93 to 45dcacd Compare April 15, 2024 20:22

townsend2010 linked an issue Apr 24, 2024 that may be closed by this pull request

[daemon] need to kill misbehaving instances on stop #1167

Open

[rpc] Add option to force stopping an instance.

1b3be57

luis4a0 and others added 20 commits May 2, 2024 14:28

[libvirt] Implement forced stop.

037405d

refactor with main

ce2cca9

[cli/stop] Make force a long option only

b65c2d2

This will make it explicit that the user wants to force stop an instance.

[virtual_machine] Make force shutdown bool const

65f9c7c

[tests] Fix QEMU test for setting bool for shutdown()

1a5dda7

[tests/cli] Test the --force option for stop command

2f12d24

[tests/qemu] Add tests for the force shutdown handling

5ff8b32

Update src/platform/backends/qemu/qemu_virtual_machine.cpp

4922213

Change "Forced" to "Forcing" Co-authored-by: Ricardo Abreu <6698114+ricab@users.noreply.github.com> Signed-off-by: Chris Townsend <christopher.townsend@canonical.com>

[tests] Fix tests due to change in log string

99d323c

[cli/stop] Be more specific with force stop help

0ffb919

[utils/qemu_img] Add general function for deleting a snapshot image

7a77407

[backend/qemu] Delete suspend image on force shutdown

5a139a3

If the instance is suspended when a force shutdown is issued, then delete the suspend image.

[tests] Add qemu test for deleting suspend on force shutdown

16584c4

[qemu] Check if there is a suspend image in force shutdown

f41581c

This will account for the case if an instance is starting and getting stuck when resuming from a suspend image.

[backend/qemu] Redo the shutdown logic

d8df3bd

[qemu] Redo some logic in how force shutdown is handled

f3598b4

[vm] Don't enclose BaseVirtualMachine impl in multipass scope

172b2b7

This is fit in with the style used in other implementations.

[exceptions] Add new exception types for VirtualMachine states

7091558

[virtual_machine] Add method in base to check for states when stopping

98e89b9

[backend/qemu] Add base VM state check handling for shutdown

9fb31c5

townsend2010 force-pushed the add-force-stop branch from 45dcacd to 1861b89 Compare May 2, 2024 20:50

[tests] Fix/modify QEMU backend tests

36b6601

townsend2010 force-pushed the add-force-stop branch from 1861b89 to 36b6601 Compare May 5, 2024 13:56

townsend2010 added 6 commits May 5, 2024 11:22

[qemu] Redo locking logic a bit to be more safe

1cdf18d

[libvirt] Redo shutdown logic based on new base method

98e2578

[tests] Fix/modify libvirt tests

e2d7037

[tests] Add tests for libvirt shutdown

a31c6ab

[lxd] Add call to base class for checkoing shutdown states

d053755

[tests] Adapt LXD backend tests for changes in shutdown

ece9a6c

townsend2010 force-pushed the add-force-stop branch from 7914638 to ece9a6c Compare May 6, 2024 15:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add `--force` argument to the `stop` command #1946

Add `--force` argument to the `stop` command #1946

luis4a0 commented Jan 28, 2021 •

edited by townsend2010

townsend2010 commented Jan 28, 2021

codecov bot commented Jan 28, 2021 •

edited

luis4a0 commented Jan 29, 2021

sharder996 commented Aug 19, 2022

ricab commented Jan 30, 2023 •

edited

ricab left a comment

Add --force argument to the stop command #1946

Are you sure you want to change the base?

Add --force argument to the stop command #1946

Conversation

luis4a0 commented Jan 28, 2021 • edited by townsend2010

townsend2010 commented Jan 28, 2021

codecov bot commented Jan 28, 2021 • edited

Codecov Report

luis4a0 commented Jan 29, 2021

sharder996 commented Aug 19, 2022

ricab commented Jan 30, 2023 • edited

ricab left a comment

Choose a reason for hiding this comment

Add `--force` argument to the `stop` command #1946

Add `--force` argument to the `stop` command #1946

luis4a0 commented Jan 28, 2021 •

edited by townsend2010

codecov bot commented Jan 28, 2021 •

edited

ricab commented Jan 30, 2023 •

edited