nodeadmin: node stops itself if a hotline file hasn't been touched in 60 seconds now, instead of in 40 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.
This commit is contained in:
Zooko O'Whielacronx 2009-02-12 15:21:31 -07:00
parent 76d7cc4404
commit 8303f90da0
2 changed files with 2 additions and 2 deletions

View File

@ -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")

View File

@ -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("")