mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
abd95fa5e4
### What is this PR for?
This PR sets default value for ZEPPELIN_INTP_MEM to avoid OOM Exception in SparkInterpreter when Zeppelin has zero configuration. This PR should be merged to both branch-0.6 and master.
### What type of PR is it?
Bug Fix
### How should this be tested?
1. Build with:
```
mvn clean package -DskipTests -pl '!zeppelin-distribution,!file,!alluxio,!livy,!hbase,!bigquery,!python,!jdbc,!ignite,!lens,!postgresql,!cassandra,!kylin,!elasticsearch,!flink,!markdown,!shell,!angular'
```
2. Unset SPARK_HOME in conf/zeppelin-env.sh if you have.
3. Run Zeppelin with java 1.7.
4. Run tutorial and see if it doesn't hang.
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Mina Lee <minalee@apache.org>
Closes #1505 from minahlee/hotfix/default_intp_jvm and squashes the following commits:
0dfda4f [Mina Lee] Set default ZEPPELIN_INTP_MEM
109 lines
2.9 KiB
Batchfile
109 lines
2.9 KiB
Batchfile
@echo off
|
|
|
|
REM Licensed to the Apache Software Foundation (ASF) under one or more
|
|
REM contributor license agreements. See the NOTICE file distributed with
|
|
REM this work for additional information regarding copyright ownership.
|
|
REM The ASF licenses this file to You under the Apache License, Version 2.0
|
|
REM (the "License"); you may not use this file except in compliance with
|
|
REM the License. You may obtain a copy of the License at
|
|
REM
|
|
REM http://www.apache.org/licenses/LICENSE-2.0
|
|
REM
|
|
REM Unless required by applicable law or agreed to in writing, software
|
|
REM distributed under the License is distributed on an "AS IS" BASIS,
|
|
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
REM See the License for the specific language governing permissions and
|
|
REM limitations under the License.
|
|
|
|
if not defined ZEPPELIN_HOME (
|
|
for %%d in ("%~dp0..") do (
|
|
set ZEPPELIN_HOME=%%~fd
|
|
)
|
|
)
|
|
|
|
if not defined ZEPPELIN_CONF_DIR (
|
|
set ZEPPELIN_CONF_DIR=%ZEPPELIN_HOME%\conf
|
|
)
|
|
|
|
if not defined ZEPPELIN_LOG_DIR (
|
|
set ZEPPELIN_LOG_DIR=%ZEPPELIN_HOME%\logs
|
|
)
|
|
|
|
if not defined ZEPPELIN_NOTEBOOK_DIR (
|
|
set ZEPPELIN_NOTEBOOK_DIR=%ZEPPELIN_HOME%\notebook
|
|
)
|
|
|
|
if not defined ZEPPELIN_PID_DIR (
|
|
set ZEPPELIN_PID_DIR=%ZEPPELIN_HOME%\run
|
|
)
|
|
|
|
if not defined ZEPPELIN_WAR (
|
|
if exist "%ZEPPELIN_HOME%\zeppelin-web\dist" (
|
|
set ZEPPELIN_WAR=%ZEPPELIN_HOME%\zeppelin-web\dist
|
|
) else (
|
|
for %%d in ("%ZEPPELIN_HOME%\zeppelin-web*.war") do (
|
|
set ZEPPELIN_WAR=%%d
|
|
)
|
|
)
|
|
)
|
|
|
|
if not defined ZEPPELIN_INTERPRETER_DIR (
|
|
set ZEPPELIN_INTERPRETER_DIR=%ZEPPELIN_HOME%\interpreter
|
|
)
|
|
|
|
if exist "%ZEPPELIN_CONF_DIR%\zeppelin-env.cmd" (
|
|
call "%ZEPPELIN_CONF_DIR%\zeppelin-env.cmd"
|
|
)
|
|
|
|
if not defined ZEPPELIN_CLASSPATH (
|
|
set ZEPPELIN_CLASSPATH="%ZEPPELIN_CONF_DIR%"
|
|
) else (
|
|
set ZEPPELIN_CLASSPATH=%ZEPPELIN_CLASSPATH%;"%ZEPPELIN_CONF_DIR%"
|
|
)
|
|
|
|
if not defined ZEPPELIN_ENCODING (
|
|
set ZEPPELIN_ENCODING=UTF-8
|
|
)
|
|
|
|
if not defined ZEPPELIN_MEM (
|
|
set ZEPPELIN_MEM=-Xms1024m -Xmx1024m -XX:MaxPermSize=512m
|
|
)
|
|
|
|
if not defined ZEPPELIN_INTP_MEM (
|
|
set ZEPPELIN_INTP_MEM=-Xms1024m -Xmx1024m -XX:MaxPermSize=512m
|
|
)
|
|
|
|
if not defined ZEPPELIN_JAVA_OPTS (
|
|
set ZEPPELIN_JAVA_OPTS=-Dfile.encoding=%ZEPPELIN_ENCODING% %ZEPPELIN_MEM%
|
|
) else (
|
|
set ZEPPELIN_JAVA_OPTS=%ZEPPELIN_JAVA_OPTS% -Dfile.encoding=%ZEPPELIN_ENCODING% %ZEPPELIN_MEM%
|
|
)
|
|
|
|
if not defined JAVA_OPTS (
|
|
set JAVA_OPTS=%ZEPPELIN_JAVA_OPTS%
|
|
) else (
|
|
set JAVA_OPTS=%JAVA_OPTS% %ZEPPELIN_JAVA_OPTS%
|
|
)
|
|
|
|
|
|
set JAVA_INTP_OPTS=%ZEPPELIN_INTP_JAVA_OPTS% -Dfile.encoding=%ZEPPELIN_ENCODING%
|
|
|
|
if not defined JAVA_HOME (
|
|
set ZEPPELIN_RUNNER=java
|
|
) else (
|
|
set ZEPPELIN_RUNNER=%JAVA_HOME%\bin\java
|
|
)
|
|
|
|
if not defined ZEPPELIN_IDENT_STRING (
|
|
set ZEPPELIN_IDENT_STRING=%USERNAME%
|
|
)
|
|
|
|
if not defined DEBUG (
|
|
set DEBUG=0
|
|
)
|
|
|
|
if not defined ZEPPELIN_INTERPRETER_REMOTE_RUNNER (
|
|
set ZEPPELIN_INTERPRETER_REMOTE_RUNNER=bin\interpreter.cmd
|
|
)
|
|
|
|
exit /b
|