X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FDiskmanage.pm;h=5a5fc87799fc767406fadac086391352d39c2b4a;hb=76c1e57be7c8495586e38205611290db049896e0;hp=6dd12f7321b82a4986165c1c24942ea1f5ee5376;hpb=1590fc13bff27e17680074fc262165d74d039365;p=pve-storage.git

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 6dd12f7..5a5fc87 100644
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -209,11 +209,22 @@ sub get_ceph_journals {
     my $journalhash = {};
 
     my $journal_uuid = '45b0969e-9b03-4f30-b4c6-b4b80ceff106';
+    my $db_uuid = '30cd0809-c2b2-499c-8879-2d6b78529876';
+    my $wal_uuid = '5ce17fce-4087-4169-b7ff-056cc58473f9';
+    my $block_uuid = 'cafecafe-9b03-4f30-b4c6-b4b80ceff106';
 
-    dir_glob_foreach('/dev/disk/by-parttypeuuid', "$journal_uuid\..+", sub {
-	my ($entry) = @_;
+    dir_glob_foreach('/dev/disk/by-parttypeuuid', "($journal_uuid|$db_uuid|$wal_uuid|$block_uuid)\..+", sub {
+	my ($entry, $type) = @_;
 	my $real_dev = abs_path("/dev/disk/by-parttypeuuid/$entry");
-	$journalhash->{$real_dev} = 1;
+	if ($type eq $journal_uuid) {
+	    $journalhash->{$real_dev} = 1;
+	} elsif ($type eq $db_uuid) {
+	    $journalhash->{$real_dev} = 2;
+	} elsif ($type eq $wal_uuid) {
+	    $journalhash->{$real_dev} = 3;
+	} elsif ($type eq $block_uuid) {
+	    $journalhash->{$real_dev} = 4;
+	}
     });
 
     return $journalhash;
@@ -445,6 +456,14 @@ sub get_disks {
 
 	$used = 'ZFS' if $zfslist->{$devpath};
 
+	# we replaced cciss/ with cciss! above
+	# but in the result we need cciss/ again
+	# because the caller might want to check the
+	# result again with the original parameter
+	if ($dev =~ m|^cciss!|) {
+	    $dev =~ s|^cciss!|cciss/|;
+	}
+
 	$disklist->{$dev} = {
 	    vendor => $sysdata->{vendor},
 	    model => $data->{model} || $sysdata->{model},
@@ -460,8 +479,11 @@ sub get_disks {
 	};
 
 	my $osdid = -1;
+	my $bluestore = 0;
 
 	my $journal_count = 0;
+	my $db_count = 0;
+	my $wal_count = 0;
 
 	my $found_partitions;
 	my $found_lvm;
@@ -495,7 +517,12 @@ sub get_disks {
 		$found_zfs = 1;
 	    }
 
-	    $journal_count++ if $journalhash->{"$partpath/$part"};
+	    if ($journalhash->{"$partpath/$part"}) {
+		$journal_count++ if $journalhash->{"$partpath/$part"} == 1;
+		$db_count++ if $journalhash->{"$partpath/$part"} == 2;
+		$wal_count++ if $journalhash->{"$partpath/$part"} == 3;
+		$bluestore = 1 if $journalhash->{"$partpath/$part"} == 4;
+	    }
 
 	    if (!dir_is_empty("$sysdir/$part/holders") && !$found_lvm)  {
 		$found_dm = 1;
@@ -515,7 +542,10 @@ sub get_disks {
 
 	$disklist->{$dev}->{used} = $used if $used;
 	$disklist->{$dev}->{osdid} = $osdid;
-	$disklist->{$dev}->{journals} = $journal_count;
+	$disklist->{$dev}->{journals} = $journal_count if $journal_count;
+	$disklist->{$dev}->{bluestore} = $bluestore if $osdid != -1;
+	$disklist->{$dev}->{db} = $db_count if $db_count;
+	$disklist->{$dev}->{wal} = $wal_count if $wal_count;
     });
 
     return $disklist;
@@ -565,4 +595,19 @@ sub get_blockdev {
     return $block_dev;
 }
 
+sub locked_disk_action {
+    my ($sub) = @_;
+    my $res = PVE::Tools::lock_file('/run/lock/pve-diskmanage.lck', undef, $sub);
+    die $@ if $@;
+    return $res;
+}
+
+sub check_unused {
+    my ($dev) = @_;
+
+    die "device $dev is already in use\n" if disk_is_used($dev);
+
+    return undef;
+}
+
 1;