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 84.93151% with 22 lines in your changes missing coverage. Please review.

Project coverage is 88.89%. Comparing base (e923e2d) to head (5173700).

Files	Patch %	Lines
src/daemon/daemon.cpp	5.00%	19 Missing ⚠️
...rc/platform/backends/qemu/qemu_virtual_machine.cpp	88.88%	3 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1946      +/-   ##
==========================================
+ Coverage   88.83%   88.89%   +0.05%     
==========================================
  Files         253      254       +1     
  Lines       14170    14222      +52     
==========================================
+ Hits        12588    12642      +54     
+ Misses       1582     1580       -2

☔ 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

…o using condition variable wait where is no other thread notifies him. This fix the non-responding bug on qemu force stop.

…nce the state variable is the only one needs to be protected, also convert unique_lock to scoped_lock because manual unlock/ lock is no longer needed.

…iable during the previous refactor commit.

…eck_state_for_shutdown function since the state variable is the only one needs to be protected, also convert unique_lock to scoped_lock because manual unlock/ lock is no longer needed."

…e use vm_process->wait_for_finished to sync

…n boolean of wait_for_finished and log correspondingly.

…echnical author.

…nst reference.

…ould not finish.

Co-authored-by: Ricardo Abreu <6698114+ricab@users.noreply.github.com> Signed-off-by: George Liao <georgeliaojia@gmail.com>

andrei-toterman

Alright, everything seems to be working. Thanks, @georgeliao!

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

georgeliao · 2024-07-04T14:38:53Z

@ricab we might need to manually merge again.

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

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

Closed

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

Chris Townsend and others added 20 commits July 3, 2024 19:25

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

4e80935

[tests] Adapt LXD backend tests for changes in shutdown

46c39a0

[daemon] using lambda as opposed to std::bind to adapt functor.

9ceab96

[qemu vm] use waiting for asynchronous process to finish as opposed t…

bcd0351

…o using condition variable wait where is no other thread notifies him. This fix the non-responding bug on qemu force stop.

[qemu vm] move the lock into the check_state_for_shutdown function si…

7401440

…nce the state variable is the only one needs to be protected, also convert unique_lock to scoped_lock because manual unlock/ lock is no longer needed.

[daemon] small renaming for better clarity.

c691e77

[qemu] remove the state check and added the missing lock on state var…

0c867b3

…iable during the previous refactor commit.

[virtual machine] reverted back the commit "move the lock into the ch…

73430f5

…eck_state_for_shutdown function since the state variable is the only one needs to be protected, also convert unique_lock to scoped_lock because manual unlock/ lock is no longer needed."

[qemu vm] removed unnecessary condition variable notification since w…

bc50a1e

…e use vm_process->wait_for_finished to sync

[lxd vm] small polishing of LXDVirtualMachine::shutdown code.

072842c

[qemu vm] added if empty check to pass unit tests and check the retur…

58ad18f

…n boolean of wait_for_finished and log correspondingly.

[cmd] update the stop command description.

7b24055

[cmd] refined the force option help text based on the advice of the t…

fa3dfca

…echnical author.

[lxd] address the review comment, change the function parameter to co…

c5b1aa7

…nst reference.

[qemu] refine the timeout values of wait_for_finished calls.

c9b3e3c

[qemu] change log to throw exception in the case of killing process c…

2aab1f9

…ould not finish.

[virtual machine] change the const bool to bool.

d9fde4f

Update src/platform/backends/libvirt/libvirt_virtual_machine.cpp

b2c5eea

Co-authored-by: Ricardo Abreu <6698114+ricab@users.noreply.github.com> Signed-off-by: George Liao <georgeliaojia@gmail.com>

[qemu] refined the qemu process killing can not finish error message.

985dff2

[daemon] changed adapter from std::bind to lambda.

5173700

georgeliao force-pushed the add-force-stop branch from 31757e4 to 5173700 Compare July 3, 2024 17:26

andrei-toterman approved these changes Jul 4, 2024

View reviewed changes

andrei-toterman added this pull request to the merge queue Jul 4, 2024

github-merge-queue bot pushed a commit that referenced this pull request Jul 4, 2024

Merge pull request #1946 from canonical/add-force-stop

d5471ad

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

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 4, 2024

ricab merged commit 9a9bcf8 into main Jul 4, 2024
13 of 14 checks passed

ricab deleted the add-force-stop branch July 4, 2024 19:49

ricab added a commit that referenced this pull request Jul 4, 2024

Merge pull request #1946 from canonical/add-force-stop

f3aa918

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

ricab added a commit that referenced this pull request Jul 6, 2024

Merge pull request #1946 from canonical/add-force-stop

92bf2a0

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

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

Loading

townsend2010 commented Jan 28, 2021

codecov bot commented Jan 28, 2021 •

edited

Loading

luis4a0 commented Jan 29, 2021

sharder996 commented Aug 19, 2022

ricab commented Jan 30, 2023 •

edited

Loading

ricab left a comment

andrei-toterman left a comment

georgeliao commented Jul 4, 2024

Add --force argument to the stop command #1946

Add --force argument to the stop command #1946

Conversation

luis4a0 commented Jan 28, 2021 • edited by townsend2010 Loading

townsend2010 commented Jan 28, 2021

codecov bot commented Jan 28, 2021 • edited Loading

Codecov Report

luis4a0 commented Jan 29, 2021

sharder996 commented Aug 19, 2022

ricab commented Jan 30, 2023 • edited Loading

ricab left a comment

Choose a reason for hiding this comment

andrei-toterman left a comment

Choose a reason for hiding this comment

georgeliao commented Jul 4, 2024

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

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

luis4a0 commented Jan 28, 2021 •

edited by townsend2010

Loading

codecov bot commented Jan 28, 2021 •

edited

Loading

ricab commented Jan 30, 2023 •

edited

Loading