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.

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

bugfix:fix key [transport.enableRmClientBatchSendRequest ] cache penetration #4678

Merged
merged 5 commits into from
Jun 13, 2022
Merged

bugfix:fix key [transport.enableRmClientBatchSendRequest ] cache penetration #4678

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9cf3f7a
bugfix:fix key [transport.enableRmClientBatchSendRequest ] cache pene…
Ifdevil Jun 10, 2022
2e1b58a
bugfix:fix key [transport.enableRmClientBatchSendRequest ] cache pene…
Ifdevil Jun 10, 2022
88d176a
bugfix:fix key [transport.enableRmClientBatchSendRequest ] cache pene…
Ifdevil Jun 11, 2022
a759467
bugfix:fix key [transport.enableRmClientBatchSendRequest ] cache pene…
Ifdevil Jun 12, 2022
ce734b4
update changes.md
Ifdevil Jun 12, 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
1 change: 1 addition & 0 deletions core/src/main/java/io/seata/core/rpc/netty/AbstractNettyRemotingClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ public abstract class AbstractNettyRemotingClient extends AbstractNettyRemoting
private final NettyPoolKey.TransactionRole transactionRole;
private ExecutorService mergeSendExecutorService;
private TransactionMessageHandler transactionMessageHandler;
protected volatile boolean enableClientBatchSendRequest;

@Override
public void init() {
Expand Down
27 changes: 17 additions & 10 deletions core/src/main/java/io/seata/core/rpc/netty/RmNettyRemotingClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
import io.seata.common.exception.FrameworkException;
import io.seata.common.thread.NamedThreadFactory;
import io.seata.common.util.StringUtils;
import io.seata.config.ConfigurationCache;
import io.seata.config.ConfigurationChangeEvent;
import io.seata.config.ConfigurationChangeListener;
import io.seata.config.ConfigurationFactory;
import io.seata.core.constants.ConfigurationKeys;
import io.seata.core.model.Resource;
Expand Down Expand Up @@ -87,6 +90,19 @@ public void init() {
private RmNettyRemotingClient(NettyClientConfig nettyClientConfig, EventExecutorGroup eventExecutorGroup,
ThreadPoolExecutor messageExecutor) {
super(nettyClientConfig, eventExecutorGroup, messageExecutor, TransactionRole.RMROLE);
// set enableClientBatchSendRequest
this.enableClientBatchSendRequest = ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.ENABLE_RM_CLIENT_BATCH_SEND_REQUEST,
ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.ENABLE_CLIENT_BATCH_SEND_REQUEST,DefaultValues.DEFAULT_ENABLE_RM_CLIENT_BATCH_SEND_REQUEST));
ConfigurationCache.addConfigListener(ConfigurationKeys.ENABLE_RM_CLIENT_BATCH_SEND_REQUEST, new ConfigurationChangeListener() {
@Override
public void onChangeEvent(ConfigurationChangeEvent event) {
String dataId = event.getDataId();
String newValue = event.getNewValue();
if (ConfigurationKeys.ENABLE_RM_CLIENT_BATCH_SEND_REQUEST.equals(dataId) && StringUtils.isNotBlank(newValue)) {
enableClientBatchSendRequest = Boolean.parseBoolean(newValue);
}
}
});
}

/**
Expand Down Expand Up @@ -272,16 +288,7 @@ protected String getTransactionServiceGroup() {

@Override
public boolean isEnableClientBatchSendRequest() {
// New configuration takes precedence
String newConfig = ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.ENABLE_RM_CLIENT_BATCH_SEND_REQUEST);
if (StringUtils.isNotBlank(newConfig)) {
return Boolean.parseBoolean(newConfig);
}
// Compatible with old configuration
// If the old configuration exists, use the old configuration
// RM client Turns on batch sending by default
return ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.ENABLE_CLIENT_BATCH_SEND_REQUEST,
DefaultValues.DEFAULT_ENABLE_RM_CLIENT_BATCH_SEND_REQUEST);
return enableClientBatchSendRequest;
}

@Override
Expand Down
19 changes: 17 additions & 2 deletions core/src/main/java/io/seata/core/rpc/netty/TmNettyRemotingClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
import io.seata.common.thread.NamedThreadFactory;
import io.seata.common.thread.RejectedPolicies;
import io.seata.common.util.NetUtil;
import io.seata.config.ConfigurationCache;
import io.seata.config.ConfigurationChangeEvent;
import io.seata.config.ConfigurationChangeListener;
import io.seata.config.ConfigurationFactory;
import io.seata.core.auth.AuthSigner;
import io.seata.core.constants.ConfigurationKeys;
Expand Down Expand Up @@ -73,6 +76,19 @@ private TmNettyRemotingClient(NettyClientConfig nettyClientConfig,
ThreadPoolExecutor messageExecutor) {
super(nettyClientConfig, eventExecutorGroup, messageExecutor, NettyPoolKey.TransactionRole.TMROLE);
this.signer = EnhancedServiceLoader.load(AuthSigner.class);
// set enableClientBatchSendRequest
this.enableClientBatchSendRequest = ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.ENABLE_TM_CLIENT_BATCH_SEND_REQUEST,
DefaultValues.DEFAULT_ENABLE_TM_CLIENT_BATCH_SEND_REQUEST);
ConfigurationCache.addConfigListener(ConfigurationKeys.ENABLE_TM_CLIENT_BATCH_SEND_REQUEST, new ConfigurationChangeListener() {
@Override
public void onChangeEvent(ConfigurationChangeEvent event) {
String dataId = event.getDataId();
String newValue = event.getNewValue();
if (ConfigurationKeys.ENABLE_TM_CLIENT_BATCH_SEND_REQUEST.equals(dataId) && StringUtils.isNotBlank(newValue)) {
enableClientBatchSendRequest = Boolean.parseBoolean(newValue);
}
}
});
}

/**
Expand Down Expand Up @@ -191,8 +207,7 @@ public String getTransactionServiceGroup() {

@Override
public boolean isEnableClientBatchSendRequest() {
return ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.ENABLE_TM_CLIENT_BATCH_SEND_REQUEST,
DefaultValues.DEFAULT_ENABLE_TM_CLIENT_BATCH_SEND_REQUEST);
return enableClientBatchSendRequest;
}

@Override
Expand Down