[incubator-pinot] 01/01: filter out javaagent from generator.sh JAVA_OPTS

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apucher pushed a commit to branch generator-script-java-opts
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git

commit 5796012d1c9176494a904b80408ab4125ab8aeab
Author: Alexander Pucher <al...@alexpucher.com>
AuthorDate: Thu May 6 12:33:16 2021 -0700

    filter out javaagent from generator.sh JAVA_OPTS
---
 docker/images/pinot/bin/generator.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker/images/pinot/bin/generator.sh b/docker/images/pinot/bin/generator.sh
index 471a9b0..15d9126 100755
--- a/docker/images/pinot/bin/generator.sh
+++ b/docker/images/pinot/bin/generator.sh
@@ -28,6 +28,8 @@ CONTROLLER_HOST="localhost"
 CONTROLLER_PORT="9000"
 CONTROLLER_SCHEME="http"
 
+export JAVA_OPTS="$(echo $JAVA_OPTS | sed -E 's/-javaagent\S+//')"
+
 USAGE="$(basename "$0") [-h] [-a PATH] [-c HOST:PORT] [-s SCHEME] [-j PATH] [-n ROWS] TEMPLATE_NAME [TABLE_NAME]
 
   where:
@@ -124,7 +126,7 @@ if [ "$TEMPLATE_NAME" = "complexWebsite" ]; then
 fi
 
 echo "Generating data for ${TEMPLATE_NAME} in ${DATA_DIR}"
-JAVA_OPTS="" ${ADMIN_PATH} GenerateData \
+${ADMIN_PATH} GenerateData \
 -numFiles 1 -numRecords $NUM_RECORDS -format csv \
 -schemaFile "${TEMPLATE_BASEDIR}/${TEMPLATE_NAME}_schema.json" \
 -schemaAnnotationFile "${TEMPLATE_BASEDIR}/${TEMPLATE_NAME}_generator.json" \
@@ -137,7 +139,7 @@ if [ ! -d "${DATA_DIR}" ]; then
 fi
 
 echo "Creating segment for ${TEMPLATE_NAME} in ${SEGMENT_DIR}"
-JAVA_OPTS="" ${ADMIN_PATH} CreateSegment \
+${ADMIN_PATH} CreateSegment \
 -format csv \
 -tableConfigFile "${TEMPLATE_BASEDIR}/${TEMPLATE_NAME}_config.json" \
 -schemaFile "${TEMPLATE_BASEDIR}/${TEMPLATE_NAME}_schema.json" \
@@ -151,7 +153,7 @@ if [ ! -d "${SEGMENT_DIR}" ]; then
 fi
 
 echo "Adding table ${TABLE_NAME} from template ${TEMPLATE_NAME}"
-JAVA_OPTS="" ${ADMIN_PATH} AddTable -exec \
+${ADMIN_PATH} AddTable -exec \
 -tableConfigFile "${TEMPLATE_BASEDIR}/${TEMPLATE_NAME}_config.json" \
 -schemaFile "${TEMPLATE_BASEDIR}/${TEMPLATE_NAME}_schema.json" \
 -controllerHost "${CONTROLLER_HOST}" \
@@ -165,7 +167,7 @@ if [ $? != 0 ]; then
 fi
 
 echo "Uploading segment for ${TEMPLATE_NAME}"
-JAVA_OPTS="" ${ADMIN_PATH} UploadSegment \
+${ADMIN_PATH} UploadSegment \
 -tableName "${TABLE_NAME}" \
 -segmentDir "${SEGMENT_DIR}" \
 -controllerHost "${CONTROLLER_HOST}" \

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org