From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 26A239208C for ; Fri, 16 Feb 2024 15:56:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 06B7C45A8 for ; Fri, 16 Feb 2024 15:56:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 16 Feb 2024 15:56:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BED1B48564 for ; Fri, 16 Feb 2024 15:56:22 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 16 Feb 2024 15:56:04 +0100 Message-Id: <20240216145615.2301594-3-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240216145615.2301594-1-m.carrara@proxmox.com> References: <20240216145615.2301594-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ceph-crash.in] Subject: [pve-devel] [PATCH v3 master ceph 02/13] patches: add patch that reorders clients used by ceph-crash 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: , X-List-Received-Date: Fri, 16 Feb 2024 14:56:24 -0000 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 --- Changes v1 --> v2: * new Changes v2 --> v3: * rebased on master Note: I preseved Fabian's 'Reviewed-by' trailer as no changes have been made to the patch this commit adds. I hope that's okay. ...h-crash-change-order-of-client-names.patch | 30 +++++++++++++++++++ patches/series | 1 + 2 files changed, 31 insertions(+) create mode 100644 patches/0017-ceph-crash-change-order-of-client-names.patch diff --git a/patches/0017-ceph-crash-change-order-of-client-names.patch b/patches/0017-ceph-crash-change-order-of-client-names.patch new file mode 100644 index 000000000..8131fced5 --- /dev/null +++ b/patches/0017-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 83a168ec9..9bde2a241 100644 --- a/patches/series +++ b/patches/series @@ -14,3 +14,4 @@ 0014-rocksb-inherit-parent-cmake-cxx-flags.patch 0015-ceph-osd-postinst-avoid-reloading-all-sysctl-setting.patch 0016-debian-recursively-adjust-permissions-of-var-lib-cep.patch +0017-ceph-crash-change-order-of-client-names.patch -- 2.39.2