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

parallelize 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1294843 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-02-28 21:29:54 +00:00
parent 8c2e3cef8f
commit 28fb9a4cbc
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
View File

@ -30,8 +30,6 @@ import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.IOUtils;
import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.cloud.CloudDescriptor; import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.cloud.ZkController; import org.apache.solr.cloud.ZkController;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
@ -53,6 +51,10 @@ import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.DirectoryFactory; import org.apache.solr.core.DirectoryFactory;
import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.RequestHandlerBase; import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.handler.component.ShardHandler;
import org.apache.solr.handler.component.ShardHandlerFactory;
import org.apache.solr.handler.component.ShardRequest;
import org.apache.solr.handler.component.ShardResponse;
import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.response.SolrQueryResponse;
@ -73,6 +75,8 @@ import org.slf4j.LoggerFactory;
public class CoreAdminHandler extends RequestHandlerBase { public class CoreAdminHandler extends RequestHandlerBase {
protected static Logger log = LoggerFactory.getLogger(CoreAdminHandler.class); protected static Logger log = LoggerFactory.getLogger(CoreAdminHandler.class);
protected final CoreContainer coreContainer; protected final CoreContainer coreContainer;
private ShardHandlerFactory shardHandlerFactory;
private ShardHandler shardHandler;
public CoreAdminHandler() { public CoreAdminHandler() {
super(); super();
@ -89,6 +93,8 @@ public class CoreAdminHandler extends RequestHandlerBase {
*/ */
public CoreAdminHandler(final CoreContainer coreContainer) { public CoreAdminHandler(final CoreContainer coreContainer) {
this.coreContainer = coreContainer; this.coreContainer = coreContainer;
shardHandlerFactory = coreContainer.getShardHandlerFactory();
shardHandler = shardHandlerFactory.getShardHandler();
} }
@ -754,6 +760,9 @@ public class CoreAdminHandler extends RequestHandlerBase {
String collection = required.get("collection"); String collection = required.get("collection");
newParams.set(CoreAdminParams.ACTION, subAction);
SolrCore core = req.getCore(); SolrCore core = req.getCore();
ZkController zkController = core.getCoreDescriptor().getCoreContainer() ZkController zkController = core.getCoreDescriptor().getCoreContainer()
.getZkController(); .getZkController();
@ -767,26 +776,30 @@ public class CoreAdminHandler extends RequestHandlerBase {
for (Map.Entry<String,ZkNodeProps> shardEntry : shardEntries) { for (Map.Entry<String,ZkNodeProps> shardEntry : shardEntries) {
final ZkNodeProps node = shardEntry.getValue(); final ZkNodeProps node = shardEntry.getValue();
if (cloudState.liveNodesContain(node.get(ZkStateReader.NODE_NAME_PROP))) { if (cloudState.liveNodesContain(node.get(ZkStateReader.NODE_NAME_PROP))) {
CommonsHttpSolrServer server = new CommonsHttpSolrServer(node.get(ZkStateReader.BASE_URL_PROP)); newParams.set(CoreAdminParams.CORE, node.get(ZkStateReader.CORE_NAME_PROP));
String replica = node.get(ZkStateReader.BASE_URL_PROP) + "/admin/cores";
ShardRequest sreq = new ShardRequest();
sreq.purpose = 1;
// TODO: this sucks
if (replica.startsWith("http://"))
replica = replica.substring(7);
sreq.shards = new String[]{replica};
sreq.actualShards = sreq.shards;
sreq.params = newParams;
server.request(new CoreAdminRequest() { shardHandler.submit(sreq, replica, sreq.params);
{
action = CoreAdminAction.valueOf(subAction);
setCoreName(node.get(ZkStateReader.CORE_NAME_PROP));
}
@Override
public SolrParams getParams() {
SolrParams superParams = super.getParams();
newParams.add(superParams);
return newParams;
}
});
} }
} }
} }
ShardResponse srsp;
do {
srsp = shardHandler.takeCompletedOrError();
Throwable e = srsp.getException();
if (e != null) {
log.error("Error talking to shard: " + srsp.getShard(), e);
}
} while(srsp != null);
} }