[hotfix-simple][#fix-bin]#fix-commit#1187
Merged
lvyanquan merged 1 commit intoDTStack:masterfrom Aug 26, 2022
conghe2402:b20220825
Merged
[hotfix-simple][#fix-bin]#fix-commit#1187lvyanquan merged 1 commit intoDTStack:masterfrom conghe2402:b20220825
lvyanquan merged 1 commit intoDTStack:masterfrom
conghe2402:b20220825
Conversation
Contributor
|
Also, you need to squeeze your commits into one before we finally merge this request. |
lvyanquan
reviewed
Aug 25, 2022
bin/submit.sh
Outdated
| export CHUNJUN_HOME=$CHUNJUN_HOME | ||
| else | ||
| export CHUNJUN_HOME="$(cd "`dirname "$0"`"/../chunjun-dist; pwd)" | ||
| export CHUNJUN_HOME="$(cd "`dirname "$0"`"/..; pwd)" |
Contributor
There was a problem hiding this comment.
yeah, your pr is considered the situation that CHUNJUN_HOME is chunjun-dist, like
ls chunjun-dist
bin connector dirty-data-collector formats metrics
chunjun-core-master.jar ddl docker-build lib restore-plugins
which means that user use chunjun from release package.
But we also need to consider the situation that CHUNJUN_HOME is chunjun(project path, parent path of chunjun-dist), like
ls chunjun
CONTRIBUTING.md chunjun-assembly chunjun-dist chunjun-restore flinkx-core lib
LICENSE chunjun-clients chunjun-docker chunjun-sql flinkx-dirtydata-collectors mvnw
README.md chunjun-connectors chunjun-examples chunjun.iml flinkx-docker mvnw.cmd
README_CH.md chunjun-core chunjun-formats docs_zh flinkx-formats pom.xml
bin chunjun-dev chunjun-local-test flinkx-clients flinkx-metrics website
build chunjun-dirty chunjun-metrics flinkx-connectors flinkx-restore
which means that user use chunjun from Git clone.
So you need to consider this two situations using 'if' statement.
lvyanquan
reviewed
Aug 26, 2022
| JAR_DIR=$CHUNJUN_HOME/lib/* | ||
| elif [ $CHUNJUN_DEPLOY_MODE -eq 2 ]; then | ||
| JAR_DIR=$CHUNJUN_HOME/../lib/* | ||
| else |
Contributor
There was a problem hiding this comment.
These two else case can be merged into one.
lvyanquan
reviewed
Aug 26, 2022
lvyanquan
reviewed
Aug 26, 2022
Contributor
|
Look good to me. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose of this pull request
fix the problem1: when invoking a starting script such as chunjun-yarn-perjob.sh with the correct CHUNJUN_HOME env var, chunjun program fails cause "cd XXX/../chunjun_dist not found"
fix the problem2: when invoking a starting script such as chunjun-yarn-perjob.sh with the correct CHUNJUN_HOME env var, chunjun program can not load right classpath because of the wrong classpath path setting "xxx/chunjun-dist/../lib“
Which issue you fix
Fixes # (issue).
Checklist: