[pve-devel] [PATCH v1 master ceph 1/2] cherry-pick fix that silences invalid escape sequence warning

["Max R. Carrara" <m.carrara@proxmox.com>]

Cherry-pick 1458405b, which fixes a warning regarding an invalid
escape sequence that might worry / annoy some users.

See the added patch for all details.

Thanks to Shannon Sterz for finding the commit upstream!

Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
---
 ...erf_query-fix-ivalid-escape-sequence.patch | 31 +++++++++++++++++++
 patches/series                                |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 patches/0060-mgr-osd_perf_query-fix-ivalid-escape-sequence.patch

diff --git a/patches/0060-mgr-osd_perf_query-fix-ivalid-escape-sequence.patch b/patches/0060-mgr-osd_perf_query-fix-ivalid-escape-sequence.patch
new file mode 100644
index 0000000000..8cca6f947b
--- /dev/null
+++ b/patches/0060-mgr-osd_perf_query-fix-ivalid-escape-sequence.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
+Date: Tue, 23 Jul 2024 19:40:23 +0200
+Subject: [PATCH] mgr/osd_perf_query: fix ivalid escape sequence
+
+Get rid of warning which, according [1], is going to become an error:
+
+osd_perf_query/module.py:61
+  /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/osd_perf_query/module.py:61: DeprecationWarning: invalid escape sequence '\.'
+    'regex': '^(?:rbd|journal)_data\.(?:([0-9]+)\.)?([^.]+)\.'},
+
+1. https://docs.python.org/3/library/re.html
+
+Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@clyso.com>
+---
+ src/pybind/mgr/osd_perf_query/module.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pybind/mgr/osd_perf_query/module.py b/src/pybind/mgr/osd_perf_query/module.py
+index 6f87c1d907a..ac32f804282 100644
+--- a/src/pybind/mgr/osd_perf_query/module.py
++++ b/src/pybind/mgr/osd_perf_query/module.py
+@@ -58,7 +58,7 @@ class OSDPerfQuery(MgrModule):
+         'key_descriptor': [
+             {'type': 'pool_id', 'regex': '^(.+)$'},
+             {'type': 'object_name',
+-             'regex': '^(?:rbd|journal)_data\.(?:([0-9]+)\.)?([^.]+)\.'},
++             'regex': r'^(?:rbd|journal)_data\.(?:([0-9]+)\.)?([^.]+)\.'},
+         ],
+         'performance_counter_descriptors': [
+             'bytes', 'write_ops', 'read_ops', 'write_bytes', 'read_bytes',
diff --git a/patches/series b/patches/series
index b820614566..d6c765677d 100644
--- a/patches/series
+++ b/patches/series
@@ -53,3 +53,4 @@
 0057-mgr-dashboard-add-an-option-to-control-the-dashboard.patch
 0058-pybind-mgr-restful-provide-workaround-for-PyO3-Impor.patch
 0059-mgr-fix-module-import-by-making-NOTIFY_TYPES-in-py-m.patch
+0060-mgr-osd_perf_query-fix-ivalid-escape-sequence.patch
-- 
2.39.5



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