[PATCH-SERIES container/qemu-server 0/3] pct/qm: unlock: log that operation happened to syslog

[PATCH-SERIES container/qemu-server 0/3] pct/qm: unlock: log that operation happened to syslog

[Fiona Ebner]

It can be helpful to see when a guest was manually unlocked to
analyze certain issues when looking at the syslog.

container:

Fiona Ebner (1):
  pct: unlock: log that operation happened to syslog

 src/PVE/CLI/pct.pm | 2 ++
 1 file changed, 2 insertions(+)


qemu-server:

Fiona Ebner (2):
  qm: unlock: log that operation happened to syslog
  qm: unlock: add reminder to switch to remove_lock() helper for a major
    release

 src/PVE/CLI/qm.pm | 5 +++++
 1 file changed, 5 insertions(+)


Summary over all repositories:
  2 files changed, 7 insertions(+), 0 deletions(-)

-- 
Generated by git-murpp 0.5.0

[PATCH container 1/3] pct: unlock: log that operation happened to syslog

[Fiona Ebner]

It can be helpful to see when a container was manually unlocked to
analyze certain issues when looking at the syslog.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/CLI/pct.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm
index e2f3c90..9ae4ce4 100755
--- a/src/PVE/CLI/pct.pm
+++ b/src/PVE/CLI/pct.pm
@@ -112,6 +112,8 @@ __PACKAGE__->register_method({
 
         PVE::LXC::Config->remove_lock($vmid);
 
+        syslog('info', "executed 'pct unlock $vmid'");
+
         return undef;
     },
 });
-- 
2.47.3

[PATCH qemu-server 2/3] qm: unlock: log that operation happened to syslog

[Fiona Ebner]

It can be helpful to see when a VM was manually unlocked to analyze
certain issues when looking at the syslog.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/CLI/qm.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/PVE/CLI/qm.pm b/src/PVE/CLI/qm.pm
index bfa0d1d5..e64449d7 100755
--- a/src/PVE/CLI/qm.pm
+++ b/src/PVE/CLI/qm.pm
@@ -401,6 +401,8 @@ __PACKAGE__->register_method({
             },
         );
 
+        syslog('info', "executed 'qm unlock $vmid'");
+
         return;
     },
 });
-- 
2.47.3

[PATCH qemu-server 3/3] qm: unlock: add reminder to switch to remove_lock() helper for a major release

[Fiona Ebner]

For containers, the remove_lock() helper from the AbstractConfig
module is already used. That method dies if no lock was found, while
the current implementation for 'qm unlock' returns success. To avoid
tripping up tooling, delay aligning the behavior between 'qm' and
'pct' to a future major release.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/CLI/qm.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/PVE/CLI/qm.pm b/src/PVE/CLI/qm.pm
index e64449d7..bc8a086c 100755
--- a/src/PVE/CLI/qm.pm
+++ b/src/PVE/CLI/qm.pm
@@ -391,6 +391,9 @@ __PACKAGE__->register_method({
 
         my $vmid = $param->{vmid};
 
+        # FIXME: MAJOR VERSION: switch to PVE::QemuConfig->remove_lock() to align behavior with
+        # containers. Note that remove_lock() will die when no lock is found, so that is a change in
+        # behavior.
         PVE::QemuConfig->lock_config(
             $vmid,
             sub {
-- 
2.47.3