Changeset 356

Timestamp:

08/17/06 19:18:38 (2 years ago)

Author:

marksmith

Message:

* add 'replicate_now' command which makes due all deferred replications
* add stats to replication output for new style file_to_replicate table

Files:

• branches/server-newrepl/lib/MogileFS/Worker/Query.pm (modified) (3 diffs)

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

@@ -158 +158 @@
-
-    # figure out what classid this file is for
-
+ || ""
-    my $classid = 0;
-    if (length($class)) {
@@ -1032 +1032 @@
-        }
-        $ret->{"replicationcount"} = $count;
+
+        # now we want to do the "new" replication stats
+        my $db_time = $dbh->selectrow_array('SELECT UNIX_TIMESTAMP()');
+        $stats = $dbh->selectall_arrayref('SELECT nexttry, COUNT(*) FROM file_to_replicate GROUP BY 1');
+        foreach my $stat (@$stats) {
+            if ($stat->[0] < 1000) {
+                # anything under 1000 is a specific state, so let's define those.  here's the list
+                # of short names to describe them.
+                my $name = {
+                    0 => 'newfile', # new files that need to be replicated
+                    1 => 'redo',    # files that need to go through replication again
+                }->{$stat->[0]} || "unknown";
+
+                # now put it in the output hashref.  note that we do += because we might
+                # have more than one group of unknowns.
+                $ret->{"to_replicate_$name"} += $stat->[1];
+
+            } elsif ($stat->[0] == MogileFS::Worker::Replicate::end_of_time()) {
+                $ret->{"to_replicate_manually"} = $stat->[1];
+
+            } elsif ($stat->[0] < $db_time) {
+                $ret->{"to_replicate_overdue"} += $stat->[1];
+
+            } else {
+                $ret->{"to_replicate_deferred"} += $stat->[1];
+            }
+        }
-    }
-
@@ -1075 +1102 @@
-    my MogileFS::Worker::Query $self = shift;
-    my $args = shift;
+    return $self->ok_line;
+}
+
+sub cmd_replicate_now {
+    my MogileFS::Worker::Query $self = shift;
+
+    my $dbh = Mgd::get_dbh()
+        or return $self->err_line('nodb');
+    $dbh->do("UPDATE file_to_replicate SET nexttry = UNIX_TIMESTAMP() WHERE nexttry > UNIX_TIMESTAMP()");
+
-    return $self->ok_line;
-}