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

Improve logging of repository verification exceptions. 

Some repository verification exceptions are currently only returned to the users but not logged on the nodes where the exceptions occurred, which makes troubleshooting difficult.

Closes #11760
This commit is contained in:
Igor Motov 2015-06-19 22:09:03 -04:00
parent aa4369f55b
commit 576b825d1c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
View File

@ -217,7 +217,7 @@ public class RepositoriesService extends AbstractComponent implements ClusterSta
try { try {
repository.endVerification(verificationToken); repository.endVerification(verificationToken);
} catch (Throwable t) { } catch (Throwable t) {
logger.warn("[{}] failed to finish repository verification", repositoryName, t); logger.warn("[{}] failed to finish repository verification", t, repositoryName);
listener.onFailure(t); listener.onFailure(t);
return; return;
} }
@ -233,7 +233,7 @@ public class RepositoriesService extends AbstractComponent implements ClusterSta
try { try {
repository.endVerification(verificationToken); repository.endVerification(verificationToken);
} catch (Throwable t1) { } catch (Throwable t1) {
logger.warn("[{}] failed to finish repository verification", repositoryName, t); logger.warn("[{}] failed to finish repository verification", t1, repositoryName);
} }
listener.onFailure(t); listener.onFailure(t);
} }

8
core/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java
View File

@ -80,6 +80,7 @@ public class VerifyNodeRepositoryAction extends AbstractComponent {
try { try {
doVerify(repository, verificationToken); doVerify(repository, verificationToken);
} catch (Throwable t) { } catch (Throwable t) {
logger.warn("[{}] failed to verify repository", t, repository);
errors.add(new VerificationFailure(node.id(), ExceptionsHelper.detailedMessage(t))); errors.add(new VerificationFailure(node.id(), ExceptionsHelper.detailedMessage(t)));
} }
if (counter.decrementAndGet() == 0) { if (counter.decrementAndGet() == 0) {
@ -146,7 +147,12 @@ public class VerifyNodeRepositoryAction extends AbstractComponent {
class VerifyNodeRepositoryRequestHandler implements TransportRequestHandler<VerifyNodeRepositoryRequest> { class VerifyNodeRepositoryRequestHandler implements TransportRequestHandler<VerifyNodeRepositoryRequest> {
@Override @Override
public void messageReceived(VerifyNodeRepositoryRequest request, TransportChannel channel) throws Exception { public void messageReceived(VerifyNodeRepositoryRequest request, TransportChannel channel) throws Exception {
doVerify(request.repository, request.verificationToken); try {
doVerify(request.repository, request.verificationToken);
} catch (Exception ex) {
logger.warn("[{}] failed to verify repository", ex, request.repository);
throw ex;
}
channel.sendResponse(TransportResponse.Empty.INSTANCE); channel.sendResponse(TransportResponse.Empty.INSTANCE);
} }
} }