Skip to content

SOLR-12477 - Return server error(500) for AlreadyClosedException instead of client Errors(400) #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

SOLR-12477 - Return server error(500) for AlreadyClosedException instead of client Errors(400) #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion solr/core/src/java/org/apache/solr/core/CoreContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1806,7 +1806,11 @@ public boolean repairCoreProperty(CoreDescriptor cd, String prop) {
return false;
}

public void checkTragicException(SolrCore solrCore) {
/**
* @param solrCore
* @return whether this solr core has tragic exception
*/
public boolean checkTragicException(SolrCore solrCore) {
Throwable tragicException = null;
try {
tragicException = solrCore.getSolrCoreState().getTragicException();
Expand All @@ -1820,6 +1824,8 @@ public void checkTragicException(SolrCore solrCore) {
getZkController().giveupLeadership(solrCore.getCoreDescriptor(), tragicException);
}
}

return tragicException != null;
}

}
Expand Down
11 changes: 10 additions & 1 deletion solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,16 @@ public void handleRequest(SolrQueryRequest req, SolrQueryResponse rsp) {
}
} catch (Exception e) {
if (req.getCore() != null) {
req.getCore().getCoreContainer().checkTragicException(req.getCore());
boolean isTragic = req.getCore().getCoreContainer().checkTragicException(req.getCore());
if (isTragic) {
if (e instanceof SolrException) {
// Tragic exceptions should always throw a server error
assert ((SolrException) e).code() == 500;
} else {
// wrap it in a solr exception
e = new SolrException(SolrException.ErrorCode.SERVER_ERROR, e.getMessage(), e);
}
}
}
boolean incrementErrors = true;
boolean isServerError = true;
Expand Down
9 changes: 8 additions & 1 deletion solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import java.util.concurrent.atomic.LongAdder;

import com.codahale.metrics.Meter;
import com.google.common.annotations.VisibleForTesting;

import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.CodecReader;
Expand All @@ -41,6 +43,7 @@
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.util.BytesRefHash;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException;
Expand Down Expand Up @@ -233,6 +236,9 @@ public int addDoc(AddUpdateCommand cmd) throws IOException {
return addDoc0(cmd);
} catch (SolrException e) {
throw e;
} catch (AlreadyClosedException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
String.format(Locale.ROOT, "Server error writing document id %s to the index", cmd.getPrintableId()), e);
} catch (IllegalArgumentException iae) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
String.format(Locale.ROOT, "Exception writing document id %s to the index; possible analysis error: "
Expand All @@ -253,7 +259,8 @@ public int addDoc(AddUpdateCommand cmd) throws IOException {
* @param cmd the command.
* @return the count.
*/
private int addDoc0(AddUpdateCommand cmd) throws IOException {
@VisibleForTesting
int addDoc0(AddUpdateCommand cmd) throws IOException {
int rc = -1;

addCommands.increment();
Expand Down
20 changes: 17 additions & 3 deletions solr/core/src/test/org/apache/solr/cloud/LeaderTragicEventTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,23 @@

package org.apache.solr.cloud;

import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.is;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient.RemoteSolrException;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.ClusterStateUtil;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica;
Expand Down Expand Up @@ -133,8 +138,17 @@ private Replica corruptLeader(String collection, List<String> addedIds) throws I
}
}
} catch (Exception e) {
log.info("Corrupt leader ex: ",e);
// Expected
log.info("Corrupt leader ex: ", e);

// solrClient.add/commit would throw RemoteSolrException with error code 500 or
// 404(when the leader replica is already deleted by giveupLeadership)
if (e instanceof RemoteSolrException) {
SolrException se = (SolrException) e;
assertThat(se.code(), anyOf(is(500), is(404)));
} else if (!(e instanceof AlreadyClosedException)) {
throw new RuntimeException("Unexpected exception", e);
}
//else expected
}
return oldLeader;
}
Expand Down