Changeset 1242 for branches

Timestamp:

12/23/08 13:33:08 (11 months ago)

Author:

hachi

Message:

Empty files work now

Location:

branches/empty-files/server

Files:

• lib/MogileFS/DevFID.pm (modified) (1 diff)
• lib/MogileFS/HTTPFile.pm (modified) (1 diff)
• lib/MogileFS/Worker/Query.pm (modified) (3 diffs)
• lib/MogileFS/Worker/Replicate.pm (modified) (2 diffs)
• t/00-startup.t (modified) (2 diffs)

branches/empty-files/server/lib/MogileFS/DevFID.pm

@@ -72 +72 @@
     my $self = shift;
     my $fid = $self->fid;
-    my $disk_size = $self->size_on_disk
-        or return 0;
+    my $disk_size = $self->size_on_disk;
+
+    return 0 if $disk_size == MogileFS::HTTPFile::FILE_MISSING;
+
     return $disk_size == $fid->length;
 }

branches/empty-files/server/lib/MogileFS/HTTPFile.pm

@@ -120 +120 @@
 # returns 0 on file missing (404 or -1 from sidechannel),
 # returns undef on connectivity error
-use constant FILE_MISSING => 0;
+use constant FILE_MISSING => -1;
 sub size {
     my $self = shift;

branches/empty-files/server/lib/MogileFS/Worker/Query.pm

@@ -9 +9 @@
 use MogileFS::Util qw(error error_code first weighted_list
                       device_state eurl decode_url_args);
+use MogileFS::HTTPFile;
 
 sub new {
@@ -386 +387 @@
     my $size = MogileFS::HTTPFile->at($path)->size;
 
-    if ($args->{size} > 0 && ! $size) {
-        # size is either: 0 (file doesn't exist) or undef (host unreachable)
+    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
         my $type    = defined $size ? "missing" : "cantreach";
         my $lasterr = MogileFS::Util::last_error();
@@ -397 +398 @@
 
     # TODO: check for EIO?
-    return $self->err_line("empty_file") unless $size;
 
     # insert file_on row

branches/empty-files/server/lib/MogileFS/Worker/Replicate.pm

@@ -838 +838 @@
         $clen = $1;
     }
-    return $error_unreachable->("File $spath has a content-length of 0; unable to replicate")
-        unless $clen;
     return $error_unreachable->("File $spath has unexpected content-length of $clen, not $expected_clen")
         if defined $expected_clen && $clen != $expected_clen;
@@ -857 +855 @@
     my $finished_read = 0;
 
-    while (!$pipe_closed && (my $bytes = $sock->read($data, $bytes_to_read))) {
-        # now we've read in $bytes bytes
-        $remain -= $bytes;
-        $bytes_to_read = $remain if $remain < $bytes_to_read;
-
-        my $wbytes = $dsock->send($data);
-        $written  += $wbytes;
-        return $dest_error->("Error: wrote $wbytes; expected to write $bytes; failed putting to $dpath")
-            unless $wbytes == $bytes;
-        $intercopy_cb->();
-
-        die if $bytes_to_read < 0;
-        next if $bytes_to_read;
+    if ($bytes_to_read) {
+        while (!$pipe_closed && (my $bytes = $sock->read($data, $bytes_to_read))) {
+            # now we've read in $bytes bytes
+            $remain -= $bytes;
+            $bytes_to_read = $remain if $remain < $bytes_to_read;
+
+            my $wbytes = $dsock->send($data);
+            $written  += $wbytes;
+            return $dest_error->("Error: wrote $wbytes; expected to write $bytes; failed putting to $dpath")
+                unless $wbytes == $bytes;
+            $intercopy_cb->();
+
+            die if $bytes_to_read < 0;
+            next if $bytes_to_read;
+            $finished_read = 1;
+            last;
+        }
+    } else {
+        # 0 byte file copy.
         $finished_read = 1;
-        last;
     }
     return $dest_error->("closed pipe writing to destination")     if $pipe_closed;

branches/empty-files/server/t/00-startup.t

@@ -21 +21 @@
 my $sto = eval { temp_store(); };
 if ($sto) {
-    plan tests => 59;
+    plan tests => 64;
 } else {
     plan skip_all => "Can't create temporary test database: $@";
@@ -109 +109 @@
 }
 
+{
+    my $fh = $mogc->new_file('no_content', "2copies");
+    ok(close($fh), "closed file");
+}
+
+{
+    my $fh = $mogc->new_file('no_content', "2copies");
+    ok(close($fh), "closed file");
+}
+
+# wait for it to replicate
+ok(try_for(10, sub {
+    my @urls = $mogc->get_paths("no_content");
+    my $nloc = @urls;
+    if ($nloc < 2) {
+        diag("no_content still only on $nloc devices");
+        return 0;
+    }
+    return 1;
+}), "replicated to 2 paths");
+
+ok(try_for(3, sub {
+    my $to_repl_rows = $dbh->selectrow_array("SELECT COUNT(*) FROM file_to_replicate");
+    return $to_repl_rows == 0;
+}), "no more files to replicate");
+
+# quick delete test
+ok($mogc->delete("no_content"), "deleted no_content")
+    or die "Error: " . $mogc->errstr;
+
 # create two sample files
 my $data = "My test file.\n" x 1024;