[pve-devel] [PATCH i18n] Arabic translation update

2022-11-21 Thread Moayad Almalat 
Signed-off-by: Moayad Almalat 
---
 ar.po | 865 +++---
 1 file changed, 337 insertions(+), 528 deletions(-)

diff --git a/ar.po b/ar.po
index f29e58f..acf4fa3 100644
--- a/ar.po
+++ b/ar.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: pve-manager 31813246103b2582162f422dc34d8077eaee1e01\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: Thu Nov 17 19:57:32 2022\n"
-"PO-Revision-Date: 2022-05-02 10:12+0200\n"
+"PO-Revision-Date: 2022-11-18 11:08+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE \n"
 "Language: ar\n"
@@ -29,13 +29,12 @@ msgid "(No boot device selected)"
 msgstr "(لم يتم تحديد جهاز التمهيد)"
 
 #: proxmox-widget-toolkit/src/window/FileBrowser.js:327
-#, fuzzy
 msgid ".tar.zst"
-msgstr "تنزيل .tar.zst"
+msgstr ".tar.zst"
 
 #: proxmox-widget-toolkit/src/window/FileBrowser.js:321
 msgid ".zip"
-msgstr ""
+msgstr ".zip"
 
 #: pve-manager/www/manager6/lxc/MPEdit.js:247
 msgid "/some/path"
@@ -63,7 +62,7 @@ msgstr ""
 #: pve-manager/www/manager6/dc/AuthEditLDAP.js:285
 #: pve-manager/www/manager6/dc/SyncWindow.js:127
 msgid "ACL"
-msgstr ""
+msgstr "قائمة التحكم في الوصول"
 
 #: proxmox-backup/www/config/CertificateView.js:63
 msgid "ACME Accounts"
@@ -131,8 +130,7 @@ msgid ""
 "API server will be restarted to use new certificates, please reload web-"
 "interface!"
 msgstr ""
-"سيتم إعادة تشغيل سيرفر API لاستخدام شهادات جديدة، يرجى إعادة تحميل واجهة "
-"الويب!"
+"سيتم إعادة تشغيل سيرفر API لاستخدام شهادات جديدة، يرجى إعادة تحميل واجهة 
الويب!"
 
 #: proxmox-backup/www/window/TokenEdit.js:15
 msgid "API token"
@@ -171,8 +169,7 @@ msgstr "أسم الحساب"
 msgid "Account attribute name"
 msgstr "اسم خصائص الحساب"
 
-#: proxmox-widget-toolkit/src/panel/ACMEAccount.js:5
-#: pmg-gui/js/LDAPConfig.js:596
+#: proxmox-widget-toolkit/src/panel/ACMEAccount.js:5 
pmg-gui/js/LDAPConfig.js:596
 #: pve-manager/www/manager6/dc/ACMEClusterView.js:25
 msgid "Accounts"
 msgstr "حسابات"
@@ -209,9 +206,8 @@ msgstr "أجراءات"
 
 #: proxmox-widget-toolkit/src/form/NetworkSelector.js:111
 #: proxmox-widget-toolkit/src/node/NetworkView.js:328
-#: proxmox-widget-toolkit/src/node/ServiceView.js:194
-#: pmg-gui/js/RuleEditor.js:45 pmg-gui/js/RuleInfo.js:249
-#: pve-manager/www/manager6/form/BridgeSelector.js:28
+#: proxmox-widget-toolkit/src/node/ServiceView.js:194 
pmg-gui/js/RuleEditor.js:45
+#: pmg-gui/js/RuleInfo.js:249 
pve-manager/www/manager6/form/BridgeSelector.js:28
 #: pve-manager/www/manager6/storage/PBSEdit.js:217
 #: pve-manager/www/manager6/storage/PBSEdit.js:220
 #: pve-manager/www/manager6/storage/StatusView.js:31
@@ -293,9 +289,8 @@ msgid "Add EFI Disk"
 msgstr "إضافة قرص EFI"
 
 #: proxmox-backup/www/datastore/Content.js:1210
-#, fuzzy
 msgid "Add NS"
-msgstr "أضفه كـ"
+msgstr "أضفه NS"
 
 #: pmg-gui/js/PBSConfig.js:112
 msgid "Add Remote"
@@ -317,9 +312,8 @@ msgid "Add TPM"
 msgstr "أضف TPM"
 
 #: pve-manager/www/manager6/form/TagEdit.js:284
-#, fuzzy
 msgid "Add Tag"
-msgstr "أضف Tape"
+msgstr "إضافة علامة"
 
 #: proxmox-backup/www/tape/TapeInventory.js:187
 msgid "Add Tape"
@@ -413,8 +407,7 @@ msgstr "الاسم المستعار"
 
 #: proxmox-widget-toolkit/src/node/Tasks.js:336
 #: proxmox-widget-toolkit/src/node/Tasks.js:344
-#: pve-manager/www/manager6/Utils.js:369
-#: pve-manager/www/manager6/dc/Backup.js:30
+#: pve-manager/www/manager6/Utils.js:369 
pve-manager/www/manager6/dc/Backup.js:30
 #: pve-manager/www/manager6/dc/Backup.js:155
 #: pve-manager/www/manager6/dc/Backup.js:496
 #: pve-manager/www/manager6/dc/BackupJobDetail.js:178
@@ -433,9 +426,8 @@ msgid "All"
 msgstr "جميع"
 
 #: pve-manager/www/manager6/qemu/ProcessorEdit.js:202
-#, fuzzy
 msgid "All Cores"
-msgstr "أنوية"
+msgstr "جميع الأنوية"
 
 #: pve-manager/www/manager6/qemu/PCIEdit.js:151
 msgid "All Functions"
@@ -475,8 +467,7 @@ msgstr "تخصيص"
 msgid "Allocation Policy"
 msgstr "سياسة التخصيص"
 
-#: pmg-gui/js/SpamQuarantineOptions.js:66
-#: pmg-gui/js/VirusQuarantineOptions.js:19
+#: pmg-gui/js/SpamQuarantineOptions.js:66 
pmg-gui/js/VirusQuarantineOptions.js:19
 msgid "Allow HREFs"
 msgstr "السماح بـ HREFs"
 
@@ -490,10 +481,9 @@ msgstr "السماح ترحيل القرص المحلي"
 msgid "Allowed characters"
 msgstr "الأحرف المسموح بها"
 
-#: pve-manager/www/manager6/Utils.js:1934
-#: pve-manager/www/manager6/Utils.js:1936
+#: pve-manager/www/manager6/Utils.js:1934 
pve-manager/www/manager6/Utils.js:1936
 msgid "Alphabetical"
