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 1B8F86D78C for ; Tue, 28 Sep 2021 13:40:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B15F5DF8A for ; Tue, 28 Sep 2021 13:40:15 +0200 (CEST) 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 id B6138DCD4 for ; Tue, 28 Sep 2021 13:40:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8D41D423AF for ; Tue, 28 Sep 2021 13:40:06 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 28 Sep 2021 13:39:54 +0200 Message-Id: <20210928114001.164081-15-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210928114001.164081-1-f.ebner@proxmox.com> References: <20210928114001.164081-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.305 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [osd.pm, tools.pm] Subject: [pve-devel] [PATCH manager 2/9] api: check: create osd: use wipe_blockdev from the Diskmanage package 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: Tue, 28 Sep 2021 11:40:50 -0000 which is mostly a copy of the wipe_disks helper with the difference that it also uses wipefs on the device and its partitions. Remove the wipe_disks helper as no users remain. Signed-off-by: Fabian Ebner --- For this one, the dependency on libpve-storage-perl is already new enough. PVE/API2/Ceph/OSD.pm | 4 ++-- PVE/Ceph/Tools.pm | 23 ----------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/PVE/API2/Ceph/OSD.pm b/PVE/API2/Ceph/OSD.pm index 83a9c932..97393912 100644 --- a/PVE/API2/Ceph/OSD.pm +++ b/PVE/API2/Ceph/OSD.pm @@ -473,7 +473,7 @@ __PACKAGE__->register_method ({ push @$cmd, '--data', $devpath; push @$cmd, '--dmcrypt' if $param->{encrypted}; - PVE::Ceph::Tools::wipe_disks($devpath); + PVE::Diskmanage::wipe_blockdev($devpath); run_command($cmd); }); @@ -590,7 +590,7 @@ __PACKAGE__->register_method ({ my $partnum = PVE::Diskmanage::get_partnum($part); my $devpath = PVE::Diskmanage::get_blockdev($part); - PVE::Ceph::Tools::wipe_disks($part); + PVE::Diskmanage::wipe_blockdev($part); print "remove partition $part (disk '${devpath}', partnum $partnum)\n"; eval { run_command(['/sbin/sgdisk', '-d', $partnum, "${devpath}"]); }; warn $@ if $@; diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm index e7124074..f54d837a 100644 --- a/PVE/Ceph/Tools.pm +++ b/PVE/Ceph/Tools.pm @@ -333,29 +333,6 @@ sub get_or_create_admin_keyring { return $pve_ckeyring_path; } -# wipe the first 200 MB to clear off leftovers from previous use, otherwise a -# create OSD fails. -sub wipe_disks { - my (@devs) = @_; - - my @wipe_cmd = qw(/bin/dd if=/dev/zero bs=1M conv=fdatasync); - - foreach my $devpath (@devs) { - my $devname = basename($devpath); - my $dev_size = PVE::Tools::file_get_contents("/sys/class/block/$devname/size"); - - ($dev_size) = $dev_size =~ m|(\d+)|; # untaint $dev_size - die "Coulnd't get the size of the device $devname\n" if (!defined($dev_size)); - - my $size = ($dev_size * 512 / 1024 / 1024); - my $count = ($size < 200) ? $size : 200; - - print "wipe disk/partition: $devpath\n"; - eval { run_command([@wipe_cmd, "count=$count", "of=${devpath}"]) }; - warn $@ if $@; - } -}; - # get ceph-volume managed osds sub ceph_volume_list { my $result = {}; -- 2.30.2