Changeset 1325

Timestamp:

10/18/09 08:12:22 (6 weeks ago)

Author:

dormando

Message:

Don't warn without size arg, still warn on error

If a client doesn't specify size= to create_close, used to cause a warning and
not check if the file was stored correctly.

Now it supports doing either and will always test the file.

Files:

• trunk/server/lib/MogileFS/Worker/Query.pm (modified) (2 diffs)

trunk/server/lib/MogileFS/Worker/Query.pm

@@ -393 +393 @@
     my $size = MogileFS::HTTPFile->at($path)->size;
 
-    if ($args->{size} >= 0 && (!defined($size) || $size == MogileFS::HTTPFile::FILE_MISSING)) {
-        # size check has been requested and that storage node is unreachable or the file is missing
+    # size check is optional? Needs to support zero byte files.
+    $args->{size} = -1 unless $args->{size};
+    if (!defined($size) || $size == MogileFS::HTTPFile::FILE_MISSING) {
+        # storage node is unreachable or the file is missing
         my $type    = defined $size ? "missing" : "cantreach";
         my $lasterr = MogileFS::Util::last_error();
@@ -401 +403 @@
 
     return $self->err_line("size_mismatch", "Expected: $args->{size}; actual: $size; path: $path")
-        if $args->{size} && ($args->{size} != $size);
+        if $args->{size} > -1 && ($args->{size} != $size);
 
     # TODO: check for EIO?