[pve-devel] [PATCH v2 quincy-stable-8 ceph 04/11] patches: add patch that reorders clients used by ceph-crash

[Fabian Grünbichler]

On February 5, 2024 6:54 pm, Max Carrara wrote:
> 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 <m.carrara at proxmox.com>

Reviewed-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>

> ---
> Changes v1 --> v2:
>   * new
> 
>  ...h-crash-change-order-of-client-names.patch | 30 +++++++++++++++++++
>  patches/series                                |  1 +
>  2 files changed, 31 insertions(+)
>  create mode 100644 patches/0025-ceph-crash-change-order-of-client-names.patch
> 
> diff --git a/patches/0025-ceph-crash-change-order-of-client-names.patch b/patches/0025-ceph-crash-change-order-of-client-names.patch
> new file mode 100644
> index 000000000..cc0bdccdb
> --- /dev/null
> +++ b/patches/0025-ceph-crash-change-order-of-client-names.patch
> @@ -0,0 +1,30 @@
> +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
> +From: Max Carrara <m.carrara at proxmox.com>
> +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 <m.carrara at proxmox.com>
> +---
> + 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 010d6ea2e82..d1d9f4123e6 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 34185c7da..8160de645 100644
> --- a/patches/series
> +++ b/patches/series
> @@ -17,3 +17,4 @@
>  0022-mgr-dashboard-remove-ability-to-create-and-check-TLS.patch
>  0023-rocksb-inherit-parent-cmake-cxx-flags.patch
>  0024-debian-adjust-permissions-of-subdirectories-of-var-l.patch
> +0025-ceph-crash-change-order-of-client-names.patch
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
>