From 4eeed18eb6f100f04e8bbae6c0a0daf79cda8f30 Mon Sep 17 00:00:00 2001
From: warner <warner@lothar.com>
Date: Mon, 13 Aug 2007 03:15:19 +0100
Subject: [PATCH] BuildSlave: keep track of lastMessageReceived for each slave

---
 ChangeLog                     | 17 +++++++++++++++++
 buildbot/buildslave.py        |  7 +++++++
 buildbot/process/base.py      |  1 +
 buildbot/process/buildstep.py |  6 ++++++
 buildbot/test/runutils.py     |  2 ++
 buildbot/test/test_steps.py   |  2 ++
 6 files changed, 35 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2e383fd..f456996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2007-08-12  Brian Warner  <warner@lothar.com>
 
+	* buildbot/buildslave.py (BuildSlave.messageReceivedFromSlave):
+	use the BuildSlave to keep track of the last time we've heard from
+	the buildslave. This is updated upon receipt of any message from
+	any SlaveBuilder (which generally means when RemoteCommands are
+	giving us status updates, as BuildSteps run). In the future this
+	will include slave pings too.
+	* buildbot/process/base.py
+	(Build.setupBuild): give each BuildStep a reference to the BuildSlave
+	* buildbot/process/buildstep.py:
+	(BuildStep.setBuildSlave): accept that reference
+	(BuildStep.runCommand): pass the reference on to the RemoteCommand
+	(RemoteCommand.remote_update): update the timestamp
+	(RemoteCommand.remote_complete): same
+	* buildbot/test/runutils.py (StepTester.makeStep): match the change
+	* buildbot/test/test_steps.py (BuildStep.testShellCommand1): same
+
+
 	* buildbot/status/web/baseweb.py (OneLineMixin.make_line): tighten
 	up the format a bit
 	(OneLinePerBuild.body): use a <ul> instead of <div>s
diff --git a/buildbot/buildslave.py b/buildbot/buildslave.py
index 4e5d0c6..ccb2d22 100644
--- a/buildbot/buildslave.py
+++ b/buildbot/buildslave.py
@@ -1,4 +1,5 @@
 
+import time
 from twisted.python import log
 from twisted.internet import defer, reactor
 
@@ -34,6 +35,7 @@ class BuildSlave(NewCredPerspective):
         self.slave_commands = None
         self.slavebuilders = []
         self.max_builds = max_builds
+        self.lastMessageReceived = 0
 
     def update(self, new):
         """
@@ -138,6 +140,7 @@ class BuildSlave(NewCredPerspective):
             self.slave_commands = state.get("slave_commands")
             self.slave = bot
             log.msg("bot attached")
+            self.messageReceivedFromSlave()
             return self.updateSlave()
         d.addCallback(_accept_slave)
 
@@ -146,6 +149,10 @@ class BuildSlave(NewCredPerspective):
         d.addCallback(lambda res: self)
         return d
 
+    def messageReceivedFromSlave(self):
+        now = time.time()
+        self.lastMessageReceived = now
+
     def detached(self, mind):
         self.slave = None
         self.slave_status.setConnected(False)
diff --git a/buildbot/process/base.py b/buildbot/process/base.py
index d4951d1..72d7a0d 100644
--- a/buildbot/process/base.py
+++ b/buildbot/process/base.py
@@ -354,6 +354,7 @@ class Build:
                         % (factory, args))
                 raise
             step.setBuild(self)
+            step.setBuildSlave(self.slavebuilder.slave)
             step.setDefaultWorkdir(self.workdir)
             name = step.name
             count = 1
diff --git a/buildbot/process/buildstep.py b/buildbot/process/buildstep.py
index 73ea8d0..f38634d 100644
--- a/buildbot/process/buildstep.py
+++ b/buildbot/process/buildstep.py
@@ -152,6 +152,7 @@ class RemoteCommand(pb.Referenceable):
         @type  updates: list of [object, int]
         @param updates: list of updates from the remote command
         """
+        self.buildslave.messageReceivedFromSlave()
         max_updatenum = 0
         for (update, num) in updates:
             #log.msg("update[%d]:" % num)
@@ -179,6 +180,7 @@ class RemoteCommand(pb.Referenceable):
 
         @rtype: None
         """
+        self.buildslave.messageReceivedFromSlave()
         # call the real remoteComplete a moment later, but first return an
         # acknowledgement so the slave can retire the completion message.
         if self.active:
@@ -583,6 +585,9 @@ class BuildStep:
         # afterwards.
         self.build = build
 
+    def setBuildSlave(self, buildslave):
+        self.buildslave = buildslave
+
     def setDefaultWorkdir(self, workdir):
         # the Build calls this just after __init__ and setDefaultWorkdir.
         # ShellCommand and variants use a slave-side workdir, but some other
@@ -887,6 +892,7 @@ class BuildStep:
         self.step_status.addURL(name, url)
 
     def runCommand(self, c):
+        c.buildslave = self.buildslave
         d = c.run(self, self.remote)
         return d
 
diff --git a/buildbot/test/runutils.py b/buildbot/test/runutils.py
index d56cb42..57dbbc8 100644
--- a/buildbot/test/runutils.py
+++ b/buildbot/test/runutils.py
@@ -6,6 +6,7 @@ from twisted.python import log, util
 
 from buildbot import master, interfaces
 from buildbot.slave import bot
+from buildbot.buildslave import BuildSlave
 from buildbot.process.builder import Builder
 from buildbot.process.base import BuildRequest, Build
 from buildbot.process.buildstep import BuildStep
@@ -405,6 +406,7 @@ class StepTester:
     workdir = "build"
     def makeStep(self, factory, **kwargs):
         step = makeBuildStep(self.masterbase, factory, **kwargs)
+        step.setBuildSlave(BuildSlave("name", "password"))
         step.setDefaultWorkdir(self.workdir)
         return step
 
diff --git a/buildbot/test/test_steps.py b/buildbot/test/test_steps.py
index f3a8b25..3351d81 100644
--- a/buildbot/test/test_steps.py
+++ b/buildbot/test/test_steps.py
@@ -21,6 +21,7 @@ from twisted.internet import reactor, defer
 
 from buildbot.sourcestamp import SourceStamp
 from buildbot.process import buildstep, base, factory
+from buildbot.buildslave import BuildSlave
 from buildbot.steps import shell, source, python
 from buildbot.status import builder
 from buildbot.status.builder import SUCCESS, FAILURE
@@ -100,6 +101,7 @@ class BuildStep(unittest.TestCase):
         buildstep.RemoteCommand.commandCounter[0] = 3
         c = MyShellCommand(workdir=dir, command=cmd, timeout=10)
         c.setBuild(self.build)
+        c.setBuildSlave(BuildSlave("name", "password"))
         self.assertEqual(self.remote.events, self.expectedEvents)
         c.step_status = self.build_status.addStepWithName("myshellcommand")
         d = c.startStep(self.remote)
-- 
2.11.4.GIT