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

Timestamp:

Jun 9, 2009, 2:42:18 PM (17 years ago)

Author:

jhoblitt

Message:

rename Nebulous::Key->soft_volume Nebulous::Key->hard_volume and invert the semantics

File:

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

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

@@ -229 +229 @@
     if (defined $vol_name
         and not $self->_is_valid_volume_name($key, $key->volume)) {
-        if ($key->soft_volume) {
+        unless ($key->hard_volume) {
             $log->warn( "$vol_name is not a known volume name" );
             $vol_name = undef;
@@ -238 +238 @@
         
     my ($vol_id, $vol_host, $vol_path, $vol_xattr)
-        = $self->_get_storage_volume($key, $vol_name, $key->soft_volume);
+        = $self->_get_storage_volume($key, $vol_name, $key->hard_volume);
 
     my $parent_id = $self->_resolve_dir_parent_id(key => $key, create => 1);
@@ -705 +705 @@
     if (defined $vol_name
         and not $self->_is_valid_volume_name($key, $key->volume)) {
-        if ($key->soft_volume) {
+        unless ($key->hard_volume) {
             $log->warn( "$vol_name is not a known volume name" );
             $vol_name = undef;
@@ -777 +777 @@
             $db->rollback;
             # handle soft volumes
-            if (defined $vol_name and defined $key->soft_volume) {
+            if (defined $vol_name and not defined $key->hard_volume) {
                 $log->debug("retrying with 'any' volume");
                 return $self->replicate_object($key->path, 'any');
@@ -1446 +1446 @@
     my $sql = $self->sql;
 
-    unless ($key) {
-        $log->warn("key was undefined after validate_pos(), trying again...");
-        return $self->find_instances(@_);
-    }
+#    unless ($key) {
+#        $log->warn("key was undefined after validate_pos(), trying again...");
+#        return $self->find_instances(@_);
+#    }
 
     # vol_name overrides the key implied volume
@@ -1464 +1464 @@
     if (defined $vol_name
         and not $self->_is_valid_volume_name($key, $key->volume)) {
-        if ($key->soft_volume) {
+        if ($key->hard_volume) {
+            $log->logdie("$vol_name is not a valid volume name");
+        } else {
             $log->warn( "$vol_name is not a known volume name" );
             $vol_name = undef;
-        } else {
-            $log->logdie("$vol_name is not a valid volume name");
         }
     }
@@ -1501 +1501 @@
         $db->rollback;
         # handle soft volumes
-        if (defined $vol_name and defined $key->soft_volume) {
+        if (defined $vol_name and not defined $key->hard_volume) {
             $log->debug("retrying with 'any' volume");
             return $self->find_instances($key->path, 'any');
@@ -1794 +1794 @@
     use warnings;
 
-    my ($key, $name, $soft_volume) = @_;
+    my ($key, $name, $hard_volume) = @_;
 
     my $sql = $self->sql;
@@ -1813 +1813 @@
                 # if a volume name was specified, and is soft, and we failed to
                 # find it, fall back to any volume
-                if ($soft_volume) {
+                unless ($hard_volume) {
                     ($vol_id, $vol_host, $vol_path, $xattr) = $self->_get_storage_volume($key);
                     return; # this just returns out of the eval not from the subroutine
@@ -1831 +1831 @@
             unless ($rows > 0) {
                 $query->finish;
-                $log->logdie("no storage volume is available for key: $key volume: $name soft: $soft_volume");
+                $log->logdie("no storage volume is available for key: $key volume: $name hard_volume: $hard_volume");
             }
         }
@@ -1962 +1962 @@
     my $sql = $self->sql;
 
+    # the volume name implied by the key is ignored.  $key is only needed to
+    # select a database connection
     eval {
         $key = parse_neb_key($key);