Changeset 39696

Timestamp:

Sep 13, 2016, 4:24:19 PM (10 years ago)

Author:

watersc1

Message:

Merge from trunk of nebdiskd and neb-voladm changes to support excluding permanently unavailable volumes.

Location:

tags/ipp-20141024/Nebulous-Server/bin

Files:

• neb-voladm (modified) (1 diff)
• nebdiskd (modified) (1 diff)

tags/ipp-20141024/Nebulous-Server/bin/neb-voladm

@@ -68 +68 @@
         if (defined $allocate and $allocate !~ m/^[01]$/)
         or (defined $available and $available !~ m/^[01]$/)
-        or (defined $xattr and $xattr !~ m/^[0123]$/);
+        or (defined $xattr and $xattr !~ m/^[01235]$/);
 }
 

tags/ipp-20141024/Nebulous-Server/bin/nebdiskd

@@ -198 +198 @@
             # there may be multiple vol_ids per mountpoint but we only need to
             # check each mountpoint once
-            my $query = $dbh->prepare_cached("SELECT DISTINCT host, mountpoint FROM volume");
+            my $query = $dbh->prepare_cached("SELECT DISTINCT host, mountpoint FROM volume WHERE xattr != 5");
             $query->execute;
             while (my $row = $query->fetchrow_hashref) {