Skip to content

fixed for asyncFinishLock: avoid call finish more than once #3073

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

Closed
qxo wants to merge 4 commits into from
+4 −7
Closed

fixed for asyncFinishLock: avoid call finish more than once #3073

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2158629
fixed for asyncFinishLock: avoid call finish more than once
qxo Jul 14, 2019
acf6a1c
Merge branch 'master' into fix4asyncFinishLock
wu-sheng Jul 15, 2019
46dd188
Merge branch 'master' into fix4asyncFinishLock
wu-sheng Jul 15, 2019
e0df11c
Merge branch 'master' into fix4asyncFinishLock
wu-sheng Jul 17, 2019
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
11 changes: 4 additions & 7 deletions ...agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,7 @@ public boolean stopSpan(AbstractSpan span) {
throw new IllegalStateException("Stopping the unexpected span = " + span);
}

if (checkFinishConditions()) {
finish();
}
finishIf();

return activeSpanStack.isEmpty();
}
Expand All @@ -426,17 +424,16 @@ public boolean stopSpan(AbstractSpan span) {
@Override public void asyncStop(AsyncSpan span) {
asyncSpanCounter.addAndGet(-1);

if (checkFinishConditions()) {
finish();
}
finishIf();
}

private boolean checkFinishConditions() {
private boolean finishIf() {
if (isRunningInAsyncMode) {
asyncFinishLock.lock();
}
try {
if (activeSpanStack.isEmpty() && (!isRunningInAsyncMode || asyncSpanCounter.get() == 0)) {
finish();
return true;
}
} finally {
Expand Down