summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
0edd4f1)
Add connection timeout when creating HTTPUrlConnection.
Additionally, add some logging verbosity to the health
check RPCs for at-a-glance recognition.
Signed-off-by: Haddox, Anthony <ah0647@att.com>
Issue-ID: CCSDK-1921
Change-Id: I5dcf8c4b4899f121080eedd546e1a1f6fe120a94
private static final String FAULTY = "FAULTY";
private static final String VALUE = "value";
private static final String OUTPUT = "output";
private static final String FAULTY = "FAULTY";
private static final String VALUE = "value";
private static final String OUTPUT = "output";
+ private static final int CONNECTION_TIMEOUT = 5000; // 5 second timeout
private String akkaConfig;
private String jolokiaClusterPath;
private String shardManagerPath;
private String akkaConfig;
private String jolokiaClusterPath;
private String shardManagerPath;
outputBuilder.setStatus("200");
outputBuilder.setHealth(getAdminHealth());
outputBuilder.setServedBy(member);
outputBuilder.setStatus("200");
outputBuilder.setHealth(getAdminHealth());
outputBuilder.setServedBy(member);
+ log.info(outputBuilder.build().toString());
return Futures.immediateFuture(RpcResultBuilder.<AdminHealthOutput>status(true).withResult(outputBuilder.build()).build());
}
return Futures.immediateFuture(RpcResultBuilder.<AdminHealthOutput>status(true).withResult(outputBuilder.build()).build());
}
outputBuilder.setServedBy(member);
RpcResult<ClusterHealthOutput> rpcResult = RpcResultBuilder.<ClusterHealthOutput>status(true).withResult(outputBuilder.build()).build();
outputBuilder.setServedBy(member);
RpcResult<ClusterHealthOutput> rpcResult = RpcResultBuilder.<ClusterHealthOutput>status(true).withResult(outputBuilder.build()).build();
+ log.info("{}:cluster-health: Site 1 | Healthy ODLs {}", APP_NAME, site1Health);
+ if(siteConfiguration == SiteConfiguration.GEO) {
+ log.info("{}:cluster-health: Site 2 | Healthy ODLs {}", APP_NAME, site2Health);
+ }
return Futures.immediateFuture(rpcResult);
}
return Futures.immediateFuture(rpcResult);
}
outputBuilder.getSites().add(builder.build());
builder = getSitesBuilder(site2HealthyODLs, site2Voting, crossSiteAdminHealthy, crossSiteDbHealthy, crossSiteIdentifier);
outputBuilder.getSites().add(builder.build());
outputBuilder.getSites().add(builder.build());
builder = getSitesBuilder(site2HealthyODLs, site2Voting, crossSiteAdminHealthy, crossSiteDbHealthy, crossSiteIdentifier);
outputBuilder.getSites().add(builder.build());
+ log.info("{}:site-health: Site 1 ({}) | hasVotingMembers?: {} | Healthy ODLs: {} | ADM isHealthy?: {} | DB isHealthy?: {}", APP_NAME, siteIdentifier, site1Voting, site1HealthyODLs, HEALTHY.equals(adminHealth), HEALTHY.equals(databaseHealth));
+ log.info("{}:site-health: Site 2 ({}) | hasVotingMembers?: {} | Healthy ODLs: {} | ADM isHealthy?: {} | DB isHealthy?: {}", APP_NAME, crossSiteIdentifier, site2Voting, site2HealthyODLs, crossSiteAdminHealthy, crossSiteDbHealthy);
}
else {
// Make calls over to site 1 healthchecks
}
else {
// Make calls over to site 1 healthchecks
outputBuilder.getSites().add(builder.build());
builder = getSitesBuilder(site2HealthyODLs, site2Voting, HEALTHY.equals(adminHealth), HEALTHY.equals(databaseHealth), siteIdentifier);
outputBuilder.getSites().add(builder.build());
outputBuilder.getSites().add(builder.build());
builder = getSitesBuilder(site2HealthyODLs, site2Voting, HEALTHY.equals(adminHealth), HEALTHY.equals(databaseHealth), siteIdentifier);
outputBuilder.getSites().add(builder.build());
+ log.info("{}:site-health: Site 1 ({}) | hasVotingMembers?: {} | Healthy ODLs: {} | ADM isHealthy?: {} | DB isHealthy?: {}", APP_NAME, siteIdentifier, site1Voting, site1HealthyODLs, HEALTHY.equals(adminHealth), HEALTHY.equals(databaseHealth));
+ log.info("{}:site-health: Site 2 ({}) | hasVotingMembers?: {} | Healthy ODLs: {} | ADM isHealthy?: {} | DB isHealthy?: {}", APP_NAME, crossSiteIdentifier, site2Voting, site2HealthyODLs, crossSiteAdminHealthy, crossSiteDbHealthy);
connection.addRequestProperty("Authorization", auth);
connection.setRequestProperty("Connection", "keep-alive");
connection.setRequestProperty("Proxy-Connection", "keep-alive");
connection.addRequestProperty("Authorization", auth);
connection.setRequestProperty("Connection", "keep-alive");
connection.setRequestProperty("Proxy-Connection", "keep-alive");
+ connection.setConnectTimeout(CONNECTION_TIMEOUT);
+ connection.setReadTimeout(CONNECTION_TIMEOUT);