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

address comment

Browse source
This commit is contained in:
Jeff Zhang 2017-03-20 16:11:38 +08:00
parent 53230c3e55
commit 52fc204267
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterprereter.java
View file

@ -65,6 +65,7 @@ public abstract class BaseLivyInterprereter extends Interpreter {
protected boolean displayAppInfo;
private AtomicBoolean sessionExpired = new AtomicBoolean(false);
protected LivyVersion livyVersion;
private RestTemplate restTemplate;
// keep tracking the mapping between paragraphId and statementId, so that we can cancel the
// statement after we execute it.
@ -79,6 +80,7 @@ public abstract class BaseLivyInterprereter extends Interpreter {
property.getProperty("zeppelin.livy.session.create_timeout", 120 + ""));
this.pullStatusInterval = Integer.parseInt(
property.getProperty("zeppelin.livy.pull_status.interval.millis", 1000 + ""));
this.restTemplate = createRestTemplate();
}
public abstract String getSessionKind();
@ -388,11 +390,18 @@ public abstract class BaseLivyInterprereter extends Interpreter {
}
private RestTemplate getRestTemplate() throws LivyException {
private RestTemplate createRestTemplate() {
HttpClient httpClient = null;
if (livyURL.startsWith("https:")) {
String keystoreFile = property.getProperty("zeppelin.livy.ssl.trustStore");
String password = property.getProperty("zeppelin.livy.ssl.trustStorePassword");
if (StringUtils.isBlank(keystoreFile)) {
throw new RuntimeException("No zeppelin.livy.ssl.trustStore specified for livy ssl");
}
if (StringUtils.isBlank(password)) {
throw new RuntimeException("No zeppelin.livy.ssl.trustStorePassword specified " +
"for livy ssl");
}
FileInputStream inputStream = null;
try {
inputStream = new FileInputStream(keystoreFile);
@ -404,7 +413,7 @@ public abstract class BaseLivyInterprereter extends Interpreter {
SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
httpClient = HttpClients.custom().setSSLSocketFactory(csf).build();
} catch (Exception e) {
throw new LivyException("Failed to create SSL HttpClient", e);
throw new RuntimeException("Failed to create SSL HttpClient", e);
} finally {
if (inputStream != null) {
try {
@ -440,7 +449,6 @@ public abstract class BaseLivyInterprereter extends Interpreter {
throws LivyException {
targetURL = livyURL + targetURL;
LOGGER.debug("Call rest api in {}, method: {}, jsonData: {}", targetURL, method, jsonData);
RestTemplate restTemplate = getRestTemplate();
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("X-Requested-By", "zeppelin");

1
livy/src/test/java/org/apache/zeppelin/livy/LivySQLInterpreterTest.java
View file

@ -36,6 +36,7 @@ public class LivySQLInterpreterTest {
@Before
public void setUp() {
Properties properties = new Properties();
properties.setProperty("zeppelin.livy.url", "http://localhost:8998");
properties.setProperty("zeppelin.livy.session.create_timeout", "120");
properties.setProperty("zeppelin.livy.spark.sql.maxResult", "3");
sqlInterpreter = new LivySparkSQLInterpreter(properties);