Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Pulsar SQL] Add workaround for Presto 332 java.version parsing issue #14988

Closed
wants to merge 1 commit into from
Closed

[Pulsar SQL] Add workaround for Presto 332 java.version parsing issue #14988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/pulsar-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,11 @@ jobs:
-Pmain,docker -Dmaven.test.skip=true -Ddockerfile.build.squash=true \
-Dspotbugs.skip=true -Dlicense.skip=true -Dcheckstyle.skip=true -Drat.skip=true

# Checks also Presto license files
- name: Check binary licenses
if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }}
run: src/check-binary-license.sh ./distribution/server/target/apache-pulsar-*-bin.tar.gz

- name: save docker image apachepulsar/pulsar-test-latest-version:latest to Github artifact cache
if: ${{ needs.changed_files_job.outputs.docs_only != 'true' }}
run: |
Expand Down Expand Up @@ -604,9 +609,8 @@ jobs:
- name: Pulsar IO - Oracle
group: PULSAR_IO_ORA

# disable Sql integration tests until https://github.com/apache/pulsar/issues/14951 has been resolved
#- name: Sql
# group: SQL
- name: Sql
group: SQL

steps:
- name: checkout
Expand Down
13 changes: 11 additions & 2 deletions bin/pulsar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,15 @@ check_presto_libraries() {
fi
}

presto_java11_workaround() {
local prefix="${1:-"-D"}"
# workaround https://github.com/apache/pulsar/issues/14951
local java_version_trimmed=$({ $JAVA -version 2>&1| head -1 | awk -F\" '{ print $2 }' | awk -F. '{ print $1 "." $2 "." $3 }' | grep -v -F ..; } 2>/dev/null)
if [ -n "$java_version_trimmed" ]; then
echo "${prefix}java.version=${java_version_trimmed}"
fi
}

pulsar_help() {
cat <<EOF
Usage: pulsar <command>
Expand Down Expand Up @@ -371,10 +380,10 @@ elif [ $COMMAND == "compact-topic" ]; then
exec $JAVA $OPTS org.apache.pulsar.compaction.CompactorTool --broker-conf $PULSAR_BROKER_CONF $@
elif [ $COMMAND == "sql" ]; then
check_presto_libraries
exec $JAVA -cp "${PRESTO_HOME}/lib/*" io.prestosql.cli.Presto --server localhost:8081 "${@}"
exec $JAVA -cp "${PRESTO_HOME}/lib/*" $(presto_java11_workaround) io.prestosql.cli.Presto --server localhost:8081 "${@}"
elif [ $COMMAND == "sql-worker" ]; then
check_presto_libraries
exec ${PRESTO_HOME}/bin/launcher --etc-dir ${PULSAR_PRESTO_CONF} "${@}"
exec ${PRESTO_HOME}/bin/launcher $(presto_java11_workaround "-D ") --etc-dir ${PULSAR_PRESTO_CONF} "${@}"
elif [ $COMMAND == "tokens" ]; then
exec $JAVA $OPTS org.apache.pulsar.utils.auth.tokens.TokensCliUtils $@
elif [ $COMMAND == "version" ]; then
Expand Down