From 24f018658083ad4f5a707aec036b10a35b64a1ca Mon Sep 17 00:00:00 2001
From: wForget <643348094@qq.com>
Date: Wed, 24 Nov 2021 15:27:42 +0800
Subject: [PATCH] [KYUUBI #1439] Add KYUUBI_CTL_JAVA_OPTS to configure java
 opts of kyuubi-ctl.

<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->

Add KYUUBI_CTL_JAVA_OPTS to configure java opts of kyuubi-ctl. For details: #1439.

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [X] [Run test](https://kyuubi.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #1440 from wForget/KYUUBI-1439.

Closes #1439

bbbf1f23 [wForget] [KYUUBI-1439] Add KYUUBI_CTL_JAVA_OPTS to configure java opts of kyuubi-ctl. update settings.md
da7779a7 [wForget] [KYUUBI-1439] Add KYUUBI_CTL_JAVA_OPTS to configure java opts of kyuubi-ctl.

Authored-by: wForget <643348094@qq.com>
Signed-off-by: Kent Yao <yao@apache.org>
(cherry picked from commit b7e94ff45cac157f39ff66d6da08909c453dab74)
Signed-off-by: Kent Yao <yao@apache.org>
---
 bin/kyuubi-ctl              | 2 +-
 conf/kyuubi-env.sh.template | 2 ++
 docs/deployment/settings.md | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/kyuubi-ctl b/bin/kyuubi-ctl
index 6bd0c57f679..f6c3be684dd 100755
--- a/bin/kyuubi-ctl
+++ b/bin/kyuubi-ctl
@@ -41,4 +41,4 @@ fi
 
 KYUUBI_CLASSPATH="${KYUUBI_JAR_DIR}/*:${KYUUBI_CONF_DIR}:${HADOOP_CONF_DIR}"
 
-exec ${RUNNER} ${KYUUBI_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS "$@"
+exec ${RUNNER} ${KYUUBI_CTL_JAVA_OPTS} -cp ${KYUUBI_CLASSPATH} $CLASS "$@"
diff --git a/conf/kyuubi-env.sh.template b/conf/kyuubi-env.sh.template
index e7848fa7fb2..969d47f4760 100755
--- a/conf/kyuubi-env.sh.template
+++ b/conf/kyuubi-env.sh.template
@@ -29,6 +29,8 @@
 #                           (Default: 5)
 # - KYUUBI_JAVA_OPTS        JVM options for the Kyuubi server itself in the form "-Dx=y".
 #                           (Default: none).
+# - KYUUBI_CTL_JAVA_OPTS    JVM options for the Kyuubi ctl itself in the form "-Dx=y".
+#                           (Default: none).
 # - KYUUBI_BEELINE_OPTS     JVM options for the Kyuubi BeeLine in the form "-Dx=Y".
 #                           (Default: none)
 # - KYUUBI_NICENESS         The scheduling priority for Kyuubi server.
diff --git a/docs/deployment/settings.md b/docs/deployment/settings.md
index 3c4ba328139..e6e9eb5a98b 100644
--- a/docs/deployment/settings.md
+++ b/docs/deployment/settings.md
@@ -64,6 +64,8 @@ You can configure the environment variables in `$KYUUBI_HOME/conf/kyuubi-env.sh`
 #                           (Default: 5)
 # - KYUUBI_JAVA_OPTS        JVM options for the Kyuubi server itself in the form "-Dx=y".
 #                           (Default: none).
+# - KYUUBI_CTL_JAVA_OPTS    JVM options for the Kyuubi ctl itself in the form "-Dx=y".
+#                           (Default: none).
 # - KYUUBI_BEELINE_OPTS     JVM options for the Kyuubi BeeLine in the form "-Dx=Y".
 #                           (Default: none)
 # - KYUUBI_NICENESS         The scheduling priority for Kyuubi server.