[ambari] branch branch-2.7 updated: [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs while enabling HSI.

[is...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.7 by this push:
     new b5ceae4  [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs while enabling HSI.
b5ceae4 is described below

commit b5ceae4f84691a9b838da720371e67b81e6adbce
Author: Ishan Bhatt <is...@gmail.com>
AuthorDate: Thu Aug 16 09:23:14 2018 -0700

    [AMBARI-24452] [UI Deploy] LLAP queue is not created/set in YARN configs while enabling HSI.
---
 .../common/configs/config_recommendation_parser.js | 47 +---------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index 19ea8a5..6bcd322 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -170,14 +170,10 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
         }
       }
 
-      if (prevRecommeneded !== value) {
+      if (prevRecommeneded !== value && name !== "capacity-scheduler") {
         allowConfigUpdate = false;
       }
 
-      if (name === "capacity-scheduler") {
-        allowConfigUpdate = this.compareCapacitySchedulerValues(prevRecommeneded, value);
-      }
-
       if (allowConfigUpdate) {
         Em.setProperties(config, {
           value: recommendedValue,
@@ -196,46 +192,7 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations, {
     Em.tryInvoke(config, 'validate');
     return config;
   },
-
-  /**
-   * Configs with value across multiple lines could have them in a different order
-   * Eg: capacity-scheduler
-   *
-   * @param {String} prevRec
-   * @param {String} value
-   * @returns {Boolean}
-   * @method isPrevRecAndValueEqual
-   */
-
-  compareCapacitySchedulerValues: function (prevRec, value) {
-
-
-    let prevRecArr = prevRec.split("\n");
-    let valueArr = value.split("\n");
-
-    //first value being added is capacity-scheduler=null. Remove that for comparison
-    if (valueArr[0].includes("capacity-scheduler")) {
-      valueArr = valueArr.splice(1);
-    }
-
-    if (prevRecArr.length !== valueArr.length) {
-      return false;
-    }
-    if (prevRecArr.length < 2 || valueArr.length < 2) {
-      return prevRec === value;
-    }
-    let strMap = {};
-    for (var i=0; i <prevRecArr.length; i++) {
-      strMap[prevRecArr[i]] = true;
-    }
-    for (var i=0; i<valueArr.length; i++) {
-      if (!strMap[valueArr[i]]) {
-        return false;
-      }
-    }
-    return true;
-  },
-
+  
   /**
    * Add config based on recommendations
    *