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 1E7C366F0D; Mon, 11 Jan 2021 12:14:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F01F71922C; Mon, 11 Jan 2021 12:14:45 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id 41D9B19123; Mon, 11 Jan 2021 12:14:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0E8B743FF3; Mon, 11 Jan 2021 12:14:41 +0100 (CET) From: Stefan Reiter To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Mon, 11 Jan 2021 12:14:07 +0100 Message-Id: <20210111111409.32385-10-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210111111409.32385-1-s.reiter@proxmox.com> References: <20210111111409.32385-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.040 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 qemu-server 09/11] extract register_qmeventd_handle to QemuServer.pm 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: Mon, 11 Jan 2021 11:14:47 -0000 ...to be reused by live-restore. Signed-off-by: Stefan Reiter --- PVE/QemuServer.pm | 28 ++++++++++++++++++++++++++++ PVE/VZDump/QemuServer.pm | 32 ++------------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 4c34595..aa88a9d 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7432,6 +7432,34 @@ sub device_bootorder { return $bootorder; } +sub register_qmeventd_handle { + my ($vmid) = @_; + + my $fh; + my $peer = "/var/run/qmeventd.sock"; + my $count = 0; + + for (;;) { + $count++; + $fh = IO::Socket::UNIX->new(Peer => $peer, Blocking => 0, Timeout => 1); + last if $fh; + if ($! != EINTR && $! != EAGAIN) { + die "unable to connect to qmeventd socket (vmid: $vmid) - $!\n"; + } + if ($count > 4) { + die "unable to connect to qmeventd socket (vmid: $vmid) - timeout " + . "after $count retries\n"; + } + usleep(25000); + } + + # send handshake to mark VM as backing up + print $fh to_json({vzdump => {vmid => "$vmid"}}); + + # return handle to be closed later when inhibit is no longer required + return $fh; +} + # bash completion helper sub complete_backup_archives { diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index b322701..d689e3d 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -512,7 +512,7 @@ sub archive_pbs { my $devlist = _get_task_devlist($task); $self->enforce_vm_running_for_backup($vmid); - $self->register_qmeventd_handle($vmid); + $self->{qmeventd_fh} = PVE::QemuServer::register_qmeventd_handle($vmid); my $backup_job_uuid; eval { @@ -681,7 +681,7 @@ sub archive_vma { my $devlist = _get_task_devlist($task); $self->enforce_vm_running_for_backup($vmid); - $self->register_qmeventd_handle($vmid); + $self->{qmeventd_fh} = PVE::QemuServer::register_qmeventd_handle($vmid); my $cpid; my $backup_job_uuid; @@ -840,34 +840,6 @@ sub enforce_vm_running_for_backup { die $@ if $@; } -sub register_qmeventd_handle { - my ($self, $vmid) = @_; - - my $fh; - my $peer = "/var/run/qmeventd.sock"; - my $count = 0; - - for (;;) { - $count++; - $fh = IO::Socket::UNIX->new(Peer => $peer, Blocking => 0, Timeout => 1); - last if $fh; - if ($! != EINTR && $! != EAGAIN) { - $self->log("warn", "unable to connect to qmeventd socket (vmid: $vmid) - $!\n"); - return; - } - if ($count > 4) { - $self->log("warn", "unable to connect to qmeventd socket (vmid: $vmid)" - . " - timeout after $count retries\n"); - return; - } - usleep(25000); - } - - # send handshake to mark VM as backing up - print $fh to_json({vzdump => {vmid => "$vmid"}}); - $self->{qmeventd_fh} = $fh; -} - # resume VM againe once we got in a clear state (stop mode backup of running VM) sub resume_vm_after_job_start { my ($self, $task, $vmid) = @_; -- 2.20.1