Changeset 382

Timestamp:

08/25/06 03:49:54 (2 years ago)

Author:

marksmith

Message:

* don't let the query workers do anything if they haven't heard from

the monitoring job yet

Files:

• branches/server-newrepl/lib/MogileFS/ProcManager.pm (modified) (1 diff)
• branches/server-newrepl/lib/MogileFS/Worker/Query.pm (modified) (1 diff)

branches/server-newrepl/lib/MogileFS/ProcManager.pm

@@ -652 +652 @@
-sub send_monitor_has_run {
-    my $child = shift;
-
+ queryworker
-        MogileFS::ProcManager->ImmediateSendToChildrenByJob($type, ":monitor_has_run", $child);
-    }

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

@@ -166 +166 @@
-                                         undef, $dmid, $class)
-            or return $self->err_line("unreg_class");
+    }
+
+    # if we haven't heard from the monitoring job yet, we need to chill a bit
+    # to prevent a race where we tell a user that we can't create a file when
+    # in fact we've just not heard from the monitor
+    while (! $self->monitor_has_run) {
+        $self->read_from_parent;
+        $self->still_alive;
+        sleep 1;
-    }
-