Changeset 18389

Timestamp:

Jun 30, 2008, 2:28:07 PM (18 years ago)

Author:

jhoblitt

Message:

add volume.host field

Location:

trunk/Nebulous-Server

Files:

• bin/neb-admin (modified) (3 diffs)
• lib/Nebulous/Server.pm (modified) (6 diffs)
• lib/Test/Nebulous.pm (modified) (2 diffs)
• t/15_mounts.t (modified) (5 diffs)

trunk/Nebulous-Server/bin/neb-admin

@@ -3 +3 @@
 # Copyright (C) 2005-2008  Joshua Hoblitt
 #
-# $Id: neb-admin,v 1.4 2008-06-27 23:29:42 jhoblitt Exp $
+# $Id: neb-admin,v 1.5 2008-07-01 00:28:06 jhoblitt Exp $
 
 use strict;
@@ -82 +82 @@
     my $has = $obj->{instances};
     my $vol_name = $obj->{volume_name};
+    my $vol_host = $obj->{volume_host};
     my $available = $obj->{available_instances} || 0;
     my $need_recovery = $obj->{need_recovery};
@@ -107 +108 @@
         need_copies => $need,
         volume_name => $vol_name,
+        volume_host => $vol_host,
     );
 

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.77 2008-06-09 20:34:30 jhoblitt Exp $
+# $Id: Server.pm,v 1.78 2008-07-01 00:28:06 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -178 +178 @@
     }
         
-    my ($vol_id, $vol_path, $vol_xattr) = $self->_get_storage_volume($vol_name);
+    my ($vol_id, $vol_host, $vol_path, $vol_xattr) = $self->_get_storage_volume($vol_name);
 
     my $uri;
@@ -353 +353 @@
     }
         
-    my ($vol_id, $vol_path, $vol_xattr) = $self->_get_storage_volume($vol_name);
+    my ($vol_id, $vol_host, $vol_path, $vol_xattr) = $self->_get_storage_volume($vol_name);
 
     my $uri;
@@ -1152 +1152 @@
     my $name = shift;
 
-    my ($vol_id, $vol_path, $xattr);
+    my ($vol_id, $vol_host, $vol_path, $xattr);
     eval {
         # TODO cache this?
@@ -1183 +1183 @@
 
         my $free;
-        ($vol_id, $vol_path, $xattr, $free) = $query->fetchrow_array;
+        ($vol_id, $vol_host, $vol_path, $xattr, $free) = $query->fetchrow_array;
         $query->finish;
     };
@@ -1193 +1193 @@
     $log->debug( "leaving" );
 
-    return ($vol_id, $vol_path, $xattr);
+    return ($vol_id, $vol_host, $vol_path, $xattr);
 }
 

trunk/Nebulous-Server/lib/Test/Nebulous.pm

@@ -1 +1 @@
 # Copyright (C) 2004  Joshua Hoblitt
 #
-# $Id: Nebulous.pm,v 1.1 2008-03-20 21:13:28 jhoblitt Exp $
+# $Id: Nebulous.pm,v 1.2 2008-07-01 00:28:06 jhoblitt Exp $
 
 package Test::Nebulous;
@@ -51 +51 @@
 
     # node01/node02: allocate = TRUE
-    $dbh->do(qq{ INSERT INTO volume (vol_id, name, path, allocate, available) VALUES (1, 'node01', ?, TRUE, TRUE) }, undef, $dir1);
+    $dbh->do(qq{ INSERT INTO volume (vol_id, name, host, path, allocate, available) VALUES (1, 'node01', 'node01', ?, TRUE, TRUE) }, undef, $dir1);
     $dbh->do(qq{ INSERT INTO mount VALUES (?, 10e10, 10e7) }, undef, $dir1);
 
