Repository: ambari Updated Branches: refs/heads/trunk a1f409cb2 -> f41b8f235
AMBARI-10408: NFSGateway fails to start in blueprint installation. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f41b8f23 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f41b8f23 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f41b8f23 Branch: refs/heads/trunk Commit: f41b8f235a43671764628bc945de2f28748d63b7 Parents: a1f409c Author: Jaimin Jetly <[email protected]> Authored: Wed Apr 8 17:31:25 2015 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Wed Apr 8 17:31:41 2015 -0700 ---------------------------------------------------------------------- .../stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml | 2 +- ambari-web/app/controllers/main/service/info/configs.js | 2 +- ambari-web/app/controllers/wizard/step8_controller.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f41b8f23/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml index 8189047..cb641d6 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml @@ -75,7 +75,7 @@ export HADOOP_DATANODE_OPTS="-server -XX:ParallelGCThreads=4 -XX:+UseConcMarkSwe export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS" {% endif %} -HADOOP_NFS3_OPTS="-Xmx{{nfsgateway_heapsize}} -Dhadoop.security.logger=ERROR,DRFAS ${HADOOP_NFS3_OPTS}" +HADOOP_NFS3_OPTS="-Xmx{{nfsgateway_heapsize}}m -Dhadoop.security.logger=ERROR,DRFAS ${HADOOP_NFS3_OPTS}" HADOOP_BALANCER_OPTS="-server -Xmx{{hadoop_heapsize}}m ${HADOOP_BALANCER_OPTS}" export HADOOP_SECONDARYNAMENODE_OPTS=$HADOOP_NAMENODE_OPTS http://git-wip-us.apache.org/repos/asf/ambari/blob/f41b8f23/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 9f77f8b..4503846 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -240,7 +240,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM * List of heapsize properties not to be parsed * @type {string[]} */ - heapsizeException: ['hadoop_heapsize', 'yarn_heapsize', 'nodemanager_heapsize', 'resourcemanager_heapsize', 'apptimelineserver_heapsize', 'jobhistory_heapsize'], + heapsizeException: ['hadoop_heapsize', 'yarn_heapsize', 'nodemanager_heapsize', 'resourcemanager_heapsize', 'apptimelineserver_heapsize', 'jobhistory_heapsize', 'nfsgateway_heapsize'], /** * Regular expression for heapsize properties detection http://git-wip-us.apache.org/repos/asf/ambari/blob/f41b8f23/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index 9bfebdd..5560419 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -1783,7 +1783,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz var configs = this.get('configs').filterProperty('filename', site + '.xml'); var attributes = App.router.get('mainServiceInfoConfigsController').getConfigAttributes(configs); configs.forEach(function (_configProperty) { - var heapsizeExceptions = ['hadoop_heapsize', 'yarn_heapsize', 'nodemanager_heapsize', 'resourcemanager_heapsize', 'apptimelineserver_heapsize', 'jobhistory_heapsize']; + var heapsizeExceptions = ['hadoop_heapsize', 'yarn_heapsize', 'nodemanager_heapsize', 'resourcemanager_heapsize', 'apptimelineserver_heapsize', 'jobhistory_heapsize', 'nfsgateway_heapsize']; // 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
