AMBARI-8086. UI adds multiple m to params *heapsize, *permsize, etc. (xiwang)

ambari-web/app/controllers/main/service/info/configs.js

@@ -2113,7 +2113,8 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
     siteObj.forEach(function (_siteObj) {
       var value = _siteObj.value;
       if (_siteObj.isRequiredByAgent == false) return;
-      if (heapsizeRegExp.test(_siteObj.name) && !heapsizeException.contains(_siteObj.name)) {
+      // site object name follow the format *permsize/*heapsize and the value NOT ends with "m"
+      if (heapsizeRegExp.test(_siteObj.name) && !heapsizeException.contains(_siteObj.name) && !(_siteObj.value).endsWith("m")) {
         value += "m";
       }
       siteProperties[_siteObj.name] = value;

ambari-web/app/controllers/wizard/step8_controller.js

@@ -1668,7 +1668,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, {
         // do not pass any globals whose name ends with _host or _hosts
         if (_configProperty.isRequiredByAgent !== false) {
           // append "m" to JVM memory options except for heapsizeExtensions
-          if (/_heapsize|_newsize|_maxnewsize|_permsize|_maxpermsize$/.test(_configProperty.name) && !heapsizeExceptions.contains(_configProperty.name)) {
+          if (/_heapsize|_newsize|_maxnewsize|_permsize|_maxpermsize$/.test(_configProperty.name) && !heapsizeExceptions.contains(_configProperty.name) && !(_configProperty.value).endsWith("m")) {
             properties[_configProperty.name] = _configProperty.value + "m";
           } else {
             properties[_configProperty.name] = _configProperty.value;

ambari-web/test/controllers/main/service/info/config_test.js

@@ -442,6 +442,14 @@ describe("App.MainServiceInfoConfigsController", function () {
           {
             name: "property2",
             value: "value2<"
+          },
+          {
+            name: "property_heapsize",
+            value: "value3"
+          },
+          {
+            name: "property_permsize",
+            value: "value4m"
           }
         ]),
         result: {
@@ -449,7 +457,9 @@ describe("App.MainServiceInfoConfigsController", function () {
           "tag": "version1",
           "properties": {
             "property1": "value1",
-            "property2": "value2<"
+            "property2": "value2<",
+            "property_heapsize": "value3m",
+            "property_permsize": "value4m"
           }
         },
         m: "default"