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 27D0E90B25 for ; Mon, 12 Feb 2024 14:34:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 104F719EB1 for ; Mon, 12 Feb 2024 14:34:18 +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 ; Mon, 12 Feb 2024 14:34:17 +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 23B90478DE for ; Mon, 12 Feb 2024 14:34:17 +0100 (CET) Date: Mon, 12 Feb 2024 14:34:05 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20240205175419.1271680-1-m.carrara@proxmox.com> <20240205175419.1271680-10-m.carrara@proxmox.com> In-Reply-To: <20240205175419.1271680-10-m.carrara@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1707743502.yuxc2lm198.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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 - Subject: Re: [pve-devel] [PATCH v2 pve-manager 09/11] fix #4759: ceph: configure keyring for ceph-crash.service 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: Mon, 12 Feb 2024 13:34:18 -0000 On February 5, 2024 6:54 pm, Max Carrara wrote: > when creating the cluster's first monitor. >=20 > Signed-off-by: Max Carrara > --- > Changes v1 --> v2: > * do not enable/restart `ceph-crash` anymore when creating first mon > * drop changes to function `ceph_service_cmd` as they are no longer > needed > * create keyring for `ceph-crash` before modifying 'ceph.conf' > * always set keyring for 'client.crash' section instead of only > if section doesn't exist already > * only modify the keyring file in `get_or_create_crash_keyring()` > if the content differs from the output of `ceph auth get-or-create` you kinda ignored my comment about this adding yet another create keyring h= elper ;) > PVE/API2/Ceph/MON.pm | 17 ++++++++++++++++- > PVE/Ceph/Tools.pm | 39 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 55 insertions(+), 1 deletion(-) >=20 > diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm > index 1e959ef3..ae12a2d3 100644 > --- a/PVE/API2/Ceph/MON.pm > +++ b/PVE/API2/Ceph/MON.pm > @@ -459,11 +459,26 @@ __PACKAGE__->register_method ({ > }); > die $@ if $@; > # automatically create manager after the first monitor is created > + # and set up keyring and config for ceph-crash.service > if ($is_first_monitor) { > PVE::API2::Ceph::MGR->createmgr({ > node =3D> $param->{node}, > id =3D> $param->{node} > - }) > + }); > + > + eval { > + PVE::Ceph::Tools::get_or_create_crash_keyring(); this is called get_or_create, but it actually returns the path to, not the key(ring).. nothing uses the return value anyway, so it could also be called differently I guess and not return anything, but just from the name, I'd expect the key to be returned. > + }; > + warn "Unable to configure keyring for ceph-crash.service: $@" if $@; > + > + PVE::Cluster::cfs_lock_file('ceph.conf', undef, sub { > + my $cfg =3D cfs_read_file('ceph.conf'); > + > + $cfg->{'client.crash'}->{keyring} =3D '/etc/pve/ceph/$cluster.$nam= e.keyring'; I guess this doesn't make anything worse (since we starting from "ceph-crash is totally broken"), but if querying or creating the keyring failed, does it make sense to reference it in the config? > + > + cfs_write_file('ceph.conf', $cfg); > + }); > + die $@ if $@; we could move this whole part up to where we do the monitor changes, and only lock and read and write the config once.. > } > }; > =20 > diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm > index 273a3eb6..02a932e3 100644 > --- a/PVE/Ceph/Tools.pm > +++ b/PVE/Ceph/Tools.pm > @@ -18,7 +18,9 @@ my $ccname =3D 'ceph'; # ceph cluster name > my $ceph_cfgdir =3D "/etc/ceph"; > my $pve_ceph_cfgpath =3D "/etc/pve/$ccname.conf"; > my $ceph_cfgpath =3D "$ceph_cfgdir/$ccname.conf"; > +my $pve_ceph_cfgdir =3D "/etc/pve/ceph"; > =20 > +my $pve_ceph_crash_key_path =3D "$pve_ceph_cfgdir/$ccname.client.crash.k= eyring"; > my $pve_mon_key_path =3D "/etc/pve/priv/$ccname.mon.keyring"; > my $pve_ckeyring_path =3D "/etc/pve/priv/$ccname.client.admin.keyring"; > my $ckeyring_path =3D "/etc/ceph/ceph.client.admin.keyring"; > @@ -37,12 +39,14 @@ my $ceph_service =3D { > =20 > my $config_values =3D { > ccname =3D> $ccname, > + pve_ceph_cfgdir =3D> $pve_ceph_cfgdir, > ceph_mds_data_dir =3D> $ceph_mds_data_dir, > long_rados_timeout =3D> 60, > }; > =20 > my $config_files =3D { > pve_ceph_cfgpath =3D> $pve_ceph_cfgpath, > + pve_ceph_crash_key_path =3D> $pve_ceph_crash_key_path, > pve_mon_key_path =3D> $pve_mon_key_path, > pve_ckeyring_path =3D> $pve_ckeyring_path, > ceph_bootstrap_osd_keyring =3D> $ceph_bootstrap_osd_keyring, > @@ -415,6 +419,41 @@ sub get_or_create_admin_keyring { > return $pve_ckeyring_path; > } > =20 > +# requires connection to existing monitor > +sub get_or_create_crash_keyring { > + my ($rados) =3D @_; > + > + if (!defined($rados)) { > + $rados =3D PVE::RADOS->new(); > + } > + > + my $output =3D $rados->mon_command({ > + prefix =3D> 'auth get-or-create', > + entity =3D> 'client.crash', > + caps =3D> [ > + mon =3D> 'profile crash', > + mgr =3D> 'profile crash', > + ], > + format =3D> 'plain', > + }); > + > + if (! -d $pve_ceph_cfgdir) { > + File::Path::make_path($pve_ceph_cfgdir); > + } > + > + if (-f $pve_ceph_crash_key_path) { > + my $contents =3D PVE::Tools::file_get_contents($pve_ceph_crash_key_path= ); > + > + if ($contents ne $output) { > + PVE::Tools::file_set_contents($pve_ceph_crash_key_path, $output); > + } > + } else { > + PVE::Tools::file_set_contents($pve_ceph_crash_key_path, $output); > + } > + > + return $pve_ceph_crash_key_path; > +} > + > # get ceph-volume managed osds > sub ceph_volume_list { > my $result =3D {}; > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20