Skip to content

Commit

Permalink
* added "Connection: close" headers to health-check and endpoint enum…
Browse files Browse the repository at this point in the history 
…eration calls in EcsHostListProvider

* added EcsHostListProviderTest test case to verify all connections are closed immediately in EcsHostListProvider (also refactored this class to remove duplicate code)
  • Loading branch information
@twincitiesguy
twincitiesguy committed Apr 28, 2021
1 parent 1efde50 commit 1d277c0
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 51 deletions.
6 changes: 5 additions & 1 deletion src/main/java/com/emc/rest/smart/ecs/EcsHostListProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ public List<Host> getHostList() {
@Override
public void runHealthCheck(Host host) {
// header is workaround for STORAGE-1833
PingResponse response = client.resource(getRequestUri(host, "/?ping")).header("x-emc-namespace", "x")
PingResponse response = client.resource(getRequestUri(host, "/?ping"))
.header("x-emc-namespace", "x")
.header("Connection", "close") // make sure maintenance calls are not kept alive
.get(PingResponse.class);

if (host instanceof VdcHost) {
Expand Down Expand Up @@ -144,6 +146,8 @@ protected List<Host> getDataNodes(Host host) {
// add date and auth headers
request.header("Date", rfcDate);
request.header("Authorization", "AWS " + user + ":" + signature);
// make sure maintenance calls are not kept alive
request.header("Connection", "close");

// make REST call
log.debug("retrieving VDC node list from {}", host.getName());
Expand Down
107 changes: 57 additions & 50 deletions src/test/java/com/emc/rest/smart/ecs/EcsHostListProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.client.apache4.ApacheHttpClient4;
import com.sun.jersey.client.apache4.config.ApacheHttpClient4Config;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

import javax.xml.bind.JAXBContext;
Expand All @@ -55,49 +59,78 @@ public class EcsHostListProviderTest {

public static final String PROXY_URI = "http.proxyUri";

@Test
public void testEcsHostListProvider() throws Exception {
private URI serverURI;
private String user;
private String secret;
private String proxyUri;
private Client client;
private EcsHostListProvider hostListProvider;

@Before
public void before() throws Exception {
Properties properties = TestConfig.getProperties();

URI serverURI = new URI(TestConfig.getPropertyNotEmpty(properties, S3_ENDPOINT));
String user = TestConfig.getPropertyNotEmpty(properties, S3_ACCESS_KEY);
String secret = TestConfig.getPropertyNotEmpty(properties, S3_SECRET_KEY);
String proxyUri = properties.getProperty(PROXY_URI);
serverURI = new URI(TestConfig.getPropertyNotEmpty(properties, S3_ENDPOINT));
user = TestConfig.getPropertyNotEmpty(properties, S3_ACCESS_KEY);
secret = TestConfig.getPropertyNotEmpty(properties, S3_SECRET_KEY);
proxyUri = properties.getProperty(PROXY_URI);

ClientConfig clientConfig = new DefaultClientConfig();
clientConfig.getProperties().put(ApacheHttpClient4Config.PROPERTY_CONNECTION_MANAGER, new PoolingClientConnectionManager());
if (proxyUri != null) clientConfig.getProperties().put(ApacheHttpClient4Config.PROPERTY_PROXY_URI, proxyUri);
Client client = ApacheHttpClient4.create(clientConfig);
client = ApacheHttpClient4.create(clientConfig);

SmartConfig smartConfig = new SmartConfig(serverURI.getHost());

EcsHostListProvider hostListProvider = new EcsHostListProvider(client, smartConfig.getLoadBalancer(), user, secret);
hostListProvider = new EcsHostListProvider(client, smartConfig.getLoadBalancer(), user, secret);
hostListProvider.setProtocol(serverURI.getScheme());
hostListProvider.setPort(serverURI.getPort());
}

@After
public void after() {
if (hostListProvider != null) hostListProvider.destroy();
}

@Test
public void testEcsHostListProvider() throws Exception {
List<Host> hostList = hostListProvider.getHostList();

Assert.assertTrue("server list is empty", hostList.size() > 0);
}

// intended to make sure we do not keep connections alive for any maintenance-related calls
// to ensure that each client instance does not consume an active connection on each ECS node just for health-checks
@Test
public void testHealthCheck() throws Exception {
Properties properties = TestConfig.getProperties();

URI serverURI = new URI(TestConfig.getPropertyNotEmpty(properties, S3_ENDPOINT));
String user = TestConfig.getPropertyNotEmpty(properties, S3_ACCESS_KEY);
String secret = TestConfig.getPropertyNotEmpty(properties, S3_SECRET_KEY);
String proxyUri = properties.getProperty(PROXY_URI);

ClientConfig clientConfig = new DefaultClientConfig();
if (proxyUri != null) clientConfig.getProperties().put(ApacheHttpClient4Config.PROPERTY_PROXY_URI, proxyUri);
Client client = ApacheHttpClient4.create(clientConfig);

SmartConfig smartConfig = new SmartConfig(serverURI.getHost());
public void testNoKeepAlive() {
// verify client has no open connections
HttpClient httpClient = ((ApacheHttpClient4) client).getClientHandler().getHttpClient();
PoolingClientConnectionManager connectionManager = (PoolingClientConnectionManager) httpClient.getConnectionManager();
Assert.assertEquals(0, connectionManager.getTotalStats().getAvailable());
Assert.assertEquals(0, connectionManager.getTotalStats().getLeased());
Assert.assertEquals(0, connectionManager.getTotalStats().getPending());

// ?endpoint call
List<Host> hosts = hostListProvider.getHostList();

// verify client still has no open connections
Assert.assertEquals(0, connectionManager.getTotalStats().getAvailable());
Assert.assertEquals(0, connectionManager.getTotalStats().getLeased());
Assert.assertEquals(0, connectionManager.getTotalStats().getPending());

// ?ping calls
for (Host host : hosts) {
hostListProvider.runHealthCheck(host);
}

EcsHostListProvider hostListProvider = new EcsHostListProvider(client, smartConfig.getLoadBalancer(), user, secret);
hostListProvider.setProtocol(serverURI.getScheme());
hostListProvider.setPort(serverURI.getPort());
// verify client still has no open connections
Assert.assertEquals(0, connectionManager.getTotalStats().getAvailable());
Assert.assertEquals(0, connectionManager.getTotalStats().getLeased());
Assert.assertEquals(0, connectionManager.getTotalStats().getPending());
}

@Test
public void testHealthCheck() throws Exception {
for (Host host : hostListProvider.getHostList()) {
hostListProvider.runHealthCheck(host);
}
Expand Down Expand Up @@ -140,15 +173,6 @@ public void testMaintenanceMode() {

@Test
public void testPing() throws Exception {
Properties properties = TestConfig.getProperties();

URI serverURI = new URI(TestConfig.getPropertyNotEmpty(properties, S3_ENDPOINT));
String proxyUri = properties.getProperty(PROXY_URI);

ClientConfig clientConfig = new DefaultClientConfig();
if (proxyUri != null) clientConfig.getProperties().put(ApacheHttpClient4Config.PROPERTY_PROXY_URI, proxyUri);
Client client = ApacheHttpClient4.create(clientConfig);

String portStr = serverURI.getPort() > 0 ? ":" + serverURI.getPort() : "";

PingResponse response = client.resource(
Expand All @@ -160,23 +184,6 @@ public void testPing() throws Exception {

@Test
public void testVdcs() throws Exception {
Properties properties = TestConfig.getProperties();

URI serverURI = new URI(TestConfig.getPropertyNotEmpty(properties, S3_ENDPOINT));
String user = TestConfig.getPropertyNotEmpty(properties, S3_ACCESS_KEY);
String secret = TestConfig.getPropertyNotEmpty(properties, S3_SECRET_KEY);
String proxyUri = properties.getProperty(PROXY_URI);

ClientConfig clientConfig = new DefaultClientConfig();
if (proxyUri != null) clientConfig.getProperties().put(ApacheHttpClient4Config.PROPERTY_PROXY_URI, proxyUri);
Client client = ApacheHttpClient4.create(clientConfig);

SmartConfig smartConfig = new SmartConfig(serverURI.getHost());

EcsHostListProvider hostListProvider = new EcsHostListProvider(client, smartConfig.getLoadBalancer(), user, secret);
hostListProvider.setProtocol(serverURI.getScheme());
hostListProvider.setPort(serverURI.getPort());

Vdc vdc1 = new Vdc(serverURI.getHost()).withName("vdc1");
Vdc vdc2 = new Vdc(serverURI.getHost()).withName("vdc2");
Vdc vdc3 = new Vdc(serverURI.getHost()).withName("vdc3");
Expand Down

0 comments on commit 1d277c0

Please sign in to comment.