-msgstr ""
+msgstr "مرتب حسب الحروف الأبجدية"
 
 #: pmg-gui/js/PBSRemoteEdit.js:87
 #: pve-manager/www/manager6/dc/BackupJobDetail.js:214
@@ -617,14 +607,13 @@ msgid "Assigned to LVs"
 msgstr "معين إلى LVs"
 
 #: pve-manager/www/manager6/dc/ClusterEdit.js:301
-msgid ""
-"Assisted join: Paste encoded cluster join information and enter password."
+msgid "Assisted join: Paste encoded cluster join information and enter 
password."
 msgstr ""
 "الانضمام المساعد: لصق معلومات الانضمام إلى الكتلة المشفرة وإدخال كلمة المرور."
 
 #: pve-manager/www/manager6/qemu/HDEdit.js:309
 msgid "Async

[pve-devel] applied: [PATCH i18n] Arabic translation update

2022-11-21 Thread Thomas Lamprecht 
Am 18/11/2022 um 11:30 schrieb Moayad Almalat:
> Signed-off-by: Moayad Almalat 
> ---
>  ar.po | 865 +++---
>  1 file changed, 337 insertions(+), 528 deletions(-)
> 
>

applied, thanks!


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] pve-manager/www: API for external plugins?

2022-11-21 Thread Roland Kammerer 
Hi Thomas,

sorry for the long delay, and thanks for the pointers. In general we
would be willing to work on that if it does not take us too much effort.
We currently try to figure that out. A colleague of mine told me that
the js part should not be the problem, what I am not sure about is this
part:

On Fri, Nov 04, 2022 at 02:46:15PM +0100, Thomas Lamprecht wrote:
> If done somewhat nicely and safely we'd accept such a thing, the plugins
> would get an new method (e.g., api_schema) that returns a perl hash ref
> containing the properties including type, description and flags like if the
> setting is editable (after storage addition),

Okay, sure the plugins have to report their schema, I'm just not sure
about the "perl hash ref". How/where would/are the web part and the
plugins communicate? Would that be a real reference somewhere or would
the plugins just output a json dict that is somewhere parsed back?

> and a new API endpoint returning the schema's of all (external)
> plugins similar so that they can be shown in the add Drop down and
> used for creating the basic form.

Also obvious in general, I have the same problem of how and where do js
and perl code talk to each other.

Any hints and pointers in the right direction are welcome.

Best, rck

___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH docs 2/2] ha: crs: clarify that non-HA-managed services are currently not counted

2022-11-21 Thread Fiona Ebner 
Without explicitly stating this, it's rather easily missed.

Reported-by: Dominik Csapak 
Signed-off-by: Fiona Ebner 
---

As Thomas said off-list, it's better to start tracking this
information in HA manager too. For now, clarify the status-quo.

 ha-manager.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ha-manager.adoc b/ha-manager.adoc
index 2da6a99..ccbb7f8 100644
--- a/ha-manager.adoc
+++ b/ha-manager.adoc
@@ -959,6 +959,7 @@ Basic
 ~
 
 The number of active HA services on each node is used to choose a recovery 
node.
+Non-HA-managed services are currently not counted.
 
 Static
 ~~
@@ -966,7 +967,7 @@ Static
 IMPORTANT: The static mode is still a technology preview.
 
 Static usage information from HA services on each node is used to choose a
-recovery node.
+recovery node. Usage of non-HA-managed services is currently not considered.
 
 For this selection, each node in turn is considered as if the service was
 already running on it, using CPU and memory usage from the associated guest
-- 
2.30.2



___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH docs 1/2] ha: crs: fix typo

2022-11-21 Thread Fiona Ebner 
Signed-off-by: Fiona Ebner 
---
 ha-manager.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ha-manager.adoc b/ha-manager.adoc
index e69db1a..2da6a99 100644
--- a/ha-manager.adoc
+++ b/ha-manager.adoc
@@ -958,14 +958,14 @@ the future.
 Basic
 ~
 
-The number of active HA serivces on each node is used to choose a recovery 
node.
+The number of active HA services on each node is used to choose a recovery 
node.
 
 Static
 ~~
 
 IMPORTANT: The static mode is still a technology preview.
 
-Static usage information from HA serivces on each node is used to choose a
+Static usage information from HA services on each node is used to choose a
 recovery node.
 
 For this selection, each node in turn is considered as if the service was
-- 
2.30.2



___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH i18n] update german translation

2022-11-21 Thread Stefan Sterz 
Signed-off-by: Stefan Sterz 
---
 de.po | 185 +++---
 1 file changed, 72 insertions(+), 113 deletions(-)

diff --git a/de.po b/de.po
index ea6f50b..efd14c3 100644
--- a/de.po
+++ b/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: proxmox translations\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: Thu Nov 17 19:57:32 2022\n"
-"PO-Revision-Date: 2022-05-17 14:40+0200\n"
+"PO-Revision-Date: 2022-11-21 10:40+0100\n"
 "Last-Translator: Proxmox Support Team \n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -314,9 +314,8 @@ msgid "Add TPM"
 msgstr "TPM hinzufügen"
 
 #: pve-manager/www/manager6/form/TagEdit.js:284
-#, fuzzy
 msgid "Add Tag"
-msgstr "Band hinzufügen"
+msgstr "Tag hinzufügen"
 
 #: proxmox-backup/www/tape/TapeInventory.js:187
 msgid "Add Tape"
@@ -350,11 +349,11 @@ msgstr "Als Storage hinzufügen"
 
 #: pve-manager/www/manager6/ceph/FS.js:53
 msgid "Add the new CephFS to the cluster storage configuration."
-msgstr "CephFS als Storage im Cluster hinzufügen"
+msgstr "CephFS als Storage im Cluster hinzufügen."
 
 #: pve-manager/www/manager6/ceph/Pool.js:72
 msgid "Add the new pool to the cluster storage configuration."
-msgstr "RBD Pool als Storage im Cluster hinzufügen"
+msgstr "Neues RBD Pool als Storage im Cluster hinzufügen."
 
 #: pve-manager/www/manager6/ceph/CephInstallWizard.js:412
 msgid ""
@@ -432,9 +431,8 @@ msgid "All"
 msgstr "Alle"
 
 #: pve-manager/www/manager6/qemu/ProcessorEdit.js:202
-#, fuzzy
 msgid "All Cores"
