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.

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

optimize: seata-server remove cms parameters #4434

Merged
merged 46 commits into from
Dec 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0ca818d
seata-server support jdk17
funky-eyes Mar 3, 2022
41367a8
update
funky-eyes Mar 4, 2022
29370f8
code formatting
funky-eyes Mar 4, 2022
2ca50e0
code formatting
funky-eyes Mar 4, 2022
72f9a68
Merge branch 'develop' into support_jdk17
funky-eyes Apr 12, 2022
1b3c535
Merge branch 'develop' of github.com:seata/seata into support_jdk17
funky-eyes Jun 7, 2022
b034f4f
bugfix
funky-eyes Jun 7, 2022
6e9fb29
Merge branch 'develop' into support_jdk17
funky-eyes Jun 8, 2022
b4fbd8f
Merge branch 'develop' into support_jdk17
funky-eyes Jun 12, 2022
adcd677
Merge branch 'develop' into support_jdk17
xingfudeshi Jun 17, 2022
ace18c8
Merge branch 'develop' of github.com:seata/seata into support_jdk17
funky-eyes Jun 27, 2022
3ffae02
merge
funky-eyes Jun 27, 2022
4167b6f
Merge branch 'support_jdk17' of github.com:a364176773/seata into supp…
funky-eyes Jun 27, 2022
4a632bb
Merge branch 'develop' into support_jdk17
funky-eyes Jul 20, 2022
5f75d85
Merge branch 'develop' into support_jdk17
funky-eyes Jul 20, 2022
83e553d
update
funky-eyes Jul 20, 2022
f4fb0bb
Merge branch 'develop' of github.com:seata/seata into support_jdk17
funky-eyes Jul 30, 2022
60b276e
Merge branch 'develop' of github.com:seata/seata into support_jdk17
funky-eyes Jul 30, 2022
d1166af
cglib -> byte-buddy
funky-eyes Aug 16, 2022
94d7bb4
cglib -> byte-buddy
funky-eyes Aug 16, 2022
e22fd59
spring-boot->2.5.9
funky-eyes Aug 16, 2022
61c9158
opt
funky-eyes Aug 17, 2022
fc5d93e
opt
funky-eyes Aug 17, 2022
256b06f
opt
funky-eyes Aug 17, 2022
87eb1cc
opt
funky-eyes Aug 17, 2022
21ea347
opt
funky-eyes Aug 17, 2022
4054faf
Merge branch 'develop' into support_jdk17
wangliang181230 Aug 18, 2022
f9e68dc
opt
funky-eyes Aug 18, 2022
621a268
Merge remote-tracking branch 'origin/support_jdk17' into support_jdk17
funky-eyes Aug 18, 2022
b12b7a7
opt
funky-eyes Aug 18, 2022
36aa4df
update
funky-eyes Aug 18, 2022
2a333b7
Merge branch 'develop' into support_jdk17
funky-eyes Aug 19, 2022
2ce2e8f
Update .github/workflows/publishes.yml
funky-eyes Aug 19, 2022
8d660ab
update
funky-eyes Aug 19, 2022
6873818
update
funky-eyes Aug 19, 2022
d1dfc9e
update
funky-eyes Aug 19, 2022
c657f2a
Merge branch 'support_jdk17' of github.com:a364176773/seata into supp…
funky-eyes Aug 19, 2022
2945550
update
funky-eyes Aug 19, 2022
fbfb5eb
Merge branch 'develop' into support_jdk17
wangliang181230 Aug 22, 2022
0a47b29
Merge branch 'develop' into support_jdk17
funky-eyes Sep 3, 2022
a5d749d
Merge branch 'develop' into support_jdk17
funky-eyes Oct 24, 2022
0cf5a42
Merge branch 'develop' into support_jdk17
funky-eyes Nov 5, 2022
3234d07
Merge branch 'develop' into support_jdk17
funky-eyes Nov 7, 2022
11abd83
Merge branch 'develop' into support_jdk17
wangliang181230 Nov 28, 2022
8c1b7de
Merge branch 'develop' into support_jdk17
funky-eyes Dec 16, 2022
c5ae741
Update pom.xml
funky-eyes Dec 16, 2022
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ dependency-reduced-pom.xml
/distribution/bin/
/distribution/conf/
/distribution/lib/
/distribution/ext/
/distribution/logs/
/distribution/*/bin/
/distribution/*/conf/
/distribution/*/lib/
/distribution/*/logs/
/distribution/*/ext/
/server/*root.*
/server/.root.*
/server/sessionStore/
Expand Down
4 changes: 2 additions & 2 deletions build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- The version of spring-boot for 'spring-boot-dependencies' and 'spring-boot-maven-plugin' -->
<spring-boot.version>2.4.13</spring-boot.version>
<spring-framework.version>5.3.18</spring-framework.version>
<spring-boot.version>2.5.14</spring-boot.version>
<spring-framework.version>5.3.22</spring-framework.version>

<!-- Maven plugin versions -->
<!-- Build -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;

import io.seata.common.util.CollectionUtils;
import io.seata.common.util.DurationUtil;
import io.seata.common.util.StringUtils;
Expand All @@ -37,7 +36,7 @@ public class ConfigurationCache implements ConfigurationChangeListener {

private static final String METHOD_LATEST_CONFIG = METHOD_PREFIX + "LatestConfig";

private static final ConcurrentHashMap<String, ObjectWrapper> CONFIG_CACHE = new ConcurrentHashMap<>();
private static final Map<String, ObjectWrapper> CONFIG_CACHE = new ConcurrentHashMap<>();

private Map<String, HashSet<ConfigurationChangeListener>> configListenersMap = new HashMap<>();

Expand Down
2 changes: 1 addition & 1 deletion distribution/bin/seata-server.bat
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,4 @@ if "%FORCE_EXIT_ON_ERROR%" == "on" (
if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
)

exit /B %ERROR_CODE%
exit /B %ERROR_CODE%
2 changes: 1 addition & 1 deletion distribution/bin/seata-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,4 @@ CMD_LINE_ARGS=$@
# start
echo "$JAVACMD ${JAVA_OPT} ${CMD_LINE_ARGS}" > ${BASEDIR}/logs/start.out 2>&1 &
nohup $JAVACMD ${JAVA_OPT} ${CMD_LINE_ARGS} >> ${BASEDIR}/logs/start.out 2>&1 &
echo "seata-server is starting, you can check the ${BASEDIR}/logs/start.out"
echo "seata-server is starting, you can check the ${BASEDIR}/logs/start.out"
2 changes: 1 addition & 1 deletion distribution/release-seata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<fileSet>
<directory>../ext/apm-seata-skywalking-plugin/target/ext/skywalking-agent/</directory>
<outputDirectory>ext/apm-skywalking/</outputDirectory>
<outputDirectory>ext/apm-skywalking</outputDirectory>
</fileSet>

<fileSet>
Expand Down
6 changes: 1 addition & 5 deletions server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,7 @@
<jvmFlag>-XX:HeapDumpPath=/var/log/seata_heapdump.hprof</jvmFlag>
<!--gc-->
<jvmFlag>-XX:+DisableExplicitGC</jvmFlag>
<jvmFlag>-XX:+CMSParallelRemarkEnabled</jvmFlag>
<jvmFlag>-XX:+UseCMSInitiatingOccupancyOnly</jvmFlag>
<jvmFlag>-XX:CMSInitiatingOccupancyFraction=75</jvmFlag>
<jvmFlag>-Xloggc:/var/log/seata_gc.log</jvmFlag>
<jvmFlag>-verbose:gc</jvmFlag>
<jvmFlag>-XX:+UseG1GC</jvmFlag>
<!--netty-->
<jvmFlag>-Dio.netty.leakDetectionLevel=advanced</jvmFlag>
<!--log-->
Expand Down