Skip to content

optimize: support resolving JAVA_HOME from symbolic links when `which… #12982

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
Merged
merged 1 commit into from
Jan 2, 2025
Merged

optimize: support resolving JAVA_HOME from symbolic links when `which… #12982

merged 1 commit into from
Jan 2, 2025

Conversation

llkkk
Copy link
Contributor

@llkkk llkkk commented Dec 23, 2024

… java` is used

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

This change optimizes the logic for detecting JAVA_HOME in the Nacos startup script. Specifically, it adds support for resolving JAVA_HOME from symbolic links when the which java command is used. This enhancement ensures compatibility with systems where JAVA_HOME is not explicitly set but java is available via a symbolic link.

Brief changelog

  • Added a check to resolve symbolic links for JAVA_PATH when which java is used.
  • Updated the logic to derive JAVA_HOME from the resolved JAVA_PATH.

Verifying this change

To verify this change:

  1. Test the script on a system where JAVA_HOME is not set but java is available via a symbolic link (e.g., /usr/bin/java -> /usr/java/jdk1.8.0_361/bin/java).
  2. Ensure that the script correctly detects and sets JAVA_HOME to /usr/java/jdk1.8.0_361.
  3. Test the script on systems with and without symbolic links to confirm backward compatibility.

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

@CLAassistant
Copy link

CLAassistant commented Dec 23, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@github-actions GitHub Actions
Copy link

Thanks for your this PR. 🙏
Please check again for your PR changes whether contains any usage/api/configuration change such as Add new API , Add new configuration, Change default value of configuration.
If so, please add or update documents(markdown type) in docs/next/ for repository nacos-group/nacos-group.github.io

感谢您提交的PR。 🙏
请再次查看您的PR内容，确认是否包含任何使用方式/API/配置参数的变更，如：新增API、新增配置参数、修改默认配置等操作。
如果是，请确保在提交之前，在仓库nacos-group/nacos-group.github.io中的docs/next/目录下添加或更新文档（markdown格式）。

@codecov-commenter
Copy link

codecov-commenter commented Dec 23, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.28%. Comparing base (762303b) to head (935a443).

Additional details and impacted files

Impacted file tree graph

@@              Coverage Diff              @@
##             develop   #12982      +/-   ##
=============================================
- Coverage      72.28%   72.28%   -0.01%     
  Complexity      9999     9999              
=============================================
  Files           1309     1309              
  Lines          41991    41991              
  Branches        4405     4405              
=============================================
- Hits           30353    30352       -1     
- Misses          9514     9516       +2     
+ Partials        2124     2123       -1

see 1 file with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 762303b...935a443. Read the comment docs.

@DarkAngel35-commits
Copy link

gh pr checkout 12982

@KomachiSion
Copy link
Collaborator

Please sign cla first

@wuyfee
Copy link

wuyfee commented Dec 30, 2024

$\color{green}{SUCCESS}$
DETAILS
✅ - docker: success
✅ - deploy (standalone & cluster & standalone_auth): success
✅ - e2e-java-test (standalone & cluster & standalone_auth): success
✅ - e2e-go-test (standalone & cluster): success
✅ - e2e-cpp-test (standalone & cluster): success
✅ - e2e-csharp-test (standalone & cluster): success
✅ - e2e-nodejs-test (standalone & cluster): success
✅ - e2e-python-test (standalone & cluster): success
✅ - clean (standalone & cluster & standalone_auth): success

@KomachiSion KomachiSion merged commit 14becb8 into alibaba:develop Jan 2, 2025
8 checks passed
@KomachiSion KomachiSion added this to the 2.5.0 milestone Jan 2, 2025
@KomachiSion KomachiSion added the kind/enhancement Category issues or prs related to enhancement. label Jan 2, 2025
@Dario-s-j
Copy link

Dario-s-j commented Jan 3, 2025 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KomachiSion KomachiSion KomachiSion approved these changes

+1 more reviewer

@DarkAngel35-commits DarkAngel35-commits DarkAngel35-commits approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
kind/enhancement Category issues or prs related to enhancement.
Projects
None yet
Milestone
2.5.0
Development

Successfully merging this pull request may close these issues.
7 participants
@llkkk @CLAassistant @codecov-commenter @DarkAngel35-commits @KomachiSion @wuyfee @Dario-s-j