-msgstr "Cores"
+msgstr "Alle Cores"
 
 #: pve-manager/www/manager6/qemu/PCIEdit.js:151
 msgid "All Functions"
@@ -492,7 +490,7 @@ msgstr "Erlaubte Zeichen"
 #: pve-manager/www/manager6/Utils.js:1934
 #: pve-manager/www/manager6/Utils.js:1936
 msgid "Alphabetical"
-msgstr ""
+msgstr "Alphabetisch"
 
 #: pmg-gui/js/PBSRemoteEdit.js:87
 #: pve-manager/www/manager6/dc/BackupJobDetail.js:214
@@ -624,7 +622,7 @@ msgstr ""
 
 #: pve-manager/www/manager6/qemu/HDEdit.js:309
 msgid "Async IO"
-msgstr ""
+msgstr "Asynchrone IO"
 
 #: pmg-gui/js/Utils.js:555
 msgid "Attach orig. Mail"
@@ -635,9 +633,8 @@ msgid "Attachment Quarantine"
 msgstr "Anhangs-Quarantäne"
 
 #: pmg-gui/js/AttachmentGrid.js:8
-#, fuzzy
 msgid "Attachments"
-msgstr "Keine Anhänge"
+msgstr "Anhänge"
 
 #: proxmox-widget-toolkit/src/window/DiskSmart.js:34
 msgid "Attribute"
@@ -753,9 +750,8 @@ msgid "Backend Driver"
 msgstr "Backendtreiber"
 
 #: pve-manager/www/manager6/form/TagColorGrid.js:316
-#, fuzzy
 msgid "Background"
-msgstr "Backup-Anzahl"
+msgstr "Hintergrund"
 
 #: proxmox-backup/www/window/DataStoreEdit.js:59
 msgid "Backing Path"
@@ -1064,9 +1060,8 @@ msgid "CPU"
 msgstr "CPU"
 
 #: pve-manager/www/manager6/qemu/ProcessorEdit.js:200
-#, fuzzy
 msgid "CPU Affinity"
-msgstr "CPU Limit"
+msgstr "CPU Affinität"
 
 #: pve-manager/www/manager6/lxc/ResourceEdit.js:79
 #: pve-manager/www/manager6/qemu/ProcessorEdit.js:191
@@ -1124,9 +1119,8 @@ msgid "Cache"
 msgstr "Cache"
 
 #: pve-manager/www/manager6/form/TagEdit.js:304
-#, fuzzy
 msgid "Cancel Edit"
-msgstr "Abbruch"
+msgstr "Bearbeitung abbrechen"
 
 #: pve-manager/www/manager6/storage/ImageView.js:52
 msgid "Cannot remove disk image."
@@ -1250,10 +1244,9 @@ msgid "Changers"
 msgstr "Wechsler"
 
 #: pve-manager/www/manager6/dc/OptionView.js:244
-#, fuzzy
 msgid "Changing the ID breaks existing WebAuthn TFA entries."
 msgstr ""
-"Das Ändern der Relying-Party kann bereits existierende WebAuthn-TFA-Einträge "
+"Das Ändern der ID kann bereits existierende WebAuthn-TFA-Einträge "
 "unbrauchbar machen."
 
 #: pmg-gui/js/TFAView.js:82 proxmox-backup/www/config/WebauthnView.js:131
@@ -1299,7 +1292,7 @@ msgstr ""
 
 #: pve-manager/www/manager6/Utils.js:1928
 msgid "Circle"
-msgstr ""
+msgstr "Kreis"
 
 #: pve-manager/www/manager6/Utils.js:1926
 msgid "Cirlce"
@@ -1457,7 +1450,7 @@ msgstr "Alle zusammenklappen"
 
 #: pve-manager/www/manager6/dc/OptionView.js:430
 msgid "Color Overrides"
-msgstr ""
+msgstr "Überschriebene Farben"
 
 #: pve-manager/www/manager6/ha/Fencing.js:31
 msgid "Command"
@@ -2008,7 +2001,6 @@ msgid "DNSBL Threshold"
 msgstr "DNSBL Schwellwert"
 
 #: proxmox-backup/www/config/PruneView.js:220
-#, fuzzy
 msgid "Daily"
 msgstr "Täglich"
 
@@ -2030,9 +2022,8 @@ msgid "Dashboard Storages"
 msgstr "Dashboard Storages"
 
 #: pve-manager/www/manager6/node/ZFS.js:119
-#, fuzzy
 msgid "Data Devs"
-msgstr "Datastores"
+msgstr "Daten Geräte"
 
 #: pmg-gui/js/ClamAVDatabase.js:10
 msgid "Database Mirror"
@@ -2173,7 +2164,7 @@ msgstr "Standard-Sync Optionen"
 msgid "Default sync options can be set by editing the realm."
 msgstr ""
 "Standard-Synchronisierungsoptionen können durch Bearbeiten der Domäne "
-"festgelegt werden"
+"festgelegt werden."
 
 #: pve-manager/www/manager6/dc/OptionView.js:150
 msgid "Defaults to origin"
@@ -2189,7 +2180,7 @@ msgstr "Standardmäßig das Wiederherstellungslimit des 
Ziel-Storage"
 
 #: pmg-gui/js/QueueAdministration.js:45
 msgid "Deferred Mail"
-msgstr "verzögerte

[pve-devel] [PATCH pve-network] network: add|del_fdb: fix learning check

2022-11-21 Thread Alexandre Derumier 
ovs port don't have sysfs path
"/sys/class/net/$iface/brport/learning"

We need to check if the value is undef too

Signed-off-by: Alexandre Derumier 
---
 src/PVE/Network.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm
