0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1496 improve error message

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-02-12 07:43:05 +09:00
parent d16873e830
commit 3978fe3618
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/org/codelibs/fess/es/client/FessEsClient.java
View file

@ -154,6 +154,7 @@ import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.client.PreBuiltTransportClient;
import org.lastaflute.core.message.UserMessages;
import org.lastaflute.di.exception.ContainerInitFailureException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -299,7 +300,7 @@ public class FessEsClient implements Client {
}
}
waitForYellowStatus();
waitForYellowStatus(fessConfig);
indexConfigList.forEach(configName -> {
final String[] values = configName.split("/");
@ -590,12 +591,20 @@ public class FessEsClient implements Client {
}
}
private void waitForYellowStatus() {
final ClusterHealthResponse response =
client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute()
.actionGet(ComponentUtil.getFessConfig().getIndexHealthTimeout());
if (logger.isDebugEnabled()) {
logger.debug("Elasticsearch Cluster Status: " + response.getStatus());
private void waitForYellowStatus(final FessConfig fessConfig) {
try {
final ClusterHealthResponse response =
client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute()
.actionGet(fessConfig.getIndexHealthTimeout());
if (logger.isDebugEnabled()) {
logger.debug("Elasticsearch Cluster Status: " + response.getStatus());
}
} catch (Exception e) {
final String message =
"Elasticsearch (" + System.getProperty(Constants.FESS_ES_TRANSPORT_ADDRESSES)
+ ") is not available. Check the state of your Elasticsearch cluster ("
+ fessConfig.getElasticsearchClusterName() + ").";
throw new ContainerInitFailureException(message, e);
}
}