Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

check for invalid user input; in case of error fall back to default values

Browse source
This commit is contained in:
Prabhjyot Singh 2017-07-05 21:14:53 +05:30
parent a5a54d4667
commit 835b4bd03d
2 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/zeppelin-env.sh.template
View file

@ -56,7 +56,7 @@
## Kerberos ticket refresh setting
##
#export KINIT_FAIL_THRESHOLD # (optional) How many times should kinit retry. The default value is 5.
#export KERBEROS_REFRESH_INTERVAL # (optional) The refresh interval for Kerberos ticket. The default value is 1d.
#export KERBEROS_REFRESH_INTERVAL # (optional) The refresh interval for Kerberos ticket. The default value is 1d.
## Use provided spark installation ##
## defining SPARK_HOME makes Zeppelin run spark interpreter process using spark-submit

42
zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/KerberosInterpreter.java
View file

@ -37,6 +37,12 @@ import org.slf4j.LoggerFactory;
* interpreter.
* startKerberosLoginThread() needs to be called inside the open() and
* shutdownExecutorService() inside close().
*
*
* Environment variables defined in zeppelin-env.sh
* KERBEROS_REFRESH_INTERVAL controls the refresh interval for Kerberos ticket. The default value
* is 1d.
* KINIT_FAIL_THRESHOLD controls how many times should kinit retry. The default value is 5.
*/
public abstract class KerberosInterpreter extends Interpreter {
@ -66,20 +72,36 @@ public abstract class KerberosInterpreter extends Interpreter {
}
}
private String getKerberosRefreshInterval() {
if (System.getenv("KERBEROS_REFRESH_INTERVAL") == null) {
return "1d";
} else {
return System.getenv("KERBEROS_REFRESH_INTERVAL");
private Long getKerberosRefreshInterval() {
Long refreshInterval;
String refreshIntervalString = "1d";
//defined in zeppelin-env.sh, if not initialized then the default value is one day.
if (System.getenv("KERBEROS_REFRESH_INTERVAL") != null) {
refreshIntervalString = System.getenv("KERBEROS_REFRESH_INTERVAL");
}
try {
refreshInterval = getTimeAsMs(refreshIntervalString);
} catch (IllegalArgumentException e) {
logger.error("Cannot get time in MS for the given string, " + refreshIntervalString
+ " defaulting to 1d ", e);
refreshInterval = getTimeAsMs("1d");
}
return refreshInterval;
}
private Integer kinitFailThreshold() {
if (System.getenv("KINIT_FAIL_THRESHOLD") == null) {
return 5;
} else {
return new Integer(System.getenv("KINIT_FAIL_THRESHOLD"));
Integer kinitFailThreshold = 5;
//defined in zeppelin-env.sh, if not initialized then the default value is 5.
if (System.getenv("KINIT_FAIL_THRESHOLD") != null) {
try {
kinitFailThreshold = new Integer(System.getenv("KINIT_FAIL_THRESHOLD"));
} catch (Exception e) {
logger.error("Cannot get integer value from the given string, " + System
.getenv("KINIT_FAIL_THRESHOLD") + " defaulting to " + kinitFailThreshold, e);
}
}
return kinitFailThreshold;
}
private Long getTimeAsMs(String time) {
@ -115,7 +137,7 @@ public abstract class KerberosInterpreter extends Interpreter {
kinitFailCount = 0;
// schedule another kinit run with a fixed delay.
scheduledExecutorService
.schedule(this, getTimeAsMs(getKerberosRefreshInterval()), TimeUnit.MILLISECONDS);
.schedule(this, getKerberosRefreshInterval(), TimeUnit.MILLISECONDS);
} else {
kinitFailCount++;
logger.info("runKerberosLogin failed for " + kinitFailCount + " time(s).");