From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 1257C1FF186 for ; Fri, 1 Aug 2025 18:15:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AB9201E24A; Fri, 1 Aug 2025 18:16:46 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 1 Aug 2025 18:15:58 +0200 Message-ID: <20250801161606.181200-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1754064956575 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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. [main.rs] Subject: [pve-devel] [PATCH rrd-migration-tool] migrate storage: properly handle storage IDs with a dot 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" U3RvcmFnZSBJRHMgaW4gUHJveG1veCBWRSBtYXkgY29udGFpbiBkb3RzLCB3aGljaCBtYWtlcyBh IHNpbXBsZQpyZW5hbWUgYWRkaW5nIGEgJy5vbGQnIGV4dGVuc2lvbiBpbXBvc3NpYmxlIHdpdGhv dXQgcG90ZW50aWFsCmJyZWFrYWdlLiBUaGUgc3RvcmFnZSBSUkQgaXMgZ3JvdXBlZCBieSBub2Rl cywgc28gdG8gZml4IGl0LCBjcmVhdGUKYSAnLm9sZCcgZGlyZWN0b3J5IGZvciBlYWNoIG5vZGUg YW5kIG1vdmUgbWlncmF0ZWQgUlJEIGZpbGVzIHRoZXJlLgoKSWYgYSBwcmV2aW91cyBtaWdyYXRp b24gd2l0aCB0aGUgbG9naWMgYmVmb3JlIHRoaXMgY2hhbmdlIGlzIGRldGVjdGVkLAp0aGUgb2xk IGxvZ2ljIHdpbGwgYmUga2VwdCB0byBhdm9pZCBwaWNraW5nIHVwICcub2xkJyBSUkQgZmlsZXMK Y3JlYXRlZCBieSB0aGF0IHByZXZpb3VzIG1pZ3JhdGlvbi4KClNpZ25lZC1vZmYtYnk6IEZpb25h IEVibmVyIDxmLmVibmVyQHByb3htb3guY29tPgotLS0KIHNyYy9tYWluLnJzIHwgNDcgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA0MCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9tYWlu LnJzIGIvc3JjL21haW4ucnMKaW5kZXggZmI1OGQzYS4uMDNhODRiOCAxMDA2NDQKLS0tIGEvc3Jj L21haW4ucnMKKysrIGIvc3JjL21haW4ucnMKQEAgLTMxNyw3ICszMTcsMTAgQEAgZm4gbXZfb2xk KGZpbGU6ICZzdHIpIC0+IFJlc3VsdDwoKT4gewogfQogCiAvLy8gQ29sbGxlY3QgYWxsIFJSRCBm aWxlcyBpbiB0aGUgcHJvdmlkZWQgZGlyZWN0b3J5Ci1mbiBjb2xsZWN0X3JyZF9maWxlcyhsb2Nh dGlvbjogJlBhdGhCdWYpIC0+IFJlc3VsdDxWZWM8KENTdHJpbmcsIE9zU3RyaW5nKT4+IHsKK2Zu IGNvbGxlY3RfcnJkX2ZpbGVzKAorICAgIGxvY2F0aW9uOiAmUGF0aEJ1ZiwKKyAgICBpbmNsdWRl X2ZpbGVzX3dpdGhfZXh0ZW5zaW9uOiBib29sLAorKSAtPiBSZXN1bHQ8VmVjPChDU3RyaW5nLCBP c1N0cmluZyk+PiB7CiAgICAgbGV0IG11dCBmaWxlczogVmVjPChDU3RyaW5nLCBPc1N0cmluZyk+ ID0gVmVjOjpuZXcoKTsKIAogICAgIGxldCBjb250ZW50cyA9IG1hdGNoIGZzOjpyZWFkX2Rpcihs b2NhdGlvbikgewpAQCAtMzMxLDcgKzMzNCw3IEBAIGZuIGNvbGxlY3RfcnJkX2ZpbGVzKGxvY2F0 aW9uOiAmUGF0aEJ1ZikgLT4gUmVzdWx0PFZlYzwoQ1N0cmluZywgT3NTdHJpbmcpPj4gewogICAg IGNvbnRlbnRzCiAgICAgICAgIC5maWx0ZXIofGZ8IGYuaXNfb2soKSkKICAgICAgICAgLm1hcCh8 ZnwgZi51bndyYXAoKS5wYXRoKCkpCi0gICAgICAgIC5maWx0ZXIofGZ8IGYuaXNfZmlsZSgpICYm IGYuZXh0ZW5zaW9uKCkuaXNfbm9uZSgpKQorICAgICAgICAuZmlsdGVyKHxmfCBmLmlzX2ZpbGUo KSAmJiAoaW5jbHVkZV9maWxlc193aXRoX2V4dGVuc2lvbiB8fCBmLmV4dGVuc2lvbigpLmlzX25v bmUoKSkpCiAgICAgICAgIC5mb3JfZWFjaCh8ZmlsZXwgewogICAgICAgICAgICAgbGV0IHBhdGgg PSBDU3RyaW5nOjpuZXcoZmlsZS5hc19wYXRoKCkuYXNfb3Nfc3RyKCkuYXNfYnl0ZXMoKSkKICAg ICAgICAgICAgICAgICAuZXhwZWN0KCJDb3VsZCBub3QgY29udmVydCBwYXRoIHRvIENTdHJpbmcu Iik7CkBAIC00MTYsNyArNDE5LDcgQEAgZm4gbWlncmF0ZV9ndWVzdHMoCiAgICAgcHJpbnRsbiEo Ik1pZ3JhdGluZyBSUkQgbWV0cmljcyBkYXRhIGZvciB2aXJ0dWFsIGd1ZXN0c+KApiIpOwogICAg IHByaW50bG4hKCJVc2luZyB7dGhyZWFkc30gdGhyZWFkKHMpIik7CiAKLSAgICBsZXQgZ3Vlc3Rf c291cmNlX2ZpbGVzID0gY29sbGVjdF9ycmRfZmlsZXMoJnNvdXJjZV9kaXJfZ3Vlc3RzKT87Cisg ICAgbGV0IGd1ZXN0X3NvdXJjZV9maWxlcyA9IGNvbGxlY3RfcnJkX2ZpbGVzKCZzb3VyY2VfZGly X2d1ZXN0cywgZmFsc2UpPzsKIAogICAgIGlmIGd1ZXN0X3NvdXJjZV9maWxlcy5pc19lbXB0eSgp IHsKICAgICAgICAgcHJpbnRsbiEoIk5vIGd1ZXN0IG1ldHJpY3MgdG8gbWlncmF0ZSIpOwpAQCAt NTE4LDcgKzUyMSw3IEBAIGZuIG1pZ3JhdGVfbm9kZXMoCiAgICAgICAgIHN0ZDo6ZnM6OmNyZWF0 ZV9kaXIoJnRhcmdldF9kaXJfbm9kZXMpPzsKICAgICB9CiAKLSAgICBsZXQgbm9kZV9zb3VyY2Vf ZmlsZXMgPSBjb2xsZWN0X3JyZF9maWxlcygmc291cmNlX2Rpcl9ub2Rlcyk/OworICAgIGxldCBu b2RlX3NvdXJjZV9maWxlcyA9IGNvbGxlY3RfcnJkX2ZpbGVzKCZzb3VyY2VfZGlyX25vZGVzLCBm YWxzZSk/OwogCiAgICAgbGV0IG11dCBub19taWdyYXRpb25fZXJyID0gdHJ1ZTsKICAgICBmb3Ig ZmlsZSBpbiBub2RlX3NvdXJjZV9maWxlcyB7CkBAIC01NzksMTcgKzU4MiwyNSBAQCBmbiBtaWdy YXRlX3N0b3JhZ2UoCiAKICAgICBsZXQgbXV0IG5vX21pZ3JhdGlvbl9lcnIgPSB0cnVlOwogICAg IC8vIHN0b3JhZ2UgaGFzIGFub3RoZXIgbGF5ZXIgb2YgZGlyZWN0b3JpZXMgcGVyIG5vZGUgb3Zl ciB3aGljaCB3ZSBuZWVkIHRvIGl0ZXJhdGUKKyAgICAvLyBTdG9yYWdlIElEcyBtYXkgY29udGFp biBkb3RzLCBzbyB0aGUgb2xkIFJSRCBmaWxlcyBhcmUgbW92ZWQgdG8gYSAub2xkIGRpcmVjdG9y eSBwZXIgbm9kZQorICAgIC8vIHJhdGhlciB0aGFuIHJlbmFtZWQgdGhlbXNlbHZlcy4KICAgICBm czo6cmVhZF9kaXIoJnNvdXJjZV9kaXJfc3RvcmFnZSk/CiAgICAgICAgIC5maWx0ZXIofGZ8IGYu aXNfb2soKSkKICAgICAgICAgLm1hcCh8ZnwgZi51bndyYXAoKS5wYXRoKCkpCi0gICAgICAgIC5m aWx0ZXIofGZ8IGYuaXNfZGlyKCkpCisgICAgICAgIC5maWx0ZXIofGZ8IGYuaXNfZGlyKCkgJiYg Zi5leHRlbnNpb24oKS5pc19ub25lKCkpCiAgICAgICAgIC50cnlfZm9yX2VhY2gofG5vZGV8IHsK ICAgICAgICAgICAgIGxldCBtdXQgc291cmNlX3N0b3JhZ2Vfc3ViZGlyID0gc291cmNlX2Rpcl9z dG9yYWdlLmNsb25lKCk7CiAgICAgICAgICAgICBzb3VyY2Vfc3RvcmFnZV9zdWJkaXIucHVzaChu b2RlLmZpbGVfbmFtZSgpLnVud3JhcCgpKTsKIAorICAgICAgICAgICAgbGV0IHNvdXJjZV9zdG9y YWdlX3N1YmRpcl9vbGQgPSBzb3VyY2Vfc3RvcmFnZV9zdWJkaXIuYXNfcGF0aCgpLndpdGhfZXh0 ZW5zaW9uKCJvbGQiKTsKKwogICAgICAgICAgICAgbGV0IG11dCB0YXJnZXRfc3RvcmFnZV9zdWJk aXIgPSB0YXJnZXRfZGlyX3N0b3JhZ2UuY2xvbmUoKTsKICAgICAgICAgICAgIHRhcmdldF9zdG9y YWdlX3N1YmRpci5wdXNoKG5vZGUuZmlsZV9uYW1lKCkudW53cmFwKCkpOwogCisgICAgICAgICAg ICAvLyBJZiBhbHJlYWR5IG1pZ3JhdGVkIHVzaW5nIHRoZSBvbGQgcmVuYW1lIGxvZ2ljLCBkb24n dCB0cnkgdG8gbWlncmF0ZSB3aXRoIG5ldyBsb2dpYy4KKyAgICAgICAgICAgIGxldCBtaWdyYXRl ZF91c2luZ19vbGRfcmVuYW1lID0KKyAgICAgICAgICAgICAgICB0YXJnZXRfc3RvcmFnZV9zdWJk aXIuZXhpc3RzKCkgJiYgIXNvdXJjZV9zdG9yYWdlX3N1YmRpcl9vbGQuZXhpc3RzKCk7CisKICAg ICAgICAgICAgIGlmICF0YXJnZXRfc3RvcmFnZV9zdWJkaXIuZXhpc3RzKCkgJiYgbWlncmF0ZSB7 CiAgICAgICAgICAgICAgICAgZnM6OmNyZWF0ZV9kaXIodGFyZ2V0X3N0b3JhZ2Vfc3ViZGlyLmFz X3BhdGgoKSk/OwogICAgICAgICAgICAgICAgIGxldCBtZXRhZGF0YSA9IHRhcmdldF9zdG9yYWdl X3N1YmRpci5tZXRhZGF0YSgpPzsKQEAgLTU5OCw3ICs2MDksMTggQEAgZm4gbWlncmF0ZV9zdG9y YWdlKAogICAgICAgICAgICAgICAgIGZzOjpzZXRfcGVybWlzc2lvbnMoJnRhcmdldF9zdG9yYWdl X3N1YmRpciwgcGVybWlzc2lvbnMpPzsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgbGV0 IHN0b3JhZ2Vfc291cmNlX2ZpbGVzID0gY29sbGVjdF9ycmRfZmlsZXMoJnNvdXJjZV9zdG9yYWdl X3N1YmRpcik/OworICAgICAgICAgICAgaWYgIXNvdXJjZV9zdG9yYWdlX3N1YmRpcl9vbGQuZXhp c3RzKCkgJiYgbWlncmF0ZSAmJiAhbWlncmF0ZWRfdXNpbmdfb2xkX3JlbmFtZSB7CisgICAgICAg ICAgICAgICAgZnM6OmNyZWF0ZV9kaXIoc291cmNlX3N0b3JhZ2Vfc3ViZGlyX29sZC5hc19wYXRo KCkpPzsKKyAgICAgICAgICAgICAgICBsZXQgbWV0YWRhdGEgPSBzb3VyY2Vfc3RvcmFnZV9zdWJk aXJfb2xkLm1ldGFkYXRhKCk/OworICAgICAgICAgICAgICAgIGxldCBtdXQgcGVybWlzc2lvbnMg PSBtZXRhZGF0YS5wZXJtaXNzaW9ucygpOworICAgICAgICAgICAgICAgIHBlcm1pc3Npb25zLnNl dF9tb2RlKDBvNzU1KTsKKyAgICAgICAgICAgICAgICBmczo6c2V0X3Blcm1pc3Npb25zKCZzb3Vy Y2Vfc3RvcmFnZV9zdWJkaXJfb2xkLCBwZXJtaXNzaW9ucyk/OworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICAvLyBTdG9yYWdlIElEcyBtYXkgY29udGFpbiBkb3RzLCBzbyBuZWVkIHRvIGNv bnNpZGVyIGFsbCBleHRlbnNpb25zLgorICAgICAgICAgICAgLy8gSWYgb2xkIGxvZ2ljIHdhcyB1 c2VkIGFscmVhZHkgYmVmb3JlLCBkb24ndCB1c2UgbmV3IGxvZ2ljLgorICAgICAgICAgICAgbGV0 IHN0b3JhZ2Vfc291cmNlX2ZpbGVzID0KKyAgICAgICAgICAgICAgICBjb2xsZWN0X3JyZF9maWxl cygmc291cmNlX3N0b3JhZ2Vfc3ViZGlyLCAhbWlncmF0ZWRfdXNpbmdfb2xkX3JlbmFtZSk/Owog ICAgICAgICAgICAgZm9yIGZpbGUgaW4gc3RvcmFnZV9zb3VyY2VfZmlsZXMgewogICAgICAgICAg ICAgICAgIHByaW50bG4hKAogICAgICAgICAgICAgICAgICAgICAiTWlncmF0aW5nIG1ldHJpY3Mg Zm9yIHN0b3JhZ2UgJ3t9L3t9JyIsCkBAIC02MDksNiArNjMxLDcgQEAgZm4gbWlncmF0ZV9zdG9y YWdlKAogICAgICAgICAgICAgICAgICk7CiAKICAgICAgICAgICAgICAgICBsZXQgZnVsbF9wYXRo ID0gZmlsZS4wLmNsb25lKCkuaW50b19zdHJpbmcoKS51bndyYXAoKTsKKyAgICAgICAgICAgICAg ICBsZXQgdGFyZ2V0X3BhdGggPSBzb3VyY2Vfc3RvcmFnZV9zdWJkaXJfb2xkLmpvaW4oZmlsZS4x LmNsb25lKCkpOwogICAgICAgICAgICAgICAgIG1hdGNoIGRvX3JyZF9taWdyYXRpb24oCiAgICAg ICAgICAgICAgICAgICAgIGZpbGUsCiAgICAgICAgICAgICAgICAgICAgICZ0YXJnZXRfc3RvcmFn ZV9zdWJkaXIsCkBAIC02MTcsNyArNjQwLDEyIEBAIGZuIG1pZ3JhdGVfc3RvcmFnZSgKICAgICAg ICAgICAgICAgICAgICAgZm9yY2UsCiAgICAgICAgICAgICAgICAgKSB7CiAgICAgICAgICAgICAg ICAgICAgIE9rKCgpKSA9PiB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBtdl9vbGQoZnVsbF9w YXRoLmFzX3N0cigpKT87CisgICAgICAgICAgICAgICAgICAgICAgICAvLyBLZWVwIHVzaW5nIG9s ZCBsb2dpYyBpZiBhbHJlYWR5IG1pZ3JhdGVkIHdpdGggb2xkIGxvZ2ljLgorICAgICAgICAgICAg ICAgICAgICAgICAgaWYgbWlncmF0ZWRfdXNpbmdfb2xkX3JlbmFtZSB7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbXZfb2xkKGZ1bGxfcGF0aC5hc19zdHIoKSk/OworICAgICAgICAgICAg ICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBmczo6cmVu YW1lKGZ1bGxfcGF0aCwgdGFyZ2V0X3BhdGgpPzsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICBFcnIoZXJyKSA9PiB7 CiAgICAgICAgICAgICAgICAgICAgICAgICBlcHJpbnRsbiEoIntlcnJ9Iik7IC8vIGluY2x1ZGVz IGluZm9ybWF0aW9uIG1lc3NhZ2VzLCBzbyBqdXN0IHByaW50LgpAQCAtNjI1LDYgKzY1MywxMSBA QCBmbiBtaWdyYXRlX3N0b3JhZ2UoCiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmIHNvdXJjZV9zdG9yYWdlX3N1 YmRpci5yZWFkX2RpcigpPy5uZXh0KCkuaXNfbm9uZSgpIHsKKyAgICAgICAgICAgICAgICBmczo6 cmVtb3ZlX2Rpcihzb3VyY2Vfc3RvcmFnZV9zdWJkaXIpPzsKKyAgICAgICAgICAgIH0KKwogICAg ICAgICAgICAgT2s6OjwoKSwgRXJyb3I+KCgpKQogICAgICAgICB9KT87CiAKLS0gCjIuNDcuMgoK CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpwdmUtZGV2 ZWwgbWFpbGluZyBsaXN0CnB2ZS1kZXZlbEBsaXN0cy5wcm94bW94LmNvbQpodHRwczovL2xpc3Rz LnByb3htb3guY29tL2NnaS1iaW4vbWFpbG1hbi9saXN0aW5mby9wdmUtZGV2ZWwK