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 AAD1D90890 for ; Thu, 22 Sep 2022 16:13:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 948551A14A for ; Thu, 22 Sep 2022 16:13:25 +0200 (CEST) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Thu, 22 Sep 2022 16:13:22 +0200 (CEST) Received: by lana.proxmox.com (Postfix, from userid 10043) id 575912C21F6; Thu, 22 Sep 2022 16:13:22 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 22 Sep 2022 16:13:21 +0200 Message-Id: <20220922141321.1510795-5-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220922141321.1510795-1-s.hanreich@proxmox.com> References: <20220922141321.1510795-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.153 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qm.pm, qemumigratemock.pm, qemumigrate.pm] Subject: [pve-devel] [PATCH qemu-server 1/1] Add VM hooks for pre/post-migrate on target/source 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: Thu, 22 Sep 2022 14:13:25 -0000 Signed-off-by: Stefan Hanreich --- PVE/CLI/qm.pm | 50 +++++++++++++++++++++++++++ PVE/QemuMigrate.pm | 23 ++++++++++++ test/MigrationTest/QemuMigrateMock.pm | 4 +++ 3 files changed, 77 insertions(+) diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm index 6a2e161..4161e6e 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -838,6 +838,54 @@ __PACKAGE__->register_method({ return; }}); +__PACKAGE__->register_method ({ + name => 'pre_migrate', + path => 'pre_migrate', + method => 'POST', + description => "Run pre-migrate hook for VM - do not use manually.", + parameters => { + additionalProperties => 0, + properties => { + vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), + 'source-node' => get_standard_option('pve-node'), + }, + }, + returns => { type => 'null'}, + code => sub { + my ($param) = @_; + + my $vmid = $param->{vmid}; + my $source_node = $param->{'source-node'}; + my $conf = PVE::QemuConfig->load_config($vmid, $source_node); + + PVE::GuestHelpers::exec_hookscript($conf, $vmid, "pre-migrate-target", 1); + + return; + }}); + +__PACKAGE__->register_method ({ + name => 'post_migrate', + path => 'post_migrate', + method => 'POST', + description => "Run post-migrate hook for VM - do not use manually.", + parameters => { + additionalProperties => 0, + properties => { + vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), + }, + }, + returns => { type => 'null'}, + code => sub { + my ($param) = @_; + + my $vmid = $param->{vmid}; + my $conf = PVE::QemuConfig->load_config($vmid); + + PVE::GuestHelpers::exec_hookscript($conf, $vmid, "post-migrate-target"); + + return; + }}); + my $print_agent_result = sub { my ($data) = @_; @@ -988,6 +1036,8 @@ our $cmddef = { }], }, + 'pre-migrate' => [ __PACKAGE__, 'pre_migrate', ['vmid', 'source-node']], + 'post-migrate' => [ __PACKAGE__, 'post_migrate', ['vmid']], }; 1; diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index d52dc8d..b113dec 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -1284,4 +1284,27 @@ sub round_powerof2 { return 2 << int(log($_[0]-1)/log(2)); } +sub pre_migration_hooks { + my ($self, $vmid) = @_; + + PVE::GuestHelpers::exec_hookscript($self->{vmconf}, $vmid, 'pre-migrate-source', 1); + + my $node = PVE::INotify::nodename(); + my $cmd = [ @{$self->{rem_ssh}}, "qm", "pre-migrate", $vmid, $node ]; + + eval { $self->cmd($cmd); }; + die "$@\n" if $@; +} + +sub post_migration_hooks { + my ($self, $vmid) = @_; + + PVE::GuestHelpers::exec_hookscript($self->{vmconf}, $vmid, 'post-migrate-source'); + + my $cmd = [ @{$self->{rem_ssh}}, "qm", "post-migrate", $vmid ]; + + eval { $self->cmd($cmd); }; + die "$@\n" if $@; +} + 1; diff --git a/test/MigrationTest/QemuMigrateMock.pm b/test/MigrationTest/QemuMigrateMock.pm index f2c0281..461b390 100644 --- a/test/MigrationTest/QemuMigrateMock.pm +++ b/test/MigrationTest/QemuMigrateMock.pm @@ -298,6 +298,10 @@ $MigrationTest::Shared::tools_module->mock( return 0; } elsif ($cmd eq 'stop') { return 0; + } elsif ($cmd eq 'pre-migrate') { + return 0; + } elsif ($cmd eq 'post-migrate') { + return 0; } die "run_command (mocked) ssh qm command - implement me: ${cmd_msg}"; } elsif ($cmd eq 'pvesm') { -- 2.30.2