Changeset 16221 for trunk/Nebulous-Server/lib/Nebulous/Server.pm

Timestamp:

Jan 24, 2008, 3:54:37 PM (18 years ago)

Author:

jhoblitt

Message:

add Nebulous::Sever:: neb key/uri support

File:

• trunk/Nebulous-Server/lib/Nebulous/Server.pm (modified) (13 diffs)

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.46 2008-01-23 00:46:06 jhoblitt Exp $
+# $Id: Server.pm,v 1.47 2008-01-25 01:53:28 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -158 +158 @@
     $log->debug( "entered - @_" );
 
+    {
+        my $volume;
+        ($volume, $key) = parse_neb_key($key);
+#        if (defined $volume) {
+#            die "$volume is not a valid volume name"
+#                unless $self->_is_valid_volume_name($volume);
+#        }
+        $vol_name ||= $volume;
+
+    }
+
     my ($uri, $vol_id);
     eval {
@@ -257 +268 @@
     $log->debug("entered - @_");
 
+    # ignore volumes
+    $key    = parse_neb_key($key);
+    $newkey = parse_neb_key($newkey);
+
     eval {
         # rename storage_object
@@ -309 +324 @@
 
     $log->debug("entered - @_");
+
+    {
+        my $volume;
+        ($volume, $key) = parse_neb_key($key);
+        if (defined $volume) {
+            die "$volume is not a valid volume name"
+                unless $self->_is_valid_volume_name($volume);
+        }
+        $vol_name ||= $volume;
+    }
 
     my ($uri, $vol_id);
@@ -395 +420 @@
 
     $log->debug( "entered - @_" );
+
+    # ignore volume
+    $key = parse_neb_key($key);
 
     my $so_id;
@@ -495 +523 @@
     $log->debug( "entered - @_" );
 
+    # ignore volume
+    $key = parse_neb_key($key);
+
     my $so_id;
     my $read_lock;
@@ -604 +635 @@
     $log->debug("entered - @_");
 
+    # ignore volume
+    $key = parse_neb_key($key);
+
     eval {
         my $query;
@@ -672 +706 @@
     $log->debug("entered - @_");
 
+    # ignore volume
+    $key = parse_neb_key($key);
+
     my $query;
     eval {
@@ -718 +755 @@
     $log->debug("entered - @_");
 
+    # ignore volume
+    $key = parse_neb_key($key);
+
     my $query;
     eval {
@@ -763 +803 @@
     $log->debug("entered - @_");
 
+    # ignore volume
+    $key = parse_neb_key($key);
+
     my $query;
     eval {
@@ -862 +905 @@
 
     $log->debug("entered - @_");
+
+    {
+        my $volume;
+        ($volume, $key) = parse_neb_key($key);
+        if (defined $volume) {
+            die "$volume is not a valid volume name"
+                unless $self->_is_valid_volume_name($volume);
+        }
+        $vol_name ||= $volume;
+    }
 
     my $query;
@@ -1008 +1061 @@
     $log->debug("entered - @_");
 
+    # ignore volume
+    $key = parse_neb_key($key);
+
     my $stat;
     eval {
@@ -1055 +1111 @@
             # %free, name, avaiable, allocate
             $rows = $query->execute(0.95, $name, 1, 1);
+            # XXX destinguish between non-existant and unaviable
             unless ($rows > 0) {
                 $query->finish;