index 26d8cb1..d1d2e5e 100644
--- a/src/PVE/Network.pm
+++ b/src/PVE/Network.pm
@@ -300,7 +300,7 @@ sub add_bridge_fdb {
 my ($iface, $mac) = @_;
 
 my $learning = 
PVE::Tools::file_read_firstline("/sys/class/net/$iface/brport/learning");
-return if $learning;
+return if !defined($learning) || $learning == 1;
 
 my ($vmid, $devid) = &$parse_tap_device_name($iface, 1);
 return if !defined($vmid);
@@ -320,7 +320,7 @@ sub del_bridge_fdb {
 my ($iface, $mac) = @_;
 
 my $learning = 
PVE::Tools::file_read_firstline("/sys/class/net/$iface/brport/learning");
-return if $learning;
+return if !defined($learning) || $learning == 1;
 
 my ($vmid, $devid) = &$parse_tap_device_name($iface, 1);
 return if !defined($vmid);
-- 
2.30.2


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH i18n] update german translation

2022-11-21 Thread Daniel Tschlatscher 
Looks good, 1 suggestions, 2 NITs inline:

On 11/21/22 10:49, Stefan Sterz wrote:
> Signed-off-by: Stefan Sterz 
> ---
>  de.po | 185 +++---
>  1 file changed, 72 insertions(+), 113 deletions(-)
> 
> diff --git a/de.po b/de.po
> index ea6f50b..efd14c3 100644
> --- a/de.po
> +++ b/de.po
> @@ -8,7 +8,7 @@ msgstr ""
>  "Project-Id-Version: proxmox translations\n"
>  "Report-Msgid-Bugs-To: \n"
>  "POT-Creation-Date: Thu Nov 17 19:57:32 2022\n"
> -"PO-Revision-Date: 2022-05-17 14:40+0200\n"
> +"PO-Revision-Date: 2022-11-21 10:40+0100\n"
>  "Last-Translator: Proxmox Support Team \n"
>  "Language-Team: German\n"
>  "Language: de\n"
> @@ -314,9 +314,8 @@ msgid "Add TPM"
>  msgstr "TPM hinzufügen"
>  
>  #: pve-manager/www/manager6/form/TagEdit.js:284
> -#, fuzzy
>  msgid "Add Tag"
> -msgstr "Band hinzufügen"
> +msgstr "Tag hinzufügen"
>  
>  #: proxmox-backup/www/tape/TapeInventory.js:187
>  msgid "Add Tape"
> @@ -350,11 +349,11 @@ msgstr "Als Storage hinzufügen"
>  
>  #: pve-manager/www/manager6/ceph/FS.js:53
>  msgid "Add the new CephFS to the cluster storage configuration."
> -msgstr "CephFS als Storage im Cluster hinzufügen"
> +msgstr "CephFS als Storage im Cluster hinzufügen."
>  
>  #: pve-manager/www/manager6/ceph/Pool.js:72
>  msgid "Add the new pool to the cluster storage configuration."
> -msgstr "RBD Pool als Storage im Cluster hinzufügen"
> +msgstr "Neues RBD Pool als Storage im Cluster hinzufügen."
>  
>  #: pve-manager/www/manager6/ceph/CephInstallWizard.js:412
>  msgid ""
> @@ -432,9 +431,8 @@ msgid "All"
>  msgstr "Alle"
>  
>  #: pve-manager/www/manager6/qemu/ProcessorEdit.js:202
> -#, fuzzy
>  msgid "All Cores"
> -msgstr "Cores"
> +msgstr "Alle Cores"
What speaks against using 'Kerne' here? AFAICT this is the first usage
like this, and 'Prozessorkerne' is a frequently used word.
>  
>  #: pve-manager/www/manager6/qemu/PCIEdit.js:151
>  msgid "All Functions"
> @@ -492,7 +490,7 @@ msgstr "Erlaubte Zeichen"
>  #: pve-manager/www/manager6/Utils.js:1934
>  #: pve-manager/www/manager6/Utils.js:1936
>  msgid "Alphabetical"
> -msgstr ""
> +msgstr "Alphabetisch"
>  
>  #: pmg-gui/js/PBSRemoteEdit.js:87
>  #: pve-manager/www/manager6/dc/BackupJobDetail.js:214
> @@ -624,7 +622,7 @@ msgstr ""
>  
>  #: pve-manager/www/manager6/qemu/HDEdit.js:309
>  msgid "Async IO"
> -msgstr ""
> +msgstr "Asynchrone IO"
>  
>  #: pmg-gui/js/Utils.js:555
>  msgid "Attach orig. Mail"
> @@ -635,9 +633,8 @@ msgid "Attachment Quarantine"
>  msgstr "Anhangs-Quarantäne"
>  
>  #: pmg-gui/js/AttachmentGrid.js:8
> -#, fuzzy
>  msgid "Attachments"
> -msgstr "Keine Anhänge"
> +msgstr "Anhänge"
>  
>  #: proxmox-widget-toolkit/src/window/DiskSmart.js:34
>  msgid "Attribute"
> @@ -753,9 +750,8 @@ msgid "Backend Driver"
>  msgstr "Backendtreiber"
>  
>  #: pve-manager/www/manager6/form/TagColorGrid.js:316
> -#, fuzzy
>  msgid "Background"
> -msgstr "Backup-Anzahl"
> +msgstr "Hintergrund"
>  
>  #: proxmox-backup/www/window/DataStoreEdit.js:59
>  msgid "Backing Path"
> @@ -1064,9 +1060,8 @@ msgid "CPU"
>  msgstr "CPU"
>  
>  #: pve-manager/www/manager6/qemu/ProcessorEdit.js:200
> -#, fuzzy
>  msgid "CPU Affinity"
> -msgstr "CPU Limit"
> +msgstr "CPU Affinität"
>  
>  #: pve-manager/www/manager6/lxc/ResourceEdit.js:79
>  #: pve-manager/www/manager6/qemu/ProcessorEdit.js:191
> @@ -1124,9 +1119,8 @@ msgid "Cache"
>  msgstr "Cache"
>  
>  #: pve-manager/www/manager6/form/TagEdit.js:304
> -#, fuzzy
>  msgid "Cancel Edit"
> -msgstr "Abbruch"
> +msgstr "Bearbeitung abbrechen"
>  
>  #: pve-manager/www/manager6/storage/ImageView.js:52
>  msgid "Cannot remove disk image."
> @@ -1250,10 +1244,9 @@ msgid "Changers"
>  msgstr "Wechsler"
>  
>  #: pve-manager/www/manager6/dc/OptionView.js:244
> -#, fuzzy
>  msgid "Changing the ID breaks existing WebAuthn TFA entries."
>  msgstr ""
> -"Das Ändern der Relying-Party kann bereits existierende 
> WebAuthn-TFA-Einträge "
> +"Das Ändern der ID kann bereits existierende WebAuthn-TFA-Einträge "
>  "unbrauchbar machen."
>  
>  #: pmg-gui/js/TFAView.js:82 proxmox-backup/www/config/WebauthnView.js:131
> @@ -1299,7 +1292,7 @@ msgstr ""
>  
>  #: pve-manager/www/manager6/Utils.js:1928
>  msgid "Circle"
> -msgstr ""
> +msgstr "Kreis"
>  
>  #: pve-manager/www/manager6/Utils.js:1926
>  msgid "Cirlce"
> @@ -1457,7 +1450,7 @@ msgstr "Alle zusammenklappen"
>  
>  #: pve-manager/www/manager6/dc/OptionView.js:430
>  msgid "Color Overrides"
> -msgstr ""
> +msgstr "Überschriebene Farben"
>  
>  #: pve-manager/www/manager6/ha/Fencing.js:31
>  msgid "Command"
> @@ -2008,7 +2001,6 @@ msgid "DNSBL Threshold"
>  msgstr "DNSBL Schwellwert"
>  
>  #: proxmox-backup/www/config/PruneView.js:220
> -#, fuzzy
>  msgid "Daily"
>  msgstr "Täglich"
>  
> @@ -2030,9 +2022,8 @@ msgid "Dashboard Storages"
>  msgstr "Dashboard Storages"
>  
>  #: pve-manager/www/manager6/node/ZFS.js:119
> -#, fuzzy
>  msgid "Data Devs"
> -msgstr "Datastores"
> +msgstr "Daten Geräte"
Non-loanword Nouns in Ger

[pve-devel] [PATCH manager] ui: fix minor typo in tag style gui

2022-11-21 Thread Stefan Sterz 
Signed-off-by: Stefan Sterz 
---
 www/manager6/Utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index df2f9631..4dd3cb93 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1923,7 +1923,7 @@ Ext.define('PVE.Utils', {
 },
 
 tagTreeStyles: {
-   '__default__': `${Proxmox.Utils.defaultText} (${gettext('Cirlce')})`,
+   '__default__': `${Proxmox.Utils.defaultText} (${gettext('Circle')})`,
'full': gettext('Full'),
'circle': gettext('Circle'),
'dense': gettext('Dense'),
-- 
2.30.2



___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH i18n] update german translation

2022-11-21 Thread Thomas Lamprecht 
Am 21/11/2022 um 10:49 schrieb Stefan Sterz:
> Signed-off-by: Stefan Sterz 
> ---
>  de.po | 185 +++---
>  1 file changed, 72 insertions(+), 113 deletions(-)
> 
>

applied, thanks!

(sending a follow up for Daniel's comments may be simpler here than a full v2)


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH manager] ui: fix minor typo in tag style gui

2022-11-21 Thread Thomas Lamprecht 
Am 21/11/2022 um 11:10 schrieb Stefan Sterz:
> Signed-off-by: Stefan Sterz 
> ---
>  www/manager6/Utils.js | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
> index df2f9631..4dd3cb93 100644
> --- a/www/manager6/Utils.js
> +++ b/www/manager6/Utils.js
> @@ -1923,7 +1923,7 @@ Ext.define('PVE.Utils', {
>  },
>  
>  tagTreeStyles: {
> - '__default__': `${Proxmox.Utils.defaultText} (${gettext('Cirlce')})`,
> + '__default__': `${Proxmox.Utils.defaultText} (${gettext('Circle')})`,
>   'full': gettext('Full'),
>   'circle': gettext('Circle'),
>   'dense': gettext('Dense'),

forgot to pull?

https://git.proxmox.com/?p=pve-manager.git;a=commitdiff;h=837c0db860067f1e94f3e835fe6f28c633e0c5a2


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH pve-network] network: add|del_fdb: fix learning check

2022-11-21 Thread Thomas Lamprecht 
Am 21/11/2022 um 10:54 schrieb Alexandre Derumier:
> ovs port don't have sysfs path
> "/sys/class/net/$iface/brport/learning"
> 
> We need to check if the value is undef too
> 
> Signed-off-by: Alexandre Derumier 
> ---
>  src/PVE/Network.pm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
>

applied, thanks!


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH i18n] update german translation

2022-11-21 Thread Stefan Sterz 
Signed-off-by: Stefan Sterz 
---
thanks @ Daniel Tschlatscher and Dominik Csapak for the corrections!

 de.po | 28 
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/de.po b/de.po
index c7b21a3..c5ab411 100644
--- a/de.po
+++ b/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: proxmox translations\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: Mon Nov 21 11:17:22 2022\n"
-"PO-Revision-Date: 2022-11-21 10:40+0100\n"
+"PO-Revision-Date: 2022-11-21 11:54+0100\n"
 "Last-Translator: Proxmox Support Team \n"
 "Language-Team: German\n"
 "Language: de\n"
@@ -432,7 +432,7 @@ msgstr "Alle"
 
 #: pve-manager/www/manager6/qemu/ProcessorEdit.js:202
 msgid "All Cores"
-msgstr "Alle Cores"
+msgstr "Alle Kerne"
 
 #: pve-manager/www/manager6/qemu/PCIEdit.js:151
 msgid "All Functions"
@@ -509,7 +509,7 @@ msgstr "Während der Token-Registrierung ist ein Fehler 
aufgetreten."
 
 #: pve-manager/www/manager6/dc/OptionView.js:458
 msgid "Applies to new edits"
-msgstr ""
+msgstr "Wird auf neue Änderungen angewandt"
 
 #: proxmox-widget-toolkit/src/window/LanguageEdit.js:45
 #: pmg-gui/js/SpamDetectorCustom.js:81 pve-manager/www/manager6/ceph/OSD.js:237
@@ -1136,7 +1136,7 @@ msgstr "Kann Image nicht entfernen, ein Gast mit VMID 
'{0}' existiert!"
 
 #: pve-manager/www/manager6/node/ZFS.js:53
 msgid "Cannot use reserved pool name"
-msgstr ""
+msgstr "Reservierter Poolname kann nicht benutzt werden"
 
 #: pve-manager/www/manager6/form/StorageSelector.js:40
 msgid "Capacity"
@@ -1150,7 +1150,7 @@ msgstr "Cartridge-Memory"
 #: pve-manager/www/manager6/dc/OptionView.js:348
 #: pve-manager/www/manager6/dc/OptionView.js:457
 msgid "Case-Sensitive"
-msgstr ""
+msgstr "Groß- und Kleinschreibung beachten"
 
 #: proxmox-backup/www/tape/ChangerStatus.js:797
 #: proxmox-backup/www/tape/DriveStatus.js:247
@@ -1440,9 +1440,8 @@ msgid "Cluster Nodes"
 msgstr "Cluster Knoten"
 
 #: pve-manager/www/manager6/dc/OptionView.js:141
-#, fuzzy
 msgid "Cluster Resource Scheduling"
-msgstr "Cluster Ressourcen (durchschnitt)"
+msgstr "Cluster Ressourcen Planung"
 
 #: pmg-gui/js/Dashboard.js:469
 msgid "Cluster Resources (average)"
@@ -1824,7 +1823,7 @@ msgstr ""
 #: pve-manager/www/manager6/qemu/ProcessorEdit.js:130
 #: pve-manager/www/manager6/window/Restore.js:322
 msgid "Cores"
-msgstr "Cores"
+msgstr "Kerne"
 
 #: pve-manager/www/manager6/ceph/CephInstallWizard.js:86
 #: pve-manager/www/manager6/ceph/CephInstallWizard.js:118
@@ -3790,9 +3789,8 @@ msgid "HA Group"
 msgstr "HA Gruppe"
 
 #: pve-manager/www/manager6/dc/OptionView.js:149
-#, fuzzy
 msgid "HA Scheduling"
-msgstr "GC Zeitplan"
+msgstr "HA Planung"
 
 #: pve-manager/www/manager6/dc/OptionView.js:120
 msgid "HA Settings"
@@ -4243,7 +4241,7 @@ msgstr "Ungültiger Wert"
 
 #: pve-manager/www/manager6/node/ZFS.js:56
 msgid "Invalid characters in pool name"
-msgstr ""
+msgstr "Unzulässige Zeichen im Poolname"
 
 #: pve-manager/www/manager6/Utils.js:1492
 msgid "Invalid file size"
@@ -4831,12 +4829,11 @@ msgid "MTU"
 msgstr ""
 
 #: pve-manager/www/manager6/qemu/NetworkEdit.js:122
-#, fuzzy
 msgid ""
 "MTU needs to be >= 576 or 1 to inherit the MTU from the underlying bridge."
 msgstr ""
-"Verwenden Sie den Wert '1' um die MTU Einstellung der zugrundeliegenden "
-"Bridge zu verwenden."
+"Die MTU muss entweder ein Wert >= 576 sein, oder 1, um den Wert der "
+"zugrundeliegenden Bridge zu übernehmen."
 
 #: pve-manager/www/manager6/qemu/HardwareView.js:157
 #: pve-manager/www/manager6/qemu/MachineEdit.js:76
@@ -6700,7 +6697,6 @@ msgid "Pre-Enroll keys"
 msgstr "Pre-Enroll Schlüssel"
 
 #: pve-manager/www/manager6/dc/OptionView.js:488
-#, fuzzy
 msgid "Pre-defiend:"
 msgstr "Vordefiniert:"
 
@@ -9673,7 +9669,7 @@ msgstr "Total NetOut"
 
 #: pve-manager/www/manager6/qemu/ProcessorEdit.js:147
 msgid "Total cores"
-msgstr "Total cores"
+msgstr "Gesamtzahl der Kerne"
 
 #: pmg-gui/js/MailTracker.js:228 pmg-gui/js/NavigationTree.js:140
 msgid "Tracking Center"
-- 
2.30.2



___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH i18n] update german translation

2022-11-21 Thread Thomas Lamprecht 
Am 21/11/2022 um 11:57 schrieb Stefan Sterz:
> Signed-off-by: Stefan Sterz 
> ---
> thanks @ Daniel Tschlatscher and Dominik Csapak for the corrections!
> 
>  de.po | 28 
>  1 file changed, 12 insertions(+), 16 deletions(-)
> 
>

applied, thanks!


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH docs 1/2] ha: crs: fix typo

