Perf dashboard always fetches charts JSON twice

https://bugs.webkit.org/show_bug.cgi?id=151483

Reviewed by Andreas Kling.

Only re-generate "runs" JSON via /api/runs/ when the cache doesn't exist in /data/ or the cached JSON is
obsolete (shouldRefetch is set true) or corrupt (the second closure).

* public/v2/app.js:
(App.Pane._fetch):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192690 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index e99f67da031e0ed99fe3b8e96891c16d3c8978f3..9b5d4614624199641d25a915878b1e75b422b60e 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,16 @@
+2015-11-19  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Perf dashboard always fetches charts JSON twice
+        https://bugs.webkit.org/show_bug.cgi?id=151483
+
+        Reviewed by Andreas Kling.
+
+        Only re-generate "runs" JSON via /api/runs/ when the cache doesn't exist in /data/ or the cached JSON is
+        obsolete (shouldRefetch is set true) or corrupt (the second closure).
+
+        * public/v2/app.js:
+        (App.Pane._fetch):
+
 2015-11-18  Ryosuke Niwa  <rniwa@webkit.org>
 
         Internal perf dashboard takes forever to load

diff --git a/Websites/perf.webkit.org/public/v2/app.js b/Websites/perf.webkit.org/public/v2/app.js
index 60b620d798aa09553c9eac5493e4e63193ea283b..0217ba01cc6e9b8c8cb33485859df79a8332df66 100644 (file)
--- a/Websites/perf.webkit.org/public/v2/app.js
+++ b/Websites/perf.webkit.org/public/v2/app.js
@@ -355,11 +355,13 @@ App.Pane = Ember.Object.extend({
             var useCache = true;
             App.Manifest.fetchRunsWithPlatformAndMetric(this.get('store'), platformId, metricId, null, useCache)
                 .then(function (result) {
-                    if (result || result.shouldRefetch)
+                    if (!result || !result.data || result.shouldRefetch)
                         self.refetchRuns(platformId, metricId);
-                    if (result)
+                    else
                         self._didFetchRuns(result);
-                }, this._handleFetchErrors.bind(this, platformId, metricId));
+                }, function () {
+                    self.refetchRuns(platformId, metricId);
+                });
             if (!this.get('inDashboard'))
                 this.fetchAnalyticRanges();
         }