honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TEST: getCapturedRequestsAndClear should be atomic (#31312) 

We might lose messages between getCapturedRequestsAndClear calls.
This commit makes sure that both getCapturedRequestsAndClear and
getCapturedRequestsByTargetNodeAndClear are atomic.
This commit is contained in:
Nhat Nguyen 2018-06-14 21:32:07 -04:00 committed by GitHub
parent 0324103737
commit e5b7137508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/framework/src/main/java/org/elasticsearch/test/transport/CapturingTransport.java
View File

@ -46,6 +46,7 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@ -94,9 +95,17 @@ public class CapturingTransport implements Transport {
* @return the captured requests
*/
public CapturedRequest[] getCapturedRequestsAndClear() {
CapturedRequest[] capturedRequests = capturedRequests();
clear();
return capturedRequests;
List<CapturedRequest> requests = new ArrayList<>(capturedRequests.size());
capturedRequests.drainTo(requests);
return requests.toArray(new CapturedRequest[0]);
}
private Map<String, List<CapturedRequest>> groupRequestsByTargetNode(Collection<CapturedRequest> requests) {
Map<String, List<CapturedRequest>> result = new HashMap<>();
for (CapturedRequest request : requests) {
result.computeIfAbsent(request.node.getId(), node -> new ArrayList<>()).add(request);
}
return result;
}
/**
@ -104,16 +113,7 @@ public class CapturingTransport implements Transport {
* Doesn't clear the captured request list. See {@link #clear()}
*/
public Map<String, List<CapturedRequest>> capturedRequestsByTargetNode() {
Map<String, List<CapturedRequest>> map = new HashMap<>();
for (CapturedRequest request : capturedRequests) {
List<CapturedRequest> nodeList = map.get(request.node.getId());
if (nodeList == null) {
nodeList = new ArrayList<>();
map.put(request.node.getId(), nodeList);
}
nodeList.add(request);
}
return map;
return groupRequestsByTargetNode(capturedRequests);
}
/**
@ -125,9 +125,9 @@ public class CapturingTransport implements Transport {
* @return the captured requests grouped by target node
*/
public Map<String, List<CapturedRequest>> getCapturedRequestsByTargetNodeAndClear() {
Map<String, List<CapturedRequest>> map = capturedRequestsByTargetNode();
clear();
return map;
List<CapturedRequest> requests = new ArrayList<>(capturedRequests.size());
capturedRequests.drainTo(requests);
return groupRequestsByTargetNode(requests);
}
/** clears captured requests */