Repository: hadoop Updated Branches: refs/heads/branch-2 282a56243 -> d7d9006af
HADOOP-13898. Should set HADOOP_JOB_HISTORYSERVER_HEAPSIZE only if it's empty. Contributed by Fei Hui. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d7d9006a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d7d9006a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d7d9006a Branch: refs/heads/branch-2 Commit: d7d9006afc60dd17884d939921a67d4d19f87f4f Parents: 282a562 Author: Ravi Prakash <ravip...@altiscale.com> Authored: Tue Dec 13 13:08:54 2016 -0800 Committer: Ravi Prakash <ravip...@altiscale.com> Committed: Tue Dec 13 13:08:54 2016 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/conf/mapred-env.cmd | 5 ++++- hadoop-mapreduce-project/conf/mapred-env.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7d9006a/hadoop-mapreduce-project/conf/mapred-env.cmd ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/conf/mapred-env.cmd b/hadoop-mapreduce-project/conf/mapred-env.cmd index f27943f..b50ff12 100644 --- a/hadoop-mapreduce-project/conf/mapred-env.cmd +++ b/hadoop-mapreduce-project/conf/mapred-env.cmd @@ -14,7 +14,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. -set HADOOP_JOB_HISTORYSERVER_HEAPSIZE=1000 +@rem when HADOOP_JOB_HISTORYSERVER_HEAPSIZE is not defined, set it +if not defined HADOOP_JOB_HISTORYSERVER_HEAPSIZE ( + set HADOOP_JOB_HISTORYSERVER_HEAPSIZE=1000 +) set HADOOP_MAPRED_ROOT_LOGGER=%HADOOP_LOGLEVEL%,RFA http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7d9006a/hadoop-mapreduce-project/conf/mapred-env.sh ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/conf/mapred-env.sh b/hadoop-mapreduce-project/conf/mapred-env.sh index 6be1e27..3590882 100644 --- a/hadoop-mapreduce-project/conf/mapred-env.sh +++ b/hadoop-mapreduce-project/conf/mapred-env.sh @@ -15,7 +15,10 @@ # export JAVA_HOME=/home/y/libexec/jdk1.6.0/ -export HADOOP_JOB_HISTORYSERVER_HEAPSIZE=1000 +# when HADOOP_JOB_HISTORYSERVER_HEAPSIZE is not defined, set it. +if [ "$HADOOP_JOB_HISTORYSERVER_HEAPSIZE" = "" ];then + export HADOOP_JOB_HISTORYSERVER_HEAPSIZE=1000 +fi export HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org