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

Test: add more debug output for SessionFactoryLoadBalancingTests failures 

Original commit: elastic/x-pack-elasticsearch@206048b94d
This commit is contained in:
jaymode 2017-04-26 11:15:07 -04:00
parent c1c66f38ea
commit c9d039525c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapTestCase.java
View File

@ -13,6 +13,7 @@ import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.xpack.security.authc.RealmConfig;
import org.elasticsearch.xpack.security.authc.ldap.LdapRealm;
@ -106,6 +107,7 @@ public abstract class LdapTestCase extends ESTestCase {
Settings.Builder builder = Settings.builder()
.putArray(URLS_SETTING, ldapUrl)
.putArray(USER_DN_TEMPLATES_SETTING_KEY, userTemplate)
.put(SessionFactory.TIMEOUT_TCP_CONNECTION_SETTING, TimeValue.timeValueSeconds(1L))
.put(SessionFactory.IGNORE_REFERRAL_ERRORS_SETTING.getKey(), ignoreReferralErrors)
.put("group_search.base_dn", groupSearchBase)
.put("group_search.scope", scope)

17
plugin/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/SessionFactoryLoadBalancingTests.java
View File

@ -20,12 +20,14 @@ import org.elasticsearch.xpack.ssl.SSLService;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
@ -76,6 +78,7 @@ public class SessionFactoryLoadBalancingTests extends LdapTestCase {
final List<MockServerSocket> boundSockets = new ArrayList<>();
final List<Thread> listenThreads = new ArrayList<>();
final CountDownLatch latch = new CountDownLatch(ldapServersToKill.size());
final CountDownLatch closeLatch = new CountDownLatch(1);
try {
for (InMemoryDirectoryServer ldapServerToKill : ldapServersToKill) {
final int index = ldapServersList.indexOf(ldapServerToKill);
@ -99,10 +102,17 @@ public class SessionFactoryLoadBalancingTests extends LdapTestCase {
Runnable runnable = () -> {
try (Socket socket = new MockSocket(InetAddress.getByName("localhost"), port)) {
logger.debug("opened socket [{}] and blocking other connections", socket);
// ensure we cannot open another socket
IOException e = expectThrows(IOException.class, () -> {
try (MockSocket mockSocket = new MockSocket()) {
mockSocket.connect(new InetSocketAddress(InetAddress.getByName("localhost"), port), 500);
}
});
assertThat(e.getMessage(), containsString("timed out"));
latch.countDown();
socket.getInputStream().read();
} catch (IOException e) {
logger.trace("caught io exception", e);
closeLatch.await();
} catch (IOException | InterruptedException e) {
logger.debug("caught exception", e);
}
};
Thread thread = new Thread(runnable);
@ -125,6 +135,7 @@ public class SessionFactoryLoadBalancingTests extends LdapTestCase {
}
}
} finally {
closeLatch.countDown();
for (MockServerSocket socket : boundSockets) {
socket.close();
}