optimize: distinguish database behavior according to the branch type #2415
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,8 +22,10 @@ | |
| import com.alibaba.dubbo.rpc.Result; | ||
| import com.alibaba.dubbo.rpc.RpcContext; | ||
| import com.alibaba.dubbo.rpc.RpcException; | ||
| import io.seata.common.util.StringUtils; | ||
| import io.seata.core.context.RootContext; | ||
| import io.seata.core.constants.DubboConstants; | ||
| import io.seata.core.model.BranchType; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
|
|
@@ -43,45 +45,51 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcExcept | |
| return invoker.invoke(invocation); | ||
| } | ||
| String xid = RootContext.getXID(); | ||
| String branchType = RootContext.getBranchType(); | ||
|
|
||
| String rpcXid = getRpcXid(); | ||
| String rpcBranchType = RpcContext.getContext().getAttachment(RootContext.KEY_BRANCH_TYPE); | ||
| if (LOGGER.isDebugEnabled()) { | ||
| LOGGER.debug("xid in RootContext[{}] xid in RpcContext[{}]", xid, rpcXid); | ||
| } | ||
| boolean bind = false; | ||
| if (xid != null) { | ||
| RpcContext.getContext().setAttachment(RootContext.KEY_XID, xid); | ||
| RpcContext.getContext().setAttachment(RootContext.KEY_BRANCH_TYPE, branchType); | ||
| } else { | ||
| if (rpcXid != null) { | ||
| RootContext.bind(rpcXid); | ||
| if (StringUtils.equals(BranchType.TCC.name(), rpcBranchType)) { | ||
| RootContext.bindBranchType(BranchType.TCC); | ||
|
There was a problem hiding this comment. Saga branch never set ? There was a problem hiding this comment. I have discussed with the author of saga. This pr is only responsible for the branchType judgment logic in ExecuteTemplate and the TCC branchType passing in Filter. The specific Saga branchtype assignment and other logic will be provided by the feature saga related pr There was a problem hiding this comment. this #2551, autor is wangliang1986 |
||
| } | ||
| bind = true; | ||
| if (LOGGER.isDebugEnabled()) { | ||
| LOGGER.debug("bind xid [{}] branchType [{}] to RootContext", rpcXid, rpcBranchType); | ||
| } | ||
| } | ||
| } | ||
| try { | ||
| return invoker.invoke(invocation); | ||
| } finally { | ||
| if (bind) { | ||
| String unbindXid = RootContext.unbind(); | ||
| String previousBranchType = RootContext.getBranchType(); | ||
| if (StringUtils.equals(BranchType.TCC.name(), previousBranchType)) { | ||
| RootContext.unbindBranchType(); | ||
| } | ||
| if (LOGGER.isDebugEnabled()) { | ||
| LOGGER.debug("unbind xid [{}] branchType [{}] from RootContext", unbindXid, previousBranchType); | ||
|
There was a problem hiding this comment. BranchType print null in AT mode is not very elegant. There was a problem hiding this comment. How about judge in the log output temporarily,and print "AT" if it is null |
||
| } | ||
| if (!rpcXid.equalsIgnoreCase(unbindXid)) { | ||
| LOGGER.warn("xid in change during RPC from {} to {},branchType from {} to {}", rpcXid, unbindXid, | ||
| rpcBranchType, previousBranchType); | ||
| if (unbindXid != null) { | ||
| RootContext.bind(unbindXid); | ||
| LOGGER.warn("bind xid [{}] back to RootContext", unbindXid); | ||
| if (StringUtils.equals(BranchType.TCC.name(), previousBranchType)) { | ||
| RootContext.bindBranchType(BranchType.TCC); | ||
| LOGGER.warn("bind branchType [{}] back to RootContext", previousBranchType); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it better to separate and judge?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It will not be processed this time, and transaction context object encapsulation will be provided later to handle log output uniformly.