qui-domains: adjust shutdown failure actions#311
Conversation
95f7e52 to
d8fd3f6
Compare
|
@ben-grande fixed both points and pushed a signed commit. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #311 +/- ##
==========================================
+ Coverage 92.62% 92.70% +0.07%
==========================================
Files 66 66
Lines 13672 13618 -54
==========================================
- Hits 12664 12624 -40
+ Misses 1008 994 -14 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
d8fd3f6 to
3e0a49f
Compare
| "domain-start", | ||
| "domain-pre-start", | ||
| "domain-shutdown", | ||
| "domain-pre-shutdown", |
There was a problem hiding this comment.
The domain-shutdown and domain-pre-shutdown can be triggered if:
vm.shutdown()->domain-pre-shutdown->domain-shutdown->domain-shutdown-failed- Retry the
vm.shutdown-> ...
| ).format(self.vm.name, str(ex)), | ||
| ) | ||
| return | ||
| if isinstance(ex, exc.QubesVMInUseError): |
There was a problem hiding this comment.
Can you please make the restart class use things from the shutdown class to avoid code duplication?
|
Also, on |
3e0a49f to
e16a134
Compare
|
Restart now reuses the shutdown flow, and retry failures show the same dialog again. |
|
Please see CI failures. Since you were accepted for GSoC, are you running Qubes to test your changes? |
e16a134 to
83f6a50
Compare
OpenQA test summaryComplete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2026052103-devel&flavor=pull-requests Test run included the following:
New failures, excluding unstableCompared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2026050504-devel&flavor=update
Failed tests32 failures
Fixed failuresCompared to: https://openqa.qubes-os.org/tests/176874#dependencies 28 fixed
Unstable testsDetails
Performance TestsPerformance degradation:25 performance degradations
Remaining performance tests:86 tests
|
| ).format(self.vm.name, str(ex)), | ||
| ) | ||
| return | ||
| if isinstance(ex, exc.QubesVMInUseError): |
There was a problem hiding this comment.
I cannot point to the line you didn't change on this PR, but if self.force above is wrong, it will skip checking the appropriate exception in case force is used. I think it's best to remove that block. Same place somewhere else in RestartItem.
| ).format(self.vm.name, str(ex)), | ||
| ) | ||
| return | ||
| dialog = Gtk.MessageDialog( |
There was a problem hiding this comment.
Same thing on the block above. The if self.force will skip checking the appropriate exception.
|
I am cherry picking your commit and will coauthor with some changes. |
|
Closing this PR as it will be integrated in #312. |
|
ok I will follow with 312 |
4 participants
Follow-up for #308.
This updates the restart path and the failed-shutdown submenu so the available actions match the shutdown dialog: retry/normal shutdown, force shutdown, or kill as appropriate.