Changeset 342

Timestamp:

08/11/06 03:20:15 (2 years ago)

Author:

bradfitz

Message:

make create_close insert into files_to_replicate, and make the
replicator job use that, then make the test suite verify it was used.

Files:

• branches/server-newrepl/lib/MogileFS/Worker/Monitor.pm (modified) (2 diffs)
• branches/server-newrepl/lib/MogileFS/Worker/Query.pm (modified) (1 diff)
• branches/server-newrepl/lib/MogileFS/Worker/Replicate.pm (modified) (7 diffs)
• branches/server-newrepl/t/00-startup.t (modified) (3 diffs)

branches/server-newrepl/lib/MogileFS/Worker/Monitor.pm

@@ -1 +1 @@
-package MogileFS::Worker::Monitor;
-# deletes files
-
-use strict;
@@ -28 +27 @@
-    every(2.5, sub {
-        $self->parent_ping;
-        $self->read_from_parent;
-
-        # get db and note we're starting a run

branches/server-newrepl/lib/MogileFS/Worker/Query.pm

@@ -325 +325 @@
-                      $fid, $dmid, $key, $size, $trow->{classid});
-    return $self->err_line("db_error") unless $rv;
+
+    # mark it as needing replicating:
+    $dbh->do("INSERT IGNORE INTO file_to_replicate ".
+             "SET fid=?, fromdevid=?, nexttry=0", undef, $fid, $devid);
+    return $self->err_line("db_error") if $dbh->err;
-
-    $dbh->do("DELETE FROM tempfile WHERE fid=?", undef, $fid);

branches/server-newrepl/lib/MogileFS/Worker/Replicate.pm

@@ -95 +95 @@
-    } @$to_repl;
-
-
-    foreach my $todo (@$to_repl) {
-        my $fid = $todo->{fid};
+        warn "to repl (new): $fid\n";
-
-        my $errcode;
-
-
+
+
-            # $status is either 0 (failure, handled below), 1 (success, we actually
-            # replicated this file), or 2 (success, but someone else replicated it).
+
-            # so if it's 2, we just want to go to the next fid.  this file is done.
+            # somebody else presumably took care of the file_to_replicate maintenance
+            if ($status == 2) {
+                $unlock->() if $unlock;
+                next;
+            }
+
+            # replicate was a success, so cleanup table, then unlock
-            warn "  new repl: $fid status = $status\n";
-
+
+
+
-        } else {
-            warn "  new repl: $fid status = 0\n";
-            error("ERROR CODE: $errcode");
+            $unlock->() if $unlock;
-        }
-    }
@@ -170 +182 @@
-                $self->read_from_parent;
-
-
+class => 
-                    # $status is either 0 (failure, handled below), 1 (success, we actually
-                    # replicated this file), or 2 (success, but someone else replicated it).
@@ -205 +217 @@
-# $policy_class is optional (perl classname representing replication policy).  if present, used.  if not, looked up based on $fid.
-sub replicate {
-
+
+
+
+
+
+
-    $mclass ||= MogileFS::Class->of_fid($fid);
-
@@ -213 +230 @@
-        return error("Failed to load policy class: $policy_class: $@");
-    }
+
+    # hashref of devid -> $device_row_href  (where devid is alive)
+    my $devs = Mgd::get_device_summary();
+    return error("Device information from get_device_summary is empty")
+        unless $devs && %$devs;
-
-    my $lockname = "mgfs:fid:$fid:replicate";
@@ -219 +241 @@
-    return error("Unable to obtain lock $lockname")
-        unless $lock;
-
-    # hashref of devid -> $device_row_href  (where devid is alive)
-    my $devs = Mgd::get_device_summary();
-    return error("Device information from get_device_summary is empty")
-        unless $devs && %$devs;
-
-    # learn what devices this file is already on
@@ -245 +262 @@
-    }
-
+    my $unlock = sub {
+        $dbh->selectrow_array("SELECT RELEASE_LOCK(?)", undef, $lockname);
+    };
+
-    my $retunlock = sub {
-        my $rv = shift;
@@ -254 +275 @@
-        }
-        $$errref = $errcode if $errref;
-
-
+
+
+
+
+
+
+
+
-    };
-

branches/server-newrepl/t/00-startup.t

@@ -24 +24 @@
-my $tempdb = create_temp_db();
-isa_ok $tempdb, "DBHandle";
+my $dbh = $tempdb->dbh;
-
-my $rv;
@@ -97 +98 @@
-my $tries = 1;
-my @urls;
-
+++
-    sleep 1;
-}
@@ -112 +113 @@
-ok(unlink($path1), "deleted path $path1");
-my $dead_url = $urls[0];
-2
+1
-    @urls = $mogc->get_paths("file1");
-
+ (try $_)
-}
-
+my $to_repl_rows = $dbh->selectrow_array("SELECT COUNT(*) FROM file_to_replicate");
+is($to_repl_rows, 0, "no more files to replicate");
-
-
-