incubator-seata
incubator-seata copied to clipboard
[bugfix] 解决OpenJDK 11 Server1.5.2 启动失败
- [ ] I have registered the PR changes.
Ⅰ. Describe what this PR did
解决在OpenJDK 11环境,seata-server.sh获取jdk版本问题
Ⅱ. Does this pull request fix one issue?
fixes #4849
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews
https://github.com/seata/seata/pull/4434 这个pr里改动了启动脚本,可以识别出jdk17,在jdk11上可以通用吗
JAVA_MAJOR_VERSION=$($JAVACMD -version 2>&1 | sed '1!d' | sed -e 's/"//g' | awk '{print $3}' | awk -F '.' '{print $2}')
if [[ "$JAVA_MAJOR_VERSION" -ge "0" ]] ; then
JAVA_MAJOR_VERSION=$($JAVACMD -version 2>&1 | sed '1!d' | sed -e 's/"//g' | awk '{print $3}' | awk -F '.' '{print $1}')
fi
可以的,你这里需要完善一下,这里脚本可能无法识别类似于1.8.0_322
这样的版本号
或许你来统一做好oraclejdk和openjdk的解析,然后先合并你的,我再合并你的代码,这样我那块就不用改动了
Codecov Report
Merging #4874 (7650389) into develop (0e03695) will decrease coverage by
0.01%
. The diff coverage isn/a
.
@@ Coverage Diff @@
## develop #4874 +/- ##
=============================================
- Coverage 49.46% 49.44% -0.02%
+ Complexity 4126 4123 -3
=============================================
Files 733 733
Lines 26051 26051
Branches 3219 3219
=============================================
- Hits 12885 12880 -5
- Misses 11791 11793 +2
- Partials 1375 1378 +3
Impacted Files | Coverage Δ | |
---|---|---|
...n/src/main/java/io/seata/common/util/IdWorker.java | 77.08% <0.00%> (-6.25%) |
:arrow_down: |
...in/java/io/seata/server/session/GlobalSession.java | 78.68% <0.00%> (-0.78%) |
:arrow_down: |
...erver/storage/file/session/FileSessionManager.java | 49.04% <0.00%> (-0.64%) |
:arrow_down: |
...very/registry/zk/ZookeeperRegisterServiceImpl.java | 61.76% <0.00%> (+0.73%) |
:arrow_up: |
或许你来统一做好oraclejdk和openjdk的解析,然后先合并你的,我再合并你的代码,这样我那块就不用改动了
我测试了下,.sh应该没什么问题,.bat我这边按照你提的pr改的,我这边没法测试,暂时没其他改动。
问题依旧存在
问题依旧存在
什么问题依然存在,截个图看下