From f6395eb69cc19bdb0ea6000f653609cf0688cc87 Mon Sep 17 00:00:00 2001 From: Maximiliano Sandoval Date: Mon, 9 Oct 2023 11:35:58 +0200 Subject: [PATCH 1/1] hw-address: check if source file changed so cache needs update We cache the hash of this file, it makes sense to first check if the file changed via `stat` and recompute the hash if needed. This mirrors similar changes done for PMG [0]. [0]: https://git.proxmox.com/?p=pmg-api.git;a=commit;h=16d2ff9f8e90db64114a66d78672f5a03f5ee990. Signed-off-by: Maximiliano Sandoval --- PVE/API2Tools.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm index a3d7ca84..618c13b3 100644 --- a/PVE/API2Tools.pm +++ b/PVE/API2Tools.pm @@ -17,14 +17,22 @@ use PVE::SafeSyslog; use PVE::Storage::Plugin; my $hwaddress; +my $hwaddress_st = {}; sub get_hwaddress { + my $fn = '/etc/ssh/ssh_host_rsa_key.pub'; + my $st = stat($fn); - return $hwaddress if defined ($hwaddress); + if (defined($hwaddress) + && $hwaddress_st->{mtime} == $st->mtime + && $hwaddress_st->{ino} == $st->ino + && $hwaddress_st->{dev} == $st->dev) { + return $hwaddress; + } - my $fn = '/etc/ssh/ssh_host_rsa_key.pub'; my $sshkey = PVE::Tools::file_get_contents($fn); $hwaddress = uc(md5_hex($sshkey)); + $hwaddress_st->@{'mtime', 'ino', 'dev'} = ($st->mtime, $st->ino, $st->dev); return $hwaddress; } -- 2.39.2