This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 93126f2504 [ZEPPELIN-5614] A JDBC interpreter property for disable
setting tag for application of hive engines (#4360)
93126f2504 is described below
commit 93126f25049776009dad5c6086f13d25e2fcbf72
Author: Guanhua Li <guanhua...@foxmail.com>
AuthorDate: Wed Apr 27 13:43:49 2022 +0800
[ZEPPELIN-5614] A JDBC interpreter property for disable setting tag for
application of hive engines (#4360)
* [ZEPPELIN-5614] Introduce a JDBC interpreter property for hive engines
which don't need to set yarn application tag
* update for review
* update docs
* add default value when property is not set.
---
docs/interpreter/hive.md | 15 +++++++++++++++
docs/interpreter/jdbc.md | 2 ++
.../java/org/apache/zeppelin/jdbc/JDBCInterpreter.java | 4 ++++
jdbc/src/main/resources/interpreter-setting.json | 9 ++++++++-
4 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/docs/interpreter/hive.md b/docs/interpreter/hive.md
index 86602fcc27..467e494857 100644
--- a/docs/interpreter/hive.md
+++ b/docs/interpreter/hive.md
@@ -127,6 +127,21 @@ See the example below of settings and dependencies.
<td></td>
<td><b>( Optional ) </b>Other properties used by the driver of
<code>%hive(${prefix})</code> </td>
</tr>
+ <tr>
+ <td>zeppelin.jdbc.hive.timeout.threshold</td>
+ <td>60000</td>
+ <td>Timeout for hive job timeout</td>
+ </tr>
+ <tr>
+ <td>zeppelin.jdbc.hive.monitor.query_interval</td>
+ <td>1000</td>
+ <td>Query interval for hive statement</td>
+ </tr>
+ <tr>
+ <td>zeppelin.jdbc.hive.engines.tag.enable</td>
+ <td>true</td>
+ <td>Set application tag for applications started by hive engines</td>
+ </tr>
</table>
This interpreter provides multiple configuration with `${prefix}`. User can
set a multiple connection properties by this prefix. It can be used like
`%hive(${prefix})`.
diff --git a/docs/interpreter/jdbc.md b/docs/interpreter/jdbc.md
index 4824edc4b4..c21c661bbc 100644
--- a/docs/interpreter/jdbc.md
+++ b/docs/interpreter/jdbc.md
@@ -739,6 +739,8 @@ See [User Impersonation in
interpreter](../usage/interpreter/user_impersonation.
</tr>
</table>
+See [Hive Interpreter](../interpreter/hive.html) for more properties about
Hive interpreter.
+
### Presto/Trino
Properties
diff --git a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
index 58068e2174..f5302dc48a 100644
--- a/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
+++ b/jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
@@ -604,6 +604,10 @@ public class JDBCInterpreter extends KerberosInterpreter {
// only add tags for hive jdbc
private String appendTagsToURL(String url, InterpreterContext context) {
+ if
(!Boolean.parseBoolean(getProperty("zeppelin.jdbc.hive.engines.tag.enable",
"true"))) {
+ return url;
+ }
+
StringBuilder builder = new StringBuilder(url);
if (url.startsWith("jdbc:hive2:")) {
Integer lastIndexOfQMark = builder.indexOf("?");
diff --git a/jdbc/src/main/resources/interpreter-setting.json
b/jdbc/src/main/resources/interpreter-setting.json
index 1b2b4d49ea..a723660d6e 100644
--- a/jdbc/src/main/resources/interpreter-setting.json
+++ b/jdbc/src/main/resources/interpreter-setting.json
@@ -77,7 +77,7 @@
"zeppelin.jdbc.auth.kerberos.proxy.enable": {
"envName": null,
"propertyName": "zeppelin.jdbc.auth.kerberos.proxy.enable",
- "defaultValue": "true",
+ "defaultValue": true,
"description": "When auth type is Kerberos, enable/disable Kerberos
proxy with the login user to get the connection. Default value is true.",
"type": "checkbox"
},
@@ -143,6 +143,13 @@
"defaultValue": "1000",
"description": "Query interval for hive statement",
"type": "number"
+ },
+ "zeppelin.jdbc.hive.engines.tag.enable": {
+ "envName": null,
+ "propertyName": "zeppelin.jdbc.hive.engines.tag.enable",
+ "defaultValue": true,
+ "description": "Set application tag for applications started by hive
engines",
+ "type": "checkbox"
}
},
"editor": {
