Skip to content

Commit

Permalink
Ensure latch is counted down in ssl reload test (#37313)
Browse files Browse the repository at this point in the history
This change ensures we always countdown the latch in the
SSLConfigurationReloaderTests to prevent the suite from timing out in
case of an exception. Additionally, we also increase the logging of the
resource watcher in case an IOException occurs.

See #36053
  • Loading branch information
jaymode committed Jan 10, 2019
1 parent 83f7423 commit e6d3d85
Showing 1 changed file with 9 additions and 7 deletions.
Expand Up @@ -17,6 +17,7 @@
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.http.MockResponse;
import org.elasticsearch.test.http.MockWebServer;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.threadpool.TestThreadPool;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.watcher.ResourceWatcherService;
Expand Down Expand Up @@ -55,6 +56,7 @@
/**
* Unit tests for the reloading of SSL configuration
*/
@TestLogging("org.elasticsearch.watcher:TRACE")
public class SSLConfigurationReloaderTests extends ESTestCase {

private ThreadPool threadPool;
Expand Down Expand Up @@ -435,20 +437,20 @@ void reloadSSLContext(SSLConfiguration configuration) {
assertThat(sslService.sslContextHolder(config).sslContext(), sameInstance(context));

}
private void validateSSLConfigurationIsReloaded(Settings settings, Environment env,
Consumer<SSLContext> preChecks,
Runnable modificationFunction,
Consumer<SSLContext> postChecks)
throws Exception {

private void validateSSLConfigurationIsReloaded(Settings settings, Environment env, Consumer<SSLContext> preChecks,
Runnable modificationFunction, Consumer<SSLContext> postChecks) throws Exception {
final CountDownLatch reloadLatch = new CountDownLatch(1);
final SSLService sslService = new SSLService(settings, env);
final SSLConfiguration config = sslService.getSSLConfiguration("xpack.ssl");
new SSLConfigurationReloader(env, sslService, resourceWatcherService) {
@Override
void reloadSSLContext(SSLConfiguration configuration) {
super.reloadSSLContext(configuration);
reloadLatch.countDown();
try {
super.reloadSSLContext(configuration);
} finally {
reloadLatch.countDown();
}
}
};
// Baseline checks
Expand Down

0 comments on commit e6d3d85

Please sign in to comment.