diff --git a/changelog/unreleased/SOLR-7550-peersync-500.yml b/changelog/unreleased/SOLR-7550-peersync-500.yml new file mode 100644 index 000000000000..75762a12a8b6 --- /dev/null +++ b/changelog/unreleased/SOLR-7550-peersync-500.yml @@ -0,0 +1,7 @@ +title: PeerSync counts a core initialization failure on the versions request as success when cantReachIsSuccess is set, so a core that will not load no longer blocks leader election or a sync request +type: fixed +authors: + - name: Nick Shanin +links: + - name: SOLR-7550 + url: https://issues.apache.org/jira/browse/SOLR-7550 diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java b/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java index 289a6e941829..75bc447138c8 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java @@ -78,7 +78,7 @@ void setShard(String shard) { this.shard = shard; } - void setException(Throwable exception) { + public void setException(Throwable exception) { this.exception = exception; } @@ -97,7 +97,7 @@ public String getShardAddress() { return this.shardAddress; } - void setShardAddress(String addr) { + public void setShardAddress(String addr) { this.shardAddress = addr; } } diff --git a/solr/core/src/java/org/apache/solr/update/PeerSync.java b/solr/core/src/java/org/apache/solr/update/PeerSync.java index 8476dc84a979..7add2ada2170 100644 --- a/solr/core/src/java/org/apache/solr/update/PeerSync.java +++ b/solr/core/src/java/org/apache/solr/update/PeerSync.java @@ -42,6 +42,7 @@ import org.apache.solr.common.util.EnvUtils; import org.apache.solr.common.util.IOUtils; import org.apache.solr.core.SolrCore; +import org.apache.solr.core.SolrCoreInitializationException; import org.apache.solr.core.SolrInfoBean; import org.apache.solr.handler.component.ShardHandler; import org.apache.solr.handler.component.ShardHandlerFactory; @@ -364,7 +365,8 @@ private void requestVersions(String replica) { shardHandler.submit(sreq, replica, sreq.params); } - private boolean handleResponse(ShardResponse srsp) { + @VisibleForTesting + boolean handleResponse(ShardResponse srsp) { ShardRequest sreq = srsp.getShardRequest(); if (srsp.getException() != null) { @@ -419,6 +421,20 @@ private boolean handleResponse(ShardResponse srsp) { return true; } + if (cantReachIsSuccess + && sreq.purpose == SHARD_REQUEST_PURPOSE_GET_VERSIONS + && srsp.getException() instanceof SolrException + && SolrCoreInitializationException.class + .getName() + .equals(((SolrException) srsp.getException()).getThrowable())) { + log.warn( + "{} got a core init failure from {}, counting as success ", + msg(), + srsp.getShardAddress(), + srsp.getException()); + return true; + } + // TODO: we should return the above information so that when we can request a recovery through // zookeeper, we do that for these nodes diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncHandleResponseTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncHandleResponseTest.java new file mode 100644 index 000000000000..75e5949ba8a7 --- /dev/null +++ b/solr/core/src/test/org/apache/solr/update/PeerSyncHandleResponseTest.java @@ -0,0 +1,123 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.solr.update; + +import java.io.IOException; +import java.lang.invoke.MethodHandles; +import java.util.List; +import org.apache.solr.SolrTestCase; +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.common.util.SimpleOrderedMap; +import org.apache.solr.core.SolrCore; +import org.apache.solr.core.SolrCoreInitializationException; +import org.apache.solr.handler.component.ShardRequest; +import org.apache.solr.handler.component.ShardResponse; +import org.apache.solr.servlet.ResponseUtils; +import org.apache.solr.util.EmbeddedSolrServerTestRule; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Unit tests for {@link PeerSync#handleResponse}. These live outside {@link PeerSyncTest} because + * that suite calls initCore from its constructor, so every additional test method in it leaks a + * harness core. The core here only exists so a PeerSync can be constructed; handleResponse itself + * reads nothing from it beyond the log prefix. + */ +public class PeerSyncHandleResponseTest extends SolrTestCase { + + private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + @ClassRule + public static final EmbeddedSolrServerTestRule solrTestRule = new EmbeddedSolrServerTestRule(); + + @BeforeClass + public static void beforeClass() throws Exception { + solrTestRule.startSolr(SolrTestCaseJ4.TEST_HOME()); + SolrTestCaseJ4.newRandomConfig(); + solrTestRule.newCollection().withConfigSet(SolrTestCaseJ4.TEST_COLL1_CONF()).create(); + } + + @Test + public void testPeerSyncCountsCoreInitFailureFromVersionRequestAsSuccess() throws Exception { + try (SolrCore core = solrTestRule.getCoreContainer().getCore("collection1"); + PeerSync peerSync = new PeerSync(core, List.of("http://example.com/solr/core"), 10, true)) { + ShardResponse response = + failedResponse( + PeerSync.SHARD_REQUEST_PURPOSE_GET_VERSIONS, + serverError( + new SolrCoreInitializationException("collection1", new IOException("boom")))); + + assertTrue(peerSync.handleResponse(response)); + } + } + + @Test + public void testPeerSyncStillFailsOtherServerErrorFromVersionRequest() throws Exception { + try (SolrCore core = solrTestRule.getCoreContainer().getCore("collection1"); + PeerSync peerSync = new PeerSync(core, List.of("http://example.com/solr/core"), 10, true)) { + ShardResponse response = + failedResponse( + PeerSync.SHARD_REQUEST_PURPOSE_GET_VERSIONS, + serverError(new SolrException(SolrException.ErrorCode.SERVER_ERROR, "boom"))); + + assertFalse(peerSync.handleResponse(response)); + } + } + + @Test + public void testPeerSyncStillFailsCoreInitFailureFromUpdateRequest() throws Exception { + try (SolrCore core = solrTestRule.getCoreContainer().getCore("collection1"); + PeerSync peerSync = new PeerSync(core, List.of("http://example.com/solr/core"), 10, true)) { + ShardResponse response = + failedResponse( + PeerSync.SHARD_REQUEST_PURPOSE_GET_UPDATES, + serverError( + new SolrCoreInitializationException("collection1", new IOException("boom")))); + + assertFalse(peerSync.handleResponse(response)); + } + } + + private static ShardResponse failedResponse(int purpose, Throwable exception) { + ShardRequest request = new ShardRequest(); + request.purpose = purpose; + + // ShardResponse is final, so it cannot be mocked; build a real one. + ShardResponse response = new ShardResponse(); + response.setShardRequest(request); + response.setException(exception); + response.setShardAddress("http://example.com/solr/core"); + return response; + } + + // The server writes the exception class into the response metadata, so build the error the + // same way the response writer does. + @SuppressWarnings("unchecked") + private static SolrException serverError(Throwable cause) { + NamedList info = new SimpleOrderedMap<>(); + ResponseUtils.getErrorInfo(cause, info, log); + SolrException exception = new SolrException(SolrException.ErrorCode.SERVER_ERROR, "boom"); + exception.setMetadata((NamedList) info.get("metadata")); + return exception; + } +}