浏览代码

AMBARI-8103. Jobs View: Filter for tez jobs needs to work for both HDP 2.1 and HDP 2.2, which use tez:true, TEZ:true, respectively (alejandro)

Alejandro Fernandez 10 年之前
父节点
当前提交
c3eff50747

+ 3 - 1
contrib/views/jobs/src/main/resources/ui/app/scripts/controllers/jobs_controller.js

@@ -411,7 +411,9 @@ App.JobsController = Ember.ArrayController.extend(App.RunPeriodically, {
      * @method createJobsFiltersLink
      */
     createJobsFiltersLink: function () {
-      var link = "?fields=events,primaryfilters,otherinfo&secondaryFilter=tez:true",
+      // The filters "tez:true,TEZ:true" are needed because ATS is case sensitive,
+      // and in HDP 2.1, "tez" was used, while in HDP 2.2, "TEZ" was used.
+      var link = "?fields=events,primaryfilters,otherinfo&secondaryFilter=tez:true,TEZ:true",
         numberOfAppliedFilters = 0;
 
       if (this.get("id") !== "") {

+ 3 - 1
contrib/views/jobs/src/main/resources/ui/app/scripts/helpers/ajax.js

@@ -50,7 +50,9 @@ var urls = {
   },
 
   'jobs_lastID': {
-    real: '/views/{view}/{version}/{instanceName}/proxy?url={atsURL}/ws/v1/timeline/HIVE_QUERY_ID?limit=1&secondaryFilter=tez:true',
+    // The filters "tez:true,TEZ:true" are needed because ATS is case sensitive,
+    // and in HDP 2.1, "tez" was used, while in HDP 2.2, "TEZ" was used.
+    real: '/views/{view}/{version}/{instanceName}/proxy?url={atsURL}/ws/v1/timeline/HIVE_QUERY_ID?limit=1&secondaryFilter=tez:true,TEZ:true',
     mock: '/scripts/assets/hive-queries.json',
     apiPrefix: ''
   },