2022-11-21 Thread Thomas Lamprecht 
Am 21/11/2022 um 09:31 schrieb Fiona Ebner:
> Signed-off-by: Fiona Ebner 
> ---
>  ha-manager.adoc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
>

applied both patches, thanks!


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH widget-toolkit 1/2] css: don't make full tags inline-block in the tree

2022-11-21 Thread Thomas Lamprecht 
Am 21/11/2022 um 08:53 schrieb Dominik Csapak:
> when showing full tags in the tree as inline-block, the height is increased,
> leading to unwanted 'wobble' when tags are added/removed
> 
> Signed-off-by: Dominik Csapak 
> ---
>  src/css/ext6-pmx.css | 5 +
>  1 file changed, 5 insertions(+)
> 
>

applied with typo in the subject of patch 2/2 fixed, thanks!


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH qemu-server 1/2] vm_resume: fix nocheck/migrate handling

2022-11-21 Thread Fabian Grünbichler 
it's not deterministic whether the rename/move of the VM config
triggered on the source side of a migration is already visible on the
target side when vm_resume is executed. check the vmlist for the node
where the config is currently located if $nocheck is set - it is now
needed to add the forwarding DB entries to the bridge.

this fixes an issue on busier or slower clusters, where pmxcfs hasn't
yet processed the rename, and resuming would fail with an error about
the config not existing.

