From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A29F9984BA for ; Fri, 14 Apr 2023 14:39:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 82A4425DFD for ; Fri, 14 Apr 2023 14:38:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 14 Apr 2023 14:38:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9BEAB41EE1 for ; Fri, 14 Apr 2023 14:38:33 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 14 Apr 2023 14:38:28 +0200 Message-Id: <20230414123830.60720-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230414123830.60720-1-f.ebner@proxmox.com> References: <20230414123830.60720-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH ha-manager 2/4] sim: hardware: commands: make it possible to add already running service X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2023 12:39:04 -0000 Will be used in a test for balance on start, where it should make a difference if the service is running or not. Signed-off-by: Fiona Ebner --- src/PVE/HA/Sim/Hardware.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm index 5b023ef..0018208 100644 --- a/src/PVE/HA/Sim/Hardware.pm +++ b/src/PVE/HA/Sim/Hardware.pm @@ -171,7 +171,7 @@ sub set_service_state { } sub add_service { - my ($self, $sid, $opts) = @_; + my ($self, $sid, $opts, $running) = @_; my $conf = $self->read_service_config(); die "resource ID '$sid' already defined\n" if $conf->{$sid}; @@ -181,6 +181,10 @@ sub add_service { $self->write_service_config($conf); + my $ss = $self->read_service_status($opts->{node}); + $ss->{$sid} = $running; + $self->write_service_status($opts->{node}, $ss); + return $conf; } @@ -563,7 +567,7 @@ sub get_cfs_state { # service # service stop # service lock/unlock [lockname] -# service add [] +# service add [] [] # service delete sub sim_hardware_cmd { my ($self, $cmdstr, $logid) = @_; @@ -691,8 +695,11 @@ sub sim_hardware_cmd { $self->queue_crm_commands_nolock("$action $sid $param"); } elsif ($action eq 'add') { - - $self->add_service($sid, {state => $params[1] || 'started', node => $param}); + $self->add_service( + $sid, + {state => $params[1] || 'started', node => $param}, + $params[2] || 0, + ); } elsif ($action eq 'delete') { -- 2.30.2