diff --git a/common/src/main/java/io/seata/common/ConfigurationKeys.java b/common/src/main/java/io/seata/common/ConfigurationKeys.java index d272467edf9..0cb531b3d31 100644 --- a/common/src/main/java/io/seata/common/ConfigurationKeys.java +++ b/common/src/main/java/io/seata/common/ConfigurationKeys.java @@ -982,11 +982,6 @@ public interface ConfigurationKeys { */ String ENABLE_PARALLEL_HANDLE_BRANCH_KEY = SERVER_PREFIX + "enableParallelHandleBranch"; - /** - * The constant RM_APPLICATION_DATA_PERCENT_WARN - */ - String RM_APPLICATION_DATA_PERCENT_WARN = CLIENT_RM_PREFIX + "applicationDataWarnPercent"; - /** * The constant RM_APPLICATION_DATA_SIZE_ERROR */ @@ -997,11 +992,6 @@ public interface ConfigurationKeys { */ String RM_APPLICATION_DATA_SIZE_CHECK = CLIENT_RM_PREFIX + "applicationDataEnable"; - /** - * The constant SERVER_APPLICATION_DATA_PERCENT_WARN - */ - String SERVER_APPLICATION_DATA_PERCENT_WARN = SERVER_PREFIX + "applicationDataWarnPercent"; - /** * The constant SERVER_APPLICATION_DATA_SIZE_ERROR */ diff --git a/common/src/main/java/io/seata/common/DefaultValues.java b/common/src/main/java/io/seata/common/DefaultValues.java index 19a3e44cc97..a109e8cffa6 100644 --- a/common/src/main/java/io/seata/common/DefaultValues.java +++ b/common/src/main/java/io/seata/common/DefaultValues.java @@ -197,11 +197,6 @@ public interface DefaultValues { */ long DEFAULT_RPC_TC_REQUEST_TIMEOUT = Duration.ofSeconds(15).toMillis(); - /** - * the constant DEFAULT_APPLICATION_DATA_PERENT_WARN - */ - int DEFAULT_APPLICATION_DATA_PERENT_WARN = 50; - /** * the constant DEFAULT_APPLICATION_DATA_SIZE_ERR */ diff --git a/common/src/main/java/io/seata/common/util/StringUtils.java b/common/src/main/java/io/seata/common/util/StringUtils.java index 5a9a8c98b6a..4970b23389a 100644 --- a/common/src/main/java/io/seata/common/util/StringUtils.java +++ b/common/src/main/java/io/seata/common/util/StringUtils.java @@ -358,11 +358,10 @@ public static String hump2Line(String str) { * * @param data the str * @param dataName the data name - * @param warningPercent log warning if size > errorSize * warningPercent / 100 * @param errorSize throw exception if size > errorSize * @return boolean */ - public static boolean checkDataSize(String data, String dataName, int warningPercent, int errorSize, boolean throwIfErr) { + public static boolean checkDataSize(String data, String dataName, int errorSize, boolean throwIfErr) { try { if (isBlank(data)) { return true; @@ -375,10 +374,6 @@ public static boolean checkDataSize(String data, String dataName, int warningPer } throw new IllegalArgumentException(dataName + " data is too large, size=" + length); } - if (length > errorSize * warningPercent / 100) { - LOGGER.warn("{} data is large(warningSize), size={}", dataName, length); - return false; - } } catch (UnsupportedEncodingException e) { LOGGER.error("decode name error: {}", e.getMessage(), e); } diff --git a/common/src/test/java/io/seata/common/util/StringUtilsTest.java b/common/src/test/java/io/seata/common/util/StringUtilsTest.java index be07c402ea7..680fd256b62 100644 --- a/common/src/test/java/io/seata/common/util/StringUtilsTest.java +++ b/common/src/test/java/io/seata/common/util/StringUtilsTest.java @@ -383,12 +383,12 @@ public String toString() { @Test void checkDataSize() { - assertThat(StringUtils.checkDataSize("","testdata",90,10,true)).isEqualTo(Boolean.TRUE); - assertThat(StringUtils.checkDataSize("1234567","testdata",90,10,true)).isEqualTo(Boolean.TRUE); - assertThat(StringUtils.checkDataSize("1234567","testdata",50,10,true)).isEqualTo(Boolean.FALSE); + assertThat(StringUtils.checkDataSize("","testdata",10,false)).isEqualTo(Boolean.TRUE); + assertThat(StringUtils.checkDataSize("1234567","testdata",17,false)).isEqualTo(Boolean.TRUE); + assertThat(StringUtils.checkDataSize("1234567","testdata",4,false)).isEqualTo(Boolean.FALSE); Assertions.assertThrows(IllegalArgumentException.class, () -> - StringUtils.checkDataSize("1234567","testdata",50,6,true) + StringUtils.checkDataSize("1234567","testdata",6,true) ); - assertThat( StringUtils.checkDataSize("1234567","testdata",50,6,false)).isEqualTo(Boolean.FALSE); + assertThat( StringUtils.checkDataSize("1234567","testdata",6,false)).isEqualTo(Boolean.FALSE); } } diff --git a/rm/src/main/java/io/seata/rm/AbstractResourceManager.java b/rm/src/main/java/io/seata/rm/AbstractResourceManager.java index a2ca015e048..1c5506c9369 100644 --- a/rm/src/main/java/io/seata/rm/AbstractResourceManager.java +++ b/rm/src/main/java/io/seata/rm/AbstractResourceManager.java @@ -49,8 +49,6 @@ public abstract class AbstractResourceManager implements ResourceManager { private static final Configuration CONFIG = ConfigurationFactory.getInstance(); - private static int appDataWarnPercent = CONFIG.getInt(ConfigurationKeys.RM_APPLICATION_DATA_PERCENT_WARN, - DefaultValues.DEFAULT_APPLICATION_DATA_PERENT_WARN); private static int appDataErrSize = CONFIG.getInt(ConfigurationKeys.RM_APPLICATION_DATA_SIZE_ERROR, DefaultValues.DEFAULT_APPLICATION_DATA_SIZE_ERR); @@ -69,7 +67,7 @@ public abstract class AbstractResourceManager implements ResourceManager { @Override public Long branchRegister(BranchType branchType, String resourceId, String clientId, String xid, String applicationData, String lockKeys) throws TransactionException { try { - StringUtils.checkDataSize(applicationData, "applicationData", appDataWarnPercent, appDataErrSize, throwDataSizeExp); + StringUtils.checkDataSize(applicationData, "applicationData", appDataErrSize, throwDataSizeExp); BranchRegisterRequest request = new BranchRegisterRequest(); request.setXid(xid); @@ -108,7 +106,7 @@ public Long branchRegister(BranchType branchType, String resourceId, String clie @Override public void branchReport(BranchType branchType, String xid, long branchId, BranchStatus status, String applicationData) throws TransactionException { try { - StringUtils.checkDataSize(applicationData, "applicationData", appDataWarnPercent, appDataErrSize, throwDataSizeExp); + StringUtils.checkDataSize(applicationData, "applicationData", appDataErrSize, throwDataSizeExp); BranchReportRequest request = new BranchReportRequest(); request.setXid(xid); request.setBranchId(branchId); diff --git a/server/src/main/java/io/seata/server/coordinator/AbstractCore.java b/server/src/main/java/io/seata/server/coordinator/AbstractCore.java index 9ea50e6726b..4bb73708291 100644 --- a/server/src/main/java/io/seata/server/coordinator/AbstractCore.java +++ b/server/src/main/java/io/seata/server/coordinator/AbstractCore.java @@ -65,7 +65,6 @@ public abstract class AbstractCore implements Core { protected LockManager lockManager = LockerManagerFactory.getLockManager(); private static final Configuration CONFIG = ConfigurationFactory.getInstance(); - private int appDataWarnPercent; private int appDataErrSize ; private boolean throwDataSizeExp ; @@ -76,8 +75,6 @@ public AbstractCore(RemotingServer remotingServer) { throw new IllegalArgumentException("remotingServer must be not null"); } this.remotingServer = remotingServer; - this.appDataWarnPercent = CONFIG.getInt(ConfigurationKeys.SERVER_APPLICATION_DATA_PERCENT_WARN, - DefaultValues.DEFAULT_APPLICATION_DATA_PERENT_WARN); this.appDataErrSize = CONFIG.getInt(ConfigurationKeys.SERVER_APPLICATION_DATA_SIZE_ERROR, DefaultValues.DEFAULT_APPLICATION_DATA_SIZE_ERR); this.throwDataSizeExp = CONFIG.getBoolean(ConfigurationKeys.SERVER_APPLICATION_DATA_SIZE_CHECK, false); @@ -90,7 +87,7 @@ public AbstractCore(RemotingServer remotingServer) { public Long branchRegister(BranchType branchType, String resourceId, String clientId, String xid, String applicationData, String lockKeys) throws TransactionException { GlobalSession globalSession = assertGlobalSessionNotNull(xid, false); - StringUtils.checkDataSize(applicationData, "applicationData", appDataWarnPercent, appDataErrSize, throwDataSizeExp); + StringUtils.checkDataSize(applicationData, "applicationData", appDataErrSize, throwDataSizeExp); return SessionHolder.lockAndExecute(globalSession, () -> { globalSessionStatusCheck(globalSession);