Reported-by: Dominik Csapak 

Signed-off-by: Fabian Grünbichler 
---
 PVE/QemuServer.pm | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 721633d8..29110c0f 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6366,7 +6366,17 @@ sub vm_resume {
my $res = mon_cmd($vmid, 'query-status');
my $resume_cmd = 'cont';
my $reset = 0;
-   my $conf = PVE::QemuConfig->load_config($vmid);
+   my $conf;
+   if ($nocheck) {
+   my $vmlist = PVE::Cluster::get_vmlist();
+   my $node;
+   if (exists($vmlist->{ids}->{$vmid})) {
+   $node = $vmlist->{ids}->{$vmid}->{node};
+   }
+   $conf = PVE::QemuConfig->load_config($vmid, $node);
+   } else {
+   $conf = PVE::QemuConfig->load_config($vmid);
+   }
 
if ($res->{status}) {
return if $res->{status} eq 'running'; # job done, go home
@@ -6375,7 +6385,6 @@ sub vm_resume {
}
 
if (!$nocheck) {
-
PVE::QemuConfig->check_lock($conf)
if !($skiplock || PVE::QemuConfig->has_lock($conf, 'backup'));
}
-- 
2.30.2



___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH qemu-server 2/2] explain 'nocheck' in more places

2022-11-21 Thread Fabian Grünbichler 
was only explained in git history and vm_stop, add comments in other
relevant places to avoid future breakage.

Signed-off-by: Fabian Grünbichler 
---
 PVE/API2/Qemu.pm   | 2 ++
 PVE/CLI/qm.pm  | 2 ++
 PVE/QemuMigrate.pm | 3 ++-
 PVE/QemuServer.pm  | 9 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 6bdcce21..badfc37b 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -3200,6 +3200,8 @@ __PACKAGE__->register_method({
raise_param_exc({ skiplock => "Only root may use this option." })
if $skiplock && $authuser ne 'root@pam';
 
+   # nocheck is used as part of migration when config file might be still
+   # be on source node
my $nocheck = extract_param($param, 'nocheck');
raise_param_exc({ nocheck => "Only root may use this option." })
if $nocheck && $authuser ne 'root@pam';
diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index 66feecce..3e0f1289 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -426,6 +426,8 @@ __PACKAGE__->register_method ({
last;
} elsif ($line =~ /^resume (\d+)$/) {
my $vmid = $1;
+   # check_running and vm_resume with nocheck, since local node
+   # might not have processed config move/rename yet
if (PVE::QemuServer::check_running($vmid, 1)) {
eval { PVE::QemuServer::vm_resume($vmid, 1, 1); };
if ($@) {
diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 5941cce6..5e466d95 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -1500,6 +1500,7 @@ sub phase3_cleanup {
$self->{errors} = 1;
}
} else {
+   # nocheck in case target node hasn't processed the config 
move/rename yet
my $cmd = [@{$self->{rem_ssh}}, 'qm', 'resume', $vmid, 
'--skiplock', '--nocheck'];
my $logf = sub {
my $line = shift;
@@ -1561,7 +1562,7 @@ sub phase3_cleanup {
}
 };
 
-# always stop local VM
+# always stop local VM with nocheck, since config is moved already
 eval { PVE::QemuServer::vm_stop($self->{storecfg}, $vmid, 1, 1); };
 if (my $err = $@) {
$self->log('err', "stopping vm failed - $err");
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 29110c0f..e1ece548 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2788,6 +2788,12 @@ sub check_local_storage_availability {
 sub check_running {
 my ($vmid, $nocheck, $node) = @_;
 
+# $nocheck is set when called during a migration, in which case the config
+# file might still or already reside on the *other* node
+# - because rename has already happened, and current node is source
+# - because rename hasn't happened yet, and current node is target
+# - because rename has happened, current node is target, but hasn't yet
+# processed it yet
 PVE::QemuConfig::assert_config_exists_on_node($vmid, $node) if !$nocheck;
 return PVE::QemuServer::Helpers::vm_running_locally($vmid);
 }
@@ -6359,6 +6365,9 @@ sub vm_suspend {
 }
 }
 
+# $nocheck is set when called as part of a migration - in this context the
+# location of the config file (source or target node) is not deterministic,
+# since migration cannot wait for pmxcfs to process the rename
 sub vm_resume {
 my ($vmid, $skiplock, $nocheck) = @_;
 
-- 
2.30.2



___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH qemu-server 1/1] Do not start VM twice when rollbacking with --start

2022-11-21 Thread Stefan Hanreich 
When rollbacking to the snapshot of a VM that includes RAM, the VM
gets started by the rollback task anyway, so no additional start task is
needed. Previously, when running rollback with the --start parameter
and the VM snapshot includes RAM, a start task was created. That task
failed because the VM had already been started by the rollback task.

Additionally documented this behaviour in the description of the --start
parameter

Signed-off-by: Stefan Hanreich 
---
 PVE/API2/Qemu.pm | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 6bdcce2..7263a1a 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -5064,7 +5064,8 @@ __PACKAGE__->register_method({
snapname => get_standard_option('pve-snapshot-name'),
start => {
type => 'boolean',
-   description => "Whether the VM should get started after rolling 
back successfully",
+   description => "Whether the VM should get started after rolling 
back successfully."
+   . " A VM will always be started when rollbacking a snapshot 
with RAM included, regardless of this parameter.",
optional => 1,
default => 0,
},
@@ -5092,7 +5093,13 @@ __PACKAGE__->register_method({
PVE::QemuConfig->snapshot_rollback($vmid, $snapname);
 
if ($param->{start}) {
-   PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
+   my $conf = PVE::QemuConfig->load_config($vmid);
+   my $snap = $conf->{snapshots}->{$snapname};
+   die "snapshot '$snapname' does not exist\n" if !defined($snap);
+
+   if (!$snap->{vmstate}) {
+   PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
+   }
}
};
 
-- 
2.30.2


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH qemu-server 1/1] Do not start VM twice when rollbacking with --start

2022-11-21 Thread Fabian Grünbichler 
On November 21, 2022 1:29 pm, Stefan Hanreich wrote:
> When rollbacking to the snapshot of a VM that includes RAM, the VM
> gets started by the rollback task anyway, so no additional start task is
> needed. Previously, when running rollback with the --start parameter
> and the VM snapshot includes RAM, a start task was created. That task
> failed because the VM had already been started by the rollback task.
> 
> Additionally documented this behaviour in the description of the --start
> parameter
> 
> Signed-off-by: Stefan Hanreich 
> ---
>  PVE/API2/Qemu.pm | 11 +--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 6bdcce2..7263a1a 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -5064,7 +5064,8 @@ __PACKAGE__->register_method({
>   snapname => get_standard_option('pve-snapshot-name'),
>   start => {
>   type => 'boolean',
> - description => "Whether the VM should get started after rolling 
> back successfully",
> + description => "Whether the VM should get started after rolling 
> back successfully."
> + . " A VM will always be started when rollbacking a snapshot 
> with RAM included, regardless of this parameter.",
>   optional => 1,
>   default => 0,
>   },
> @@ -5092,7 +5093,13 @@ __PACKAGE__->register_method({
>   PVE::QemuConfig->snapshot_rollback($vmid, $snapname);
>  
>   if ($param->{start}) {
> - PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
> + my $conf = PVE::QemuConfig->load_config($vmid);
> + my $snap = $conf->{snapshots}->{$snapname};
> + die "snapshot '$snapname' does not exist\n" if !defined($snap);
> +
> + if (!$snap->{vmstate}) {
> + PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
> + }

this could also just call check_running, and skip the start call if it returns
true.

if ($param_start && !check_running(..)) {
..
}

>   }
>   };
>  
> -- 
> 2.30.2
> 
> 
> ___
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
> 


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Re: [pve-devel] [PATCH qemu-server 1/1] Do not start VM twice when rollbacking with --start

2022-11-21 Thread Stefan Hanreich 


On 11/21/22 13:44, Fabian Grünbichler wrote:

On November 21, 2022 1:29 pm, Stefan Hanreich wrote:

When rollbacking to the snapshot of a VM that includes RAM, the VM
gets started by the rollback task anyway, so no additional start task is
needed. Previously, when running rollback with the --start parameter
and the VM snapshot includes RAM, a start task was created. That task
failed because the VM had already been started by the rollback task.

Additionally documented this behaviour in the description of the --start
parameter

Signed-off-by: Stefan Hanreich 
---
  PVE/API2/Qemu.pm | 11 +--
  1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 6bdcce2..7263a1a 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -5064,7 +5064,8 @@ __PACKAGE__->register_method({
snapname => get_standard_option('pve-snapshot-name'),
start => {
type => 'boolean',
-   description => "Whether the VM should get started after rolling back 
successfully",
+   description => "Whether the VM should get started after rolling back 
successfully."
+   . " A VM will always be started when rollbacking a snapshot with 
RAM included, regardless of this parameter.",
optional => 1,
default => 0,
},
@@ -5092,7 +5093,13 @@ __PACKAGE__->register_method({
PVE::QemuConfig->snapshot_rollback($vmid, $snapname);
  
  	if ($param->{start}) {

-   PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
+   my $conf = PVE::QemuConfig->load_config($vmid);
+   my $snap = $conf->{snapshots}->{$snapname};
+   die "snapshot '$snapname' does not exist\n" if !defined($snap);
+
+   if (!$snap->{vmstate}) {
+   PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
+   }

this could also just call check_running, and skip the start call if it returns
true.

if ($param_start && !check_running(..)) {
 ..
}

sounds way better, will implement it this way - ty



}
};
  
--

2.30.2


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel





___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel





___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH qemu-server 1/2] vm_resume: fix nocheck/migrate handling

2022-11-21 Thread Thomas Lamprecht 
Am 21/11/2022 um 13:16 schrieb Fabian Grünbichler:
> it's not deterministic whether the rename/move of the VM config
> triggered on the source side of a migration is already visible on the
> target side when vm_resume is executed. check the vmlist for the node
> where the config is currently located if $nocheck is set - it is now
> needed to add the forwarding DB entries to the bridge.
> 
> this fixes an issue on busier or slower clusters, where pmxcfs hasn't
> yet processed the rename, and resuming would fail with an error about
> the config not existing.
> 
> Reported-by: Dominik Csapak 
> 
> Signed-off-by: Fabian Grünbichler 
> ---
>  PVE/QemuServer.pm | 13 +++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
>

applied both patches and fixed up the indentation errors in this one, thanks!


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH v2 qemu-server 1/1] Do not start VM twice when rollbacking with --start

2022-11-21 Thread Stefan Hanreich 
When rollbacking to the snapshot of a VM that includes RAM, the VM
gets started by the rollback task anyway, so no additional start task is
needed. Previously, when running rollback with the --start parameter
and the VM snapshot includes RAM, a start task was created. That task
failed because the VM had already been started by the rollback task.

Additionally documented this behaviour in the description of the --start
parameter

Signed-off-by: Stefan Hanreich 
---

Changes v1 -> v2:
Do not parse config for checking type of snapshot but rather directly check
whether VM is running or not via check_running()

 PVE/API2/Qemu.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 6bdcce2..691202d 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -5064,7 +5064,8 @@ __PACKAGE__->register_method({
snapname => get_standard_option('pve-snapshot-name'),
start => {
type => 'boolean',
-   description => "Whether the VM should get started after rolling 
back successfully",
+   description => "Whether the VM should get started after rolling 
back successfully."
+   . " A VM will always be started when rollbacking a snapshot 
with RAM included, regardless of this parameter.",
optional => 1,
default => 0,
},
@@ -5091,7 +5092,7 @@ __PACKAGE__->register_method({
PVE::Cluster::log_msg('info', $authuser, "rollback snapshot VM 
$vmid: $snapname");
PVE::QemuConfig->snapshot_rollback($vmid, $snapname);
 
-   if ($param->{start}) {
+   if ($param->{start} && !PVE::QemuServer::check_running($vmid)) {
PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
}
};
-- 
2.30.2


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH manager] ui: qemu disk: honor iothread setting from config

2022-11-21 Thread Dominik Csapak 
to have a iothread on by default in the wizard and on disk add, we
added a 'bind' for the value here. This also changes the value
for existing vm disks, and if one does not notice, modifies it
away again (since we don't have the controller here and isSCSISingle is
false)

simply don't bind value when we edit a vm disk from config

Signed-off-by: Dominik Csapak 
---
 www/manager6/qemu/HDEdit.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js
index 921bfe72d..b78647ec8 100644
--- a/www/manager6/qemu/HDEdit.js
+++ b/www/manager6/qemu/HDEdit.js
@@ -255,10 +255,12 @@ Ext.define('PVE.qemu.HDInputPanel', {
name: 'iothread',
fieldLabel: 'IO thread',
clearOnDisable: true,
-   bind: {
+   bind: me.insideWizard || me.isCreate ? {
disabled: '{!isVirtIO && !isSCSI}',
// Checkbox.setValue handles Arrays in a different way, 
therefore cast to bool
value: '{!!isVirtIO || (isSCSI && isSCSISingle)}',
+   } : {
+   disabled: '{!isVirtIO && !isSCSI}',
},
},
);
-- 
2.30.2



___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH manager] ui: qemu disk: honor iothread setting from config

2022-11-21 Thread Thomas Lamprecht 
Am 21/11/2022 um 15:39 schrieb Dominik Csapak:
> to have a iothread on by default in the wizard and on disk add, we
> added a 'bind' for the value here. This also changes the value
> for existing vm disks, and if one does not notice, modifies it
> away again (since we don't have the controller here and isSCSISingle is
> false)
> 
> simply don't bind value when we edit a vm disk from config
> 
> Signed-off-by: Dominik Csapak 
> ---
>  www/manager6/qemu/HDEdit.js | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
>

applied, thanks! for the record: this wasn't an issue in Firefox.


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] applied: [PATCH manager 1/6] api: vzdump: soften parameter permission checks

2022-11-21 Thread Thomas Lamprecht 
Am 16/11/2022 um 15:04 schrieb Fiona Ebner:
> Allows sufficiently privileged users to pass-in retention and
> performance parameters for manual backup, but keeps tmpdir, dumpdir
> and script root-only. Such users could already edit the job
> accordingly, so essentially not granting anything new.
> 
> Suggested-by: Thomas Lamprecht 
> Signed-off-by: Fiona Ebner 
> ---
>  PVE/API2/Backup.pm | 15 ++-
>  PVE/API2/VZDump.pm | 25 ++---
>  2 files changed, 28 insertions(+), 12 deletions(-)
> 
>

almost forgot: as talked off-list: applied this one for now as its relatively
nonintrusive and fixes the annoying "can edit job but cannot press run-no" 
issue,
thanks!


___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel