nodeadmin: node stops itself if a hotline file hasn't been touched in 60 seconds...

A test failed on draco (MacPPC) because it took 49 seconds to get around to running the test, and the node had already stopped itself when the hotline file was 40 seconds old.

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 73849c988e4fc4baf7e58167af16b75fe6b50418..b8577978e62197e3e2582424dc2c735382254e0a 100644 (file)
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -295,7 +295,7 @@ class Client(node.Node, pollmixin.PollMixin):
     def _check_hotline(self, hotline_file):
         if os.path.exists(hotline_file):
             mtime = os.stat(hotline_file)[stat.ST_MTIME]
-            if mtime > time.time() - 40.0:
+            if mtime > time.time() - 60.0:
                 return
             else:
                 self.log("hotline file too old, shutting down")

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index ac3f88b6fe61917f814a73322171952c46459745..9ced2a71d9d623d11fb63f1e742a9c34f2f69efe 100644 (file)
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -405,7 +405,7 @@ class RunNode(unittest.TestCase, pollmixin.PollMixin, common_util.SignalMixin,
         def _cb(res):
             out, err, rc_or_sig = res
             self.failUnlessEqual(rc_or_sig, 0)
-            # By writing this file, we get forty seconds before the client will exit. This insures
+            # By writing this file, we get sixty seconds before the client will exit. This insures
             # that even if the 'stop' command doesn't work (and the test fails), the client should
             # still terminate.
             open(HOTLINE_FILE, "w").write("")