-    $dbh->do(qq{ INSERT INTO volume (vol_id, name, path, allocate, available) VALUES (2, 'node02', ?, TRUE, TRUE) }, undef, $dir2);
+    $dbh->do(qq{ INSERT INTO volume (vol_id, name, host, path, allocate, available) VALUES (2, 'node02', 'node02', ?, TRUE, TRUE) }, undef, $dir2);
     $dbh->do(qq{ INSERT INTO mount VALUES (?, 10e10, 10e8) }, undef, $dir2);
 
     # node03: allocate = TRUE, volume full
-    $dbh->do(qq{ INSERT INTO volume (vol_id, name, path, allocate, available) VALUES (3, 'node03', ?, TRUE, TRUE) }, undef, $dir3);
+    $dbh->do(qq{ INSERT INTO volume (vol_id, name, host, path, allocate, available) VALUES (3, 'node03', 'node03', ?, TRUE, TRUE) }, undef, $dir3);
     $dbh->do(qq{ INSERT INTO mount VALUES (?, 10e10, 10e10) }, undef, $dir3);
 
     # node04: allocate = FALSE, available = FALSE
-    $dbh->do(qq{ INSERT INTO volume (vol_id, name, path, allocate, available) VALUES (4, 'node04', ?, FALSE, FALSE) }, undef, $dir4);
+    $dbh->do(qq{ INSERT INTO volume (vol_id, name, host, path, allocate, available) VALUES (4, 'node04', 'node04', ?, FALSE, FALSE) }, undef, $dir4);
     $dbh->do(qq{ INSERT INTO mount VALUES (?, 10e10, 10e7) }, undef, $dir4);
 
     # node05: allocate = FALSE, available = TRUE
-    $dbh->do(qq{ INSERT INTO volume (vol_id, name, path, allocate, available) VALUES (5, 'node05', ?, FALSE, TRUE) }, undef, $dir5);
+    $dbh->do(qq{ INSERT INTO volume (vol_id, name, host, path, allocate, available) VALUES (5, 'node05', 'node05', ?, FALSE, TRUE) }, undef, $dir5);
     $dbh->do(qq{ INSERT INTO mount VALUES (?, 10e10, 10e7) }, undef, $dir5);
 
     # node06: allocate = TRUE, available = FALSE
-    $dbh->do(qq{ INSERT INTO volume (vol_id, name, path, allocate, available) VALUES (6, 'node06', ?, TRUE, FALSE) }, undef, $dir4);
+    $dbh->do(qq{ INSERT INTO volume (vol_id, name, host, path, allocate, available) VALUES (6, 'node06', 'node06', ?, TRUE, FALSE) }, undef, $dir4);
     $dbh->do(qq{ INSERT INTO mount VALUES (?, 10e10, 10e7) }, undef, $dir6);
 

trunk/Nebulous-Server/t/15_mounts.t

@@ -3 +3 @@
 # Copryight (C) 2008  Joshua Hoblitt
 #
-# $Id: 15_mounts.t,v 1.1 2008-03-21 01:25:21 jhoblitt Exp $
+# $Id: 15_mounts.t,v 1.2 2008-07-01 00:28:07 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 16;
+use Test::More tests => 18;
 
 use lib qw( ./t ./lib );
@@ -32 +32 @@
     my %row;
     # first row
-    @row{qw(mountpoint total used vol_id name path allocate available xattr)}
+    @row{qw(mountpoint total used vol_id name host path allocate available xattr)}
         = @{$mounts->[0]};
     
@@ -39 +39 @@
     is($row{vol_id},    1);
     is($row{name},      "node01");
+    is($row{host},      "node01");
     is($row{allocate},  1);
     is($row{available}, 1);
@@ -44 +45 @@
 
     # 2nd row
-    @row{qw(mountpoint total used vol_id name path allocate available xattr)}
+    @row{qw(mountpoint total used vol_id name host path allocate available xattr)}
         = @{$mounts->[1]};
 
@@ -51 +52 @@
     is($row{vol_id},    2);
     is($row{name},      "node02");
+    is($row{host},      "node02");
     is($row{allocate},  1);
     is($row{available}, 1);