Skip to content

[SPARK-26069][TESTS][FOLLOWUP]Add another possible error message #23109

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
zsxwing wants to merge 1 commit into from
Closed

[SPARK-26069][TESTS][FOLLOWUP]Add another possible error message #23109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions common/network-common/src/test/java/org/apache/spark/network/RpcIntegrationSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,26 +371,30 @@ private void assertErrorsContain(Set<String> errors, Set<String> contains) {

private void assertErrorAndClosed(RpcResult result, String expectedError) {
assertTrue("unexpected success: " + result.successMessages, result.successMessages.isEmpty());
// we expect 1 additional error, which should contain one of the follow messages:
// - "closed"
// - "Connection reset"
// - "java.nio.channels.ClosedChannelException"
Set<String> errors = result.errorMessages;
assertEquals("Expected 2 errors, got " + errors.size() + "errors: " +
errors, 2, errors.size());

// We expect 1 additional error due to closed connection and here are possible keywords in the
// error message.
Set<String> possibleClosedErrors = Sets.newHashSet(
"closed",
"Connection reset",
"java.nio.channels.ClosedChannelException",
"java.io.IOException: Broken pipe"
);
Set<String> containsAndClosed = Sets.newHashSet(expectedError);
containsAndClosed.add("closed");
containsAndClosed.add("Connection reset");
containsAndClosed.add("java.nio.channels.ClosedChannelException");
containsAndClosed.addAll(possibleClosedErrors);

Pair<Set<String>, Set<String>> r = checkErrorsContain(errors, containsAndClosed);

assertTrue("Got a non-empty set " + r.getLeft(), r.getLeft().isEmpty());

Set<String> errorsNotFound = r.getRight();
assertEquals(
"The size of " + errorsNotFound.toString() + " was not 2", 2, errorsNotFound.size());
"The size of " + errorsNotFound + " was not " + (possibleClosedErrors.size() - 1),
possibleClosedErrors.size() - 1,
errorsNotFound.size());
for (String err: errorsNotFound) {
assertTrue("Found a wrong error " + err, containsAndClosed.contains(err));
}
Expand Down