Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

expand skip recovery option a bit (used by tests) 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1292313 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-02-22 14:32:53 +00:00
parent fd993e0c11
commit 1d67a7dc71
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solr/core/src/java/org/apache/solr/cloud/ZkController.java
View File

@ -21,7 +21,6 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -77,6 +76,7 @@ public final class ZkController {
private final static Pattern URL_POST = Pattern.compile("https?://(.*)"); private final static Pattern URL_POST = Pattern.compile("https?://(.*)");
private final static Pattern URL_PREFIX = Pattern.compile("(https?://).*"); private final static Pattern URL_PREFIX = Pattern.compile("(https?://).*");
private final boolean SKIP_AUTO_RECOVERY = Boolean.getBoolean("solrcloud.skip.autorecovery");
// package private for tests // package private for tests
@ -104,7 +104,6 @@ public final class ZkController {
private LeaderElector overseerElector; private LeaderElector overseerElector;
private boolean SKIP_AUTO_RECOVERY = Boolean.getBoolean("solrcloud.skip.autorecovery");
// this can be null in which case recovery will be inactive // this can be null in which case recovery will be inactive
private CoreContainer cc; private CoreContainer cc;
@ -633,7 +632,10 @@ public final class ZkController {
final String shardZkNodeName, String shardId, ZkNodeProps leaderProps, final String shardZkNodeName, String shardId, ZkNodeProps leaderProps,
SolrCore core, CoreContainer cc) throws InterruptedException, SolrCore core, CoreContainer cc) throws InterruptedException,
KeeperException, IOException, ExecutionException { KeeperException, IOException, ExecutionException {
if (SKIP_AUTO_RECOVERY) {
log.warn("Skipping recovery according to sys prop solrcloud.skip.autorecovery");
return false;
}
boolean doRecovery = true; boolean doRecovery = true;
if (!isLeader) { if (!isLeader) {
@ -641,7 +643,7 @@ public final class ZkController {
doRecovery = false; doRecovery = false;
} }
if (doRecovery && !SKIP_AUTO_RECOVERY) { if (doRecovery) {
log.info("Core needs to recover:" + core.getName()); log.info("Core needs to recover:" + core.getName());
core.getUpdateHandler().getSolrCoreState().doRecovery(core); core.getUpdateHandler().getSolrCoreState().doRecovery(core);
return true; return true;

7
solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
View File

@ -30,6 +30,8 @@ import org.slf4j.LoggerFactory;
public final class DefaultSolrCoreState extends SolrCoreState { public final class DefaultSolrCoreState extends SolrCoreState {
public static Logger log = LoggerFactory.getLogger(DefaultSolrCoreState.class); public static Logger log = LoggerFactory.getLogger(DefaultSolrCoreState.class);
private final boolean SKIP_AUTO_RECOVERY = Boolean.getBoolean("solrcloud.skip.autorecovery");
private final Object recoveryLock = new Object(); private final Object recoveryLock = new Object();
private int refCnt = 1; private int refCnt = 1;
private SolrIndexWriter indexWriter = null; private SolrIndexWriter indexWriter = null;
@ -112,6 +114,11 @@ public final class DefaultSolrCoreState extends SolrCoreState {
@Override @Override
public void doRecovery(SolrCore core) { public void doRecovery(SolrCore core) {
if (SKIP_AUTO_RECOVERY) {
log.warn("Skipping recovery according to sys prop solrcloud.skip.autorecovery");
return;
}
cancelRecovery(); cancelRecovery();
synchronized (recoveryLock) { synchronized (recoveryLock) {
while (recoveryRunning) { while (recoveryRunning) {