From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ha-manager 2/4] sim: hardware: commands: make it possible to add already running service
Date: Fri, 14 Apr 2023 14:38:28 +0200 [thread overview]
Message-ID: <20230414123830.60720-3-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230414123830.60720-1-f.ebner@proxmox.com>
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 <f.ebner@proxmox.com>
---
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 <sid> <migrate|relocate> <target>
# service <sid> stop <timeout>
# service <sid> lock/unlock [lockname]
-# service <sid> add <node> [<request-state=started>]
+# service <sid> add <node> [<request-state=started>] [<running=0>]
# service <sid> 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
next prev parent reply other threads:[~2023-04-14 12:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 12:38 [pve-devel] [PATCH-SERIES ha-manager] avoid rebalance-on-start for newly added " Fiona Ebner
2023-04-14 12:38 ` [pve-devel] [PATCH ha-manager 1/4] sim: hardware: commands: fix documentation for add Fiona Ebner
2023-04-14 12:38 ` Fiona Ebner [this message]
2023-04-14 12:38 ` [pve-devel] [PATCH ha-manager 3/4] tools: add IGNORED return code Fiona Ebner
2023-04-14 12:38 ` [pve-devel] [PATCH ha-manager 4/4] lrm: do not migrate if service already running upon rebalance on start Fiona Ebner
2023-06-06 17:12 ` [pve-devel] applied: [PATCH-SERIES ha-manager] avoid rebalance-on-start for newly added already running service Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230414123830.60720-3-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox