public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH v3 container] fix: #3927: Error codes when starting/stopping
@ 2022-03-21  9:33 Daniel Tschlatscher
  2022-03-21  9:33 ` [pve-devel] [PATCH qemu-server] Starting a running VM does not return an error Daniel Tschlatscher
  2022-06-14 10:46 ` [pve-devel] [PATCH v3 container] fix: #3927: Error codes when starting/stopping Fabian Ebner
  0 siblings, 2 replies; 3+ messages in thread
From: Daniel Tschlatscher @ 2022-03-21  9:33 UTC (permalink / raw)
  To: pve-devel

 containers Stopping and starting a container that is already in the desired
 state will not return an error value on the CLI anymore. The same as VMs do,
 when they are stopped but not running.

Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
---
Changes from v2: return statements are now in the correct subroutines. 
 src/PVE/API2/LXC/Status.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/PVE/API2/LXC/Status.pm b/src/PVE/API2/LXC/Status.pm
index f7e3128..364db10 100644
--- a/src/PVE/API2/LXC/Status.pm
+++ b/src/PVE/API2/LXC/Status.pm
@@ -154,7 +154,7 @@ __PACKAGE__->register_method({
 	raise_param_exc({ skiplock => "Only root may use this option." })
 	    if $skiplock && $authuser ne 'root@pam';
 
-	die "CT $vmid already running\n" if PVE::LXC::check_running($vmid);
+	my $pid = PVE::LXC::check_running($vmid);
 
 	PVE::Cluster::check_cfs_quorum();
 
@@ -183,6 +183,8 @@ __PACKAGE__->register_method({
 		die "you can't start a CT if it's a template\n"
 		    if PVE::LXC::Config->is_template($conf);
 
+		return if $pid;			# Container is already running
+
 		if (!$skiplock && !PVE::LXC::Config->has_lock($conf, 'mounted')) {
 		    PVE::LXC::Config->check_lock($conf);
 		}
@@ -238,7 +240,7 @@ __PACKAGE__->register_method({
 	raise_param_exc({ skiplock => "Only root may use this option." })
 	    if $skiplock && $authuser ne 'root@pam';
 
-	die "CT $vmid not running\n" if !PVE::LXC::check_running($vmid);
+	my $pid = PVE::LXC::check_running($vmid);
 
 	if (PVE::HA::Config::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
 
@@ -260,6 +262,8 @@ __PACKAGE__->register_method({
 
 		syslog('info', "stopping CT $vmid: $upid\n");
 
+		return  if !$pid;
+
 		my $conf = PVE::LXC::Config->load_config($vmid);
 		if (!$skiplock && !PVE::LXC::Config->has_lock($conf, 'mounted')) {
 		    PVE::LXC::Config->check_lock($conf);
-- 
2.30.2





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-06-14 10:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-21  9:33 [pve-devel] [PATCH v3 container] fix: #3927: Error codes when starting/stopping Daniel Tschlatscher
2022-03-21  9:33 ` [pve-devel] [PATCH qemu-server] Starting a running VM does not return an error Daniel Tschlatscher
2022-06-14 10:46 ` [pve-devel] [PATCH v3 container] fix: #3927: Error codes when starting/stopping Fabian Ebner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal