Merge lp:~bigkevmcd/offspring/monitoring-endpoint-as-slaves-scanned into lp:offspring

[Kevin McDermott]

This adds /builds/ and /builders/ to allow checking of the master-slave communication, which is the most common failure point at the moment.

[Nicola Heald (notnownikki)]

Looks ok to me, +1

review: Approve

=== modified file 'lib/offspring/web/queuemanager/models.py'
--- lib/offspring/web/queuemanager/models.py	2013-01-04 17:45:17 +0000
+++ lib/offspring/web/queuemanager/models.py	2013-01-22 10:09:19 +0000
@@ -489,3 +489,13 @@
     cutoff = datetime.utcnow() - period
     query = dict(finished_at__gte=cutoff)
     return BuildResult.objects.filter(**query)
+
+
+def get_updated_builders(period):
+    """
+    Return the builders that have been updated within the specified period (a
+    datetime.timedelta).
+    """
+    cutoff = datetime.utcnow() - period
+    query = dict(updated_at__gte=cutoff)
+    return Lexbuilder.objects.filter(**query)
 
=== modified file 'lib/offspring/web/queuemanager/tests/test_models.py'
--- lib/offspring/web/queuemanager/tests/test_models.py	2013-01-04 17:45:17 +0000
+++ lib/offspring/web/queuemanager/tests/test_models.py	2013-01-22 10:09:19 +0000
@@ -10,7 +10,8 @@
 
 from offspring.enums import ProjectBuildStates
 
-from offspring.web.queuemanager.models import ProjectGroup, get_completed_builds
+from offspring.web.queuemanager.models import (
+    ProjectGroup, get_completed_builds, get_updated_builders, Lexbuilder)
 from offspring.web.queuemanager.tests.factory import factory
 from offspring.web.queuemanager.tests.helpers import (
     create_build_results_with_durations
@@ -178,7 +179,7 @@
 
 
 
-class UtilityFunctionTests(TestCase):
+class UtilityFunctionTests(MockerTestCase, TestCase):
 
     def test_get_completed_builds(self):
         """
@@ -195,3 +196,16 @@
             finished_at=started_at + timedelta(minutes=30),
             builder=None)
         self.assertEqual(2, get_completed_builds(timedelta(hours=1)).count())
+
+    def test_get_updated_builders(self):
+        """
+        get_updated_builders(timedelta(minutes=10)) should return all
+        Lexbuilders which have been updated within the last 10 minutes.
+        """
+        builder1 = factory.make_lexbuilder()
+        # This cheats the updated_at autonow value.
+        Lexbuilder.objects.filter(pk=builder1.pk).update(
+            updated_at=datetime.utcnow() - timedelta(minutes=12))
+        builder2 = factory.make_lexbuilder()
+        builder3 = factory.make_lexbuilder()
+        self.assertEqual(2, get_updated_builders(timedelta(minutes=10)).count())
 
=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2013-01-07 11:24:34 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2013-01-22 10:09:19 +0000
@@ -11,9 +11,7 @@
 
 from offspring.enums import ProjectBuildStates
 from offspring.web.queuemanager.models import (
-    LaunchpadProject,
-    ProjectGroup,
-)
+    LaunchpadProject, ProjectGroup, Lexbuilder)
 from offspring.web.queuemanager.forms import (
     LaunchpadProjectForm,
     ProjectGroupForm,
@@ -525,11 +523,11 @@
                             project_group2.name)
 
 
-class AliveViewsTests(TestCase):
+class AliveBuildsViewTests(TestCase):
 
     def setUp(self):
         self.view_url = reverse(
-            "offspring.web.queuemanager.views.alive")
+            "offspring.web.queuemanager.views.alive_builds")
         self.user = factory.make_user()
         project = factory.make_project()
         started_at = datetime.utcnow() - timedelta(hours=2)
@@ -543,8 +541,8 @@
 
     def test_alive_returns_build_count(self):
         """
-        Fetching the /alive URL returns the number of builds completed in the
-        last hour.
+        Fetching the /alive/builds/ URL returns the number of builds completed
+        in the last hour.
         """
         response = self.client.get(self.view_url)
         self.assertEqual("2", response.content)
@@ -556,3 +554,31 @@
         """
         response = self.client.get(self.view_url, {"hours": 2})
         self.assertEqual("3", response.content)
+
+
+class AliveBuildersViewTests(TestCase):
+
+    def setUp(self):
+        self.view_url = reverse(
+            "offspring.web.queuemanager.views.alive_builders")
+        builder1 = factory.make_lexbuilder()
+        Lexbuilder.objects.filter(pk=builder1.pk).update(
+            updated_at=datetime.utcnow() - timedelta(minutes=12))
+        builder2 = factory.make_lexbuilder()
+        builder3 = factory.make_lexbuilder()
+
+    def test_alive_returns_updates_builders_count(self):
+        """
+        Fetching the /alive/builders/ URL returns the number of builders
+        updated within the 10 minutes.
+        """
+        response = self.client.get(self.view_url)
+        self.assertEqual("2", response.content)
+
+    def test_alive_with_optional_duration(self):
+        """
+        It's possible to specify a duration, which is used as a timedelta for
+        the alive url.
+        """
+        response = self.client.get(self.view_url, {"minutes": 15})
+        self.assertEqual("3", response.content)
 
=== modified file 'lib/offspring/web/queuemanager/views.py'
--- lib/offspring/web/queuemanager/views.py	2013-01-07 11:29:44 +0000
+++ lib/offspring/web/queuemanager/views.py	2013-01-22 10:09:19 +0000
@@ -58,6 +58,7 @@
     Project,
     ProjectGroup,
     Release,
+    get_updated_builders,
     get_completed_builds,
 )
 
@@ -389,7 +390,20 @@
     "queuemanager.add_launchpadproject")(launchpad_project_create)
 
 
-def alive(request):
+def alive_builders(request):
+    """
+    Returns the number of slaves updated in the last 10 minutes, useful for
+    checking the "alive" status of Offspring.
+
+    Optionally accepts a number of minutes as a parameter to use for the
+    timedelta.
+    """
+    minutes = int(request.GET.get("minutes", 10))
+    return HttpResponse(
+        str(get_updated_builders(timedelta(minutes=minutes)).count()))
+
+
+def alive_builds(request):
     """
     Returns the number of completed builds in the last hour, useful for checking
     the "alive" status of Offspring.
 
=== modified file 'lib/offspring/web/urls.py'
--- lib/offspring/web/urls.py	2013-01-02 17:18:09 +0000
+++ lib/offspring/web/urls.py	2013-01-22 10:09:19 +0000
@@ -97,7 +97,8 @@
     (r'^schedule/\+api/milestones/$', milestone_handler),
     (r'^schedule/\+(?P<milestoneType>[^/]+)-milestones$', 'offspring.web.queuemanager.views.milestones'),
     (r'^schedule/$', 'offspring.web.queuemanager.views.schedule'),
-    (r'^alive/', 'offspring.web.queuemanager.views.alive'),
+    (r'^alive/builders/', 'offspring.web.queuemanager.views.alive_builders'),
+    (r'^alive/builds/', 'offspring.web.queuemanager.views.alive_builds'),
     (r'^$', 'offspring.web.queuemanager.views.projects'),
 )