From 5f3955a1cf7bd30227a35d011d0c009744aac6b6 Mon Sep 17 00:00:00 2001 From: Max Carrara Date: Tue, 5 Mar 2024 16:07:46 +0100 Subject: [PATCH] reorder keyring used by ceph-crash favoring non-host-specific keyring MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch makes it so that `ceph-crash` attempts to use the non-host-specific keyring before anything else, which avoids unnecessary error messages landing in the systemd-journal in our case. Signed-off-by: Max Carrara Reviewed-by: Fabian Grünbichler (cherry picked from commit b361d473131da296db39a444ec49da2dcc1b7904) Signed-off-by: Thomas Lamprecht --- ...h-crash-change-order-of-client-names.patch | 30 +++++++++++++++++++ patches/series | 1 + 2 files changed, 31 insertions(+) create mode 100644 patches/0026-ceph-crash-change-order-of-client-names.patch diff --git a/patches/0026-ceph-crash-change-order-of-client-names.patch b/patches/0026-ceph-crash-change-order-of-client-names.patch new file mode 100644 index 000000000..8131fced5 --- /dev/null +++ b/patches/0026-ceph-crash-change-order-of-client-names.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Max Carrara +Date: Mon, 5 Feb 2024 11:44:14 +0100 +Subject: [PATCH] ceph-crash: change order of client names + +This simply puts 'client.crash' before 'client.crash.${HOSTNAME}'. + +Signed-off-by: Max Carrara +--- + src/ceph-crash.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ceph-crash.in b/src/ceph-crash.in +index 0e02837fadd..713080a4dc1 100755 +--- a/src/ceph-crash.in ++++ b/src/ceph-crash.in +@@ -16,8 +16,8 @@ import time + logging.basicConfig(level=logging.INFO) + log = logging.getLogger('ceph-crash') + +-auth_names = ['client.crash.%s' % socket.gethostname(), +- 'client.crash', ++auth_names = ['client.crash', ++ 'client.crash.%s' % socket.gethostname(), + 'client.admin'] + + +-- +2.39.2 + diff --git a/patches/series b/patches/series index 5e7476547..99fbed72e 100644 --- a/patches/series +++ b/patches/series @@ -17,3 +17,4 @@ 0023-rocksb-inherit-parent-cmake-cxx-flags.patch 0024-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch 0025-debian-recursively-adjust-permissions-of-var-lib-cep.patch +0026-ceph-crash-change-order-of-client-names.patch