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

Dubbo adapter: entry exit with param #1532

Merged
merged 21 commits into from
Jun 11, 2020
Merged

Dubbo adapter: entry exit with param #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ff4e7d5
Merge pull request #1 from alibaba/master
wavesZh Feb 12, 2019
1a3510f
Merge branch 'master' of github.com:wavesZh/Sentinel
wavesZh Apr 20, 2019
380fd93
Merge remote-tracking branch 'upstream/master'
wavesZh Aug 8, 2019
f451f4f
Merge remote-tracking branch 'upstream/master'
wavesZh Aug 14, 2019
41201d0
Merge remote-tracking branch 'upstream/master'
wavesZh Aug 15, 2019
77fb922
Merge remote-tracking branch 'upstream/master'
wavesZh Sep 20, 2019
6e176f9
Merge branch 'master' of github.com:wavesZh/Sentinel
wavesZh Mar 6, 2020
57fc6d0
Merge remote-tracking branch 'upstream/master'
wavesZh Mar 16, 2020
761ce34
Merge remote-tracking branch 'upstream/master'
wavesZh Mar 17, 2020
702f46d
Merge remote-tracking branch 'upstream/master'
wavesZh Mar 30, 2020
5c5fbf8
Merge remote-tracking branch 'upstream/master'
wavesZh Apr 7, 2020
e9a38d6
Merge remote-tracking branch 'upstream/master'
wavesZh Apr 9, 2020
408e07d
merger
wavesZh Apr 27, 2020
59b92a6
Merge remote-tracking branch 'upstream/master'
wavesZh Apr 30, 2020
d3e3595
Merge remote-tracking branch 'upstream/master'
wavesZh May 7, 2020
12791d4
Merge remote-tracking branch 'upstream/master'
wavesZh May 11, 2020
c8e8fd2
Merge remote-tracking branch 'upstream/master'
wavesZh Jun 5, 2020
3f5e7a3
exit with params
wavesZh Jun 8, 2020
e49758d
exit with params
wavesZh Jun 8, 2020
0d9c211
exit with params
wavesZh Jun 8, 2020
abce4ac
exit with params
wavesZh Jun 8, 2020
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
35 changes: 26 additions & 9 deletions ...ter/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboConsumerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ private Result syncInvoke(Invoker<?> invoker, Invocation invocation) {
throw e;
} finally {
if (methodEntry != null) {
methodEntry.exit();
methodEntry.exit(1, invocation.getArguments());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very careful code! How about also update SentinelDubboConsumerFilter in sentinel-dubbo-adaptor module to keep them in line, though they are for different version of dubbo.

Copy link
Contributor Author

@wavesZh wavesZh Jun 8, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ConsumerFilter in sentinel-dubbo-adaptor don't take param when entry currently. Should I add param when entry and exit?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it does't take param when entry currently, users may feel confused and suggest them to be consistent.

}
if (interfaceEntry != null) {
interfaceEntry.exit();
Expand All @@ -108,32 +108,49 @@ private Result syncInvoke(Invoker<?> invoker, Invocation invocation) {


private Result asyncInvoke(Invoker<?> invoker, Invocation invocation) {
LinkedList<Entry> queue = new LinkedList<>();
LinkedList<EntryHolder> queue = new LinkedList<>();
String methodResourceName = getMethodName(invoker, invocation);
String interfaceResourceName = getInterfaceName(invoker);
try {
queue.push(SphU.asyncEntry(interfaceResourceName, ResourceTypeConstants.COMMON_RPC, EntryType.OUT));
queue.push(SphU.asyncEntry(methodResourceName, ResourceTypeConstants.COMMON_RPC, EntryType.OUT, 1, invocation.getArguments()));
queue.push(new EntryHolder(SphU.asyncEntry(interfaceResourceName, ResourceTypeConstants.COMMON_RPC, EntryType.OUT), null));
queue.push(new EntryHolder(SphU.asyncEntry(methodResourceName, ResourceTypeConstants.COMMON_RPC, EntryType.OUT, 1, invocation.getArguments()), invocation.getArguments()));
Result result = invoker.invoke(invocation);
result.whenCompleteWithContext(new BiConsumer<Result, Throwable>() {
@Override
public void accept(Result result, Throwable throwable) {
while (!queue.isEmpty()) {
Entry entry = queue.pop();
Tracer.traceEntry(result.getException(), entry);
entry.exit();
EntryHolder holder = queue.pop();
Tracer.traceEntry(result.getException(), holder.entry);
exitEntry(holder);
}
}
});
return result;
} catch (BlockException e) {
while (!queue.isEmpty()) {
queue.pop().exit();
exitEntry(queue.pop());
}
return DubboFallbackRegistry.getConsumerFallback().handle(invoker, invocation, e);
}
}

}
class EntryHolder {

final private Entry entry;

final private Object[] params;

public EntryHolder(Entry entry, Object[] params) {
this.entry = entry;
this.params = params;
}
}

private void exitEntry(EntryHolder holder) {
if (holder.params != null) {
holder.entry.exit(1, holder.params);
} else {
holder.entry.exit();
}
}
}
4 changes: 2 additions & 2 deletions ...ter/src/main/java/com/alibaba/csp/sentinel/adapter/dubbo/SentinelDubboConsumerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcExcept
String resourceName = getResourceName(invoker, invocation, DubboConfig.getDubboConsumerPrefix());
interfaceEntry = SphU.entry(invoker.getInterface().getName(), ResourceTypeConstants.COMMON_RPC,
EntryType.OUT);
methodEntry = SphU.entry(resourceName, ResourceTypeConstants.COMMON_RPC, EntryType.OUT);
methodEntry = SphU.entry(resourceName, ResourceTypeConstants.COMMON_RPC, EntryType.OUT, invocation.getArguments());

Result result = invoker.invoke(invocation);
if (result.hasException()) {
Expand All @@ -77,7 +77,7 @@ public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcExcept
throw e;
} finally {
if (methodEntry != null) {
methodEntry.exit();
methodEntry.exit(1, invocation.getArguments());
}
if (interfaceEntry != null) {
interfaceEntry.exit();
Expand Down