Changeset 25051 for branches/czw_branch/cleanup/Nebulous-Server/lib/Nebulous/Server.pm

Timestamp:

Aug 11, 2009, 3:54:00 PM (17 years ago)

Author:

watersc1

Message:

Bringing branch up-to-date at revision 25049

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• Nebulous-Server/lib/Nebulous/Server.pm (modified) (3 diffs)

branches/czw_branch/cleanup/Nebulous-Server/lib/Nebulous/Server.pm

@@ -696 +696 @@
     $log->debug("entered - @_");
 
-    my ($key, $vol_name) = validate_pos(@_,
+    my ($key, $dest_vol_name) = validate_pos(@_,
         {
             type        => SCALAR,
@@ -726 +726 @@
     # instance on it.  If all avilable volume already have an instance on them
     # then we should throw an error 
-
-    # vol_name overrides the key implied volume
-    eval {
-        $key = parse_neb_key($key, $vol_name);
+    # volume names implied as part of the key are *IGNORED* as the source and
+    # *SHOULD NOT* be used as the destination either
+
+    eval {
+        $key = parse_neb_key($key);
     };
     $log->logdie("$@") if $@;
-    $vol_name = $key->volume;
 
     my $db  = $self->db($key);
 
-    if (defined $vol_name
+    # puke if the source volume is bogus, we may want to actually use this as
+    # the instance to be copied later
+    if (defined $key->volume
         and not $self->_is_valid_volume_name($key, $key->volume)) {
         unless ($key->hard_volume) {
-            $log->warn( "$vol_name is not a known volume name" );
-            $vol_name = undef;
+            $log->warn($key->volume . " not a known volume name");
         } else {
-           $log->logdie("$vol_name is not a valid volume name");
-        }
+           $log->logdie("$key is not a valid volume name");
+        }
+    }
+    # puke if the source volume is bogus, we may want to actually use this as
+    # the instance to be copied later
+    if (defined $dest_vol_name
+        and not $self->_is_valid_volume_name($key, $dest_vol_name)) {
+           $log->logdie($key->volume . " is not a valid volume name");
     }
         
     my ($vol_id, $vol_host, $vol_path, $vol_xattr);
-    if (defined $vol_name) {
+    if (defined $dest_vol_name) {
         ($vol_id, $vol_host, $vol_path, $vol_xattr)
-            = $self->_get_storage_volume($key, $vol_name);
+            = $self->_get_storage_volume($key, $dest_vol_name);
     } else {
         ($vol_id, $vol_host, $vol_path, $vol_xattr)
@@ -810 +817 @@
             $db->rollback;
             # handle soft volumes
-            if (defined $vol_name and not defined $key->hard_volume) {
+            if (defined $dest_vol_name and not defined $key->hard_volume) {
                 $log->debug("retrying with 'any' volume");
                 return $self->replicate_object($key->path, 'any');