Skip to content

Fix NettyTransportClient.getCurrentId is not threadsafe(#1705) #1707

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

Merged
jasonjoo2010 merged 2 commits into from
Sep 14, 2020
Merged

Fix NettyTransportClient.getCurrentId is not threadsafe(#1705) #1707

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c51aa
Fix NettyTransportClient.getCurrentId is not threadsafe(#1705)
John-Chan Aug 30, 2020
67d011f
Ensure id increment in range
John-Chan Aug 30, 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
11 changes: 7 additions & 4 deletions ...t-default/src/main/java/com/alibaba/csp/sentinel/cluster/client/NettyTransportClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,12 @@ public ClusterResponse sendRequest(ClusterRequest request) throws Exception {
}

private int getCurrentId() {
if (idGenerator.get() > MAX_ID) {
idGenerator.set(0);
}
return idGenerator.incrementAndGet();
int pre, next;
do {
pre = idGenerator.get();
next = pre >= MAX_ID ? MIN_ID : pre + 1;
} while (!idGenerator.compareAndSet(pre, next));
return next;
}

/*public CompletableFuture<ClusterResponse> sendRequestAsync(ClusterRequest request) {
Expand All @@ -266,5 +268,6 @@ private int getCurrentId() {
return future;
}*/

private static final int MIN_ID = 1;
private static final int MAX_ID = 999_999_999;
}