Skip to content

ZOOKEEPER-3542 X509UtilTest#testClientRenegotiationFails is flaky on JDK8 + linux on machines with 2 cores #1088

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

ZOOKEEPER-3542 X509UtilTest#testClientRenegotiationFails is flaky on JDK8 + linux on machines with 2 cores #1088

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
5 changes: 5 additions & 0 deletions zookeeper-server/src/test/java/org/apache/zookeeper/common/X509UtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
import java.security.Security;
import java.util.Collection;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import javax.net.ssl.HandshakeCompletedEvent;
Expand Down Expand Up @@ -538,6 +540,7 @@ public void testClientRenegotiationFails() throws Throwable {
SSLSocket clientSocket = null;
SSLSocket serverSocket = null;
final AtomicInteger handshakesCompleted = new AtomicInteger(0);
Copy link
Copy Markdown
Contributor

@lvfangmin lvfangmin Sep 11, 2019

Choose a reason for hiding this comment

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

Looks like we can remove handshakesCompleted after adding the count down.

Copy link
Copy Markdown
Contributor Author

@eolivelli eolivelli Sep 12, 2019

Choose a reason for hiding this comment

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

I thought about it.

The comment below states that we want to check that the handshake completes only once and not twice.

Now, the check is performed in the finally block, and the game should be over at that point.

This change slows down the test by forcing a synchronization point.

As we are waiting only for the first call we could still have a race and miss the second call but at least we are not changing the core logic of this test

Copy link
Copy Markdown
Contributor Author

@eolivelli eolivelli Sep 12, 2019

Choose a reason for hiding this comment

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

So I would like to keep the AtomicInteger

final CountDownLatch handshakeCompleted = new CountDownLatch(1);
try {
InetSocketAddress localServerAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(), port);
listeningSocket.bind(localServerAddress);
Expand All @@ -550,6 +553,7 @@ public SSLSocket call() throws Exception {
@Override
public void handshakeCompleted(HandshakeCompletedEvent handshakeCompletedEvent) {
handshakesCompleted.getAndIncrement();
handshakeCompleted.countDown();
}
});
assertEquals(1, sslSocket.getInputStream().read());
Expand Down Expand Up @@ -582,6 +586,7 @@ public void handshakeCompleted(HandshakeCompletedEvent handshakeCompletedEvent)
workerPool.shutdown();
// Make sure the first handshake completed and only the second
// one failed.
handshakeCompleted.await(5, TimeUnit.SECONDS);
assertEquals(1, handshakesCompleted.get());
}
}
Expand Down