Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: third_party/buildbot_8_4p1/buildbot/status/web/status_json.py

Issue 1383143003: Remove deprecated metrics from buildbot /varz. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/buildbot_8_4p1/README.chromium ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/buildbot_8_4p1/buildbot/status/web/status_json.py
diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py b/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py
index cbeb532d797a61f23262c308f955d1a26311329d..f0fdd419aa2f84e99e7f14512dc2954fca9e72fd 100644
--- a/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py
+++ b/third_party/buildbot_8_4p1/buildbot/status/web/status_json.py
@@ -1048,52 +1048,15 @@ class VarzResource(JsonResource):
help = 'Minimal set of metrics that are scraped frequently for monitoring.'
pageTitle = 'Varz'
- RECENT_BUILDS_COUNT_DEFAULT = 50
- RECENT_BUILDS_COUNT_LIMIT = 200
-
@defer.deferredGenerator
def asDict(self, request):
- recent_builds_count = int(RequestArg(
- request, 'recent_builds_count', self.RECENT_BUILDS_COUNT_DEFAULT))
-
- # Enforce a hard limit to avoid DoS-ing buildbot with a heavy request.
- recent_builds_count = min(
- recent_builds_count, self.RECENT_BUILDS_COUNT_LIMIT)
-
builders = {}
for builder_name in self.status.getBuilderNames():
builder = self.status.getBuilder(builder_name)
-
- build_range = range(-1, -recent_builds_count - 1, -1)
- recent_builds = [b for b in builder.getBuilds(build_range)
- if b is not None]
- recent_running_builds = [b for b in recent_builds
- if not b.isFinished()]
- recent_finished_builds = [b for b in recent_builds
- if b.isFinished()]
- recent_successful_builds = [
- b for b in recent_finished_builds
- if b.getResults() in (SUCCESS, WARNINGS)]
-
- recent_builds_by_status = collections.defaultdict(int)
- recent_builds_by_status['running'] = len(recent_running_builds)
- for b in recent_finished_builds:
- recent_builds_by_status[b.getResults()] += 1
-
- recent_successful_build_times = [
- int(b.getTimes()[1] - b.getTimes()[0])
- for b in recent_successful_builds]
- recent_finished_build_times = [
- int(b.getTimes()[1] - b.getTimes()[0])
- for b in recent_finished_builds]
-
slaves = builder.getSlaves()
builders[builder_name] = {
'connected_slaves': sum(1 for x in slaves if x.connected),
'current_builds': len(builder.getCurrentBuilds()),
- 'recent_builds_by_status': recent_builds_by_status,
- 'recent_successful_build_times': recent_successful_build_times,
- 'recent_finished_build_times': recent_finished_build_times,
'pending_builds': 0,
'state': builder.currentBigState,
'total_slaves': len(slaves),
« no previous file with comments | « third_party/buildbot_8_4p1/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698