You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2015/06/28 20:55:38 UTC
svn commit: r1688040 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/cloud/
solr/core/src/java/org/apache/solr/handler/admin/
solr/core/src/test/org/apache/solr/cloud/
solr/core/src/test/org/apache/solr/handl...
Author: andyetitmoves
Date: Sun Jun 28 18:55:37 2015
New Revision: 1688040
URL: http://svn.apache.org/r1688040
Log:
SOLR-7710: Replace async occurrences with CommonAdminParams.ASYNC
Added:
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/CommonAdminParams.java
- copied unchanged from r1688039, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/CommonAdminParams.java
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/common/params/CommonAdminParamsTest.java
- copied unchanged from r1688039, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/params/CommonAdminParamsTest.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Sun Jun 28 18:55:37 2015
@@ -199,6 +199,9 @@ Other Changes
* SOLR-7485: Replace shards.info occurrences with ShardParams.SHARDS_INFO
(Christine Poerschke via Ramkumar Aiyengar)
+* SOLR-7710: Replace async occurrences with CommonAdminParams.ASYNC
+ (Christine Poerschke, Ramkumar Aiyengar)
+
================== 5.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java Sun Jun 28 18:55:37 2015
@@ -114,7 +114,7 @@ public class DistributedQueue {
/**
* Returns true if the queue contains a task with the specified async id.
*/
- public boolean containsTaskWithRequestId(String requestId)
+ public boolean containsTaskWithRequestId(String requestIdKey, String requestId)
throws KeeperException, InterruptedException {
List<String> childNames = zookeeper.getChildren(dir, null, true);
@@ -125,9 +125,9 @@ public class DistributedQueue {
byte[] data = zookeeper.getData(dir + "/" + childName, null, null, true);
if (data != null) {
ZkNodeProps message = ZkNodeProps.load(data);
- if (message.containsKey(OverseerCollectionProcessor.ASYNC)) {
- LOG.debug(">>>> {}", message.get(OverseerCollectionProcessor.ASYNC));
- if(message.get(OverseerCollectionProcessor.ASYNC).equals(requestId)) return true;
+ if (message.containsKey(requestIdKey)) {
+ LOG.debug(">>>> {}", message.get(requestIdKey));
+ if(message.get(requestIdKey).equals(requestId)) return true;
}
}
} catch (KeeperException.NoNodeException e) {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Sun Jun 28 18:55:37 2015
@@ -121,6 +121,7 @@ import static org.apache.solr.common.par
import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEREPLICAPROP;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESHARD;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.REMOVEROLE;
+import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
import static org.apache.solr.common.params.CommonParams.NAME;
import static org.apache.solr.common.util.StrUtils.formatString;
@@ -137,8 +138,6 @@ public class OverseerCollectionProcessor
public static final String SHARDS_PROP = "shards";
- public static final String ASYNC = "async";
-
public static final String REQUESTID = "requestid";
public static final String COLL_CONF = "collection.configName";
@@ -327,7 +326,7 @@ public class OverseerCollectionProcessor
final ZkNodeProps message = ZkNodeProps.load(head.getBytes());
String collectionName = message.containsKey(COLLECTION_PROP) ?
message.getStr(COLLECTION_PROP) : message.getStr(NAME);
- String asyncId = message.getStr(ASYNC);
+ final String asyncId = message.getStr(ASYNC);
if (hasLeftOverItems) {
if (head.getId().equals(oldestItemInWorkQueue))
hasLeftOverItems = false;
@@ -1494,7 +1493,7 @@ public class OverseerCollectionProcessor
// the only side effect of this is that the sub shard may end up having more replicas than we want
collectShardResponses(results, false, null, shardHandler);
- String asyncId = message.getStr(ASYNC);
+ final String asyncId = message.getStr(ASYNC);
HashMap<String,String> requestMap = new HashMap<String,String>();
for (int i = 0; i < subRanges.size(); i++) {
@@ -2260,8 +2259,7 @@ public class OverseerCollectionProcessor
int repFactor = message.getInt(REPLICATION_FACTOR, 1);
ShardHandler shardHandler = shardHandlerFactory.getShardHandler();
- String async = null;
- async = message.getStr("async");
+ final String async = message.getStr(ASYNC);
Integer numSlices = message.getInt(NUM_SLICES, null);
String router = message.getStr("router.name", DocRouter.DEFAULT_NAME);
@@ -2490,7 +2488,7 @@ public class OverseerCollectionProcessor
String shard = message.getStr(SHARD_ID_PROP);
String coreName = message.getStr(CoreAdminParams.NAME);
- String asyncId = message.getStr("async");
+ final String asyncId = message.getStr(ASYNC);
DocCollection coll = clusterState.getCollection(collection);
if (coll == null) {
@@ -2845,7 +2843,7 @@ public class OverseerCollectionProcessor
final TimerContext timerContext = stats.time("collection_" + operation);
boolean success = false;
- String asyncId = message.getStr(ASYNC);
+ final String asyncId = message.getStr(ASYNC);
String collectionName = message.containsKey(COLLECTION_PROP) ?
message.getStr(COLLECTION_PROP) : message.getStr(NAME);
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java Sun Jun 28 18:55:37 2015
@@ -70,7 +70,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
-import static org.apache.solr.cloud.OverseerCollectionProcessor.ASYNC;
import static org.apache.solr.cloud.OverseerCollectionProcessor.COLL_CONF;
import static org.apache.solr.cloud.OverseerCollectionProcessor.COLL_PROP_PREFIX;
import static org.apache.solr.cloud.OverseerCollectionProcessor.CREATE_NODE_SET;
@@ -94,6 +93,7 @@ import static org.apache.solr.common.clo
import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.*;
+import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
import static org.apache.solr.common.params.CommonParams.NAME;
import static org.apache.solr.common.params.CommonParams.VALUE_LONG;
import static org.apache.solr.common.params.CoreAdminParams.DATA_DIR;
@@ -252,7 +252,7 @@ public class CollectionsHandler extends
private boolean overseerCollectionQueueContains(String asyncId) throws KeeperException, InterruptedException {
DistributedQueue collectionQueue = coreContainer.getZkController().getOverseerCollectionQueue();
- return collectionQueue.containsTaskWithRequestId(asyncId);
+ return collectionQueue.containsTaskWithRequestId(ASYNC, asyncId);
}
private static Map<String, Object> copyPropertiesWithPrefix(SolrParams params, Map<String, Object> props, String prefix) {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Sun Jun 28 18:55:37 2015
@@ -54,6 +54,7 @@ import org.apache.solr.common.cloud.Repl
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CommonAdminParams;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.CoreAdminParams.CoreAdminAction;
import org.apache.solr.common.params.ModifiableSolrParams;
@@ -165,7 +166,7 @@ public class CoreAdminHandler extends Re
"Core container instance missing");
}
//boolean doPersist = false;
- String taskId = req.getParams().get("async");
+ final String taskId = req.getParams().get(CommonAdminParams.ASYNC);
TaskObject taskObject = new TaskObject(taskId);
if(taskId != null) {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java Sun Jun 28 18:55:37 2015
@@ -41,7 +41,6 @@ import org.apache.solr.response.SolrQuer
import org.apache.zookeeper.KeeperException;
import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION;
-import static org.apache.solr.cloud.OverseerCollectionProcessor.ASYNC;
import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.CORE_NAME_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.ELECTION_NODE_PROP;
@@ -52,6 +51,7 @@ import static org.apache.solr.common.clo
import static org.apache.solr.common.cloud.ZkStateReader.REJOIN_AT_HEAD_PROP;
import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP;
import static org.apache.solr.common.params.CollectionParams.CollectionAction.REBALANCELEADERS;
+import static org.apache.solr.common.params.CommonAdminParams.ASYNC;
class RebalanceLeaders {
final SolrQueryRequest req;
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java Sun Jun 28 18:55:37 2015
@@ -22,6 +22,7 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.params.CollectionParams;
+import org.apache.solr.common.params.CommonAdminParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.junit.Test;
@@ -68,7 +69,7 @@ public class AsyncMigrateRouteKeyTest ex
params.set("target.collection", targetCollection);
params.set("split.key", splitKey);
params.set("forward.timeout", 45);
- params.set("async", asyncId);
+ params.set(CommonAdminParams.ASYNC, asyncId);
invoke(params);
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.java Sun Jun 28 18:55:37 2015
@@ -22,6 +22,7 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.common.params.CollectionParams;
+import org.apache.solr.common.params.CommonAdminParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.junit.Test;
@@ -46,7 +47,7 @@ public class TestRequestStatusCollection
params.set("replicationFactor", 1);
params.set("maxShardsPerNode", 100);
params.set("collection.configName", "conf1");
- params.set("async", "1000");
+ params.set(CommonAdminParams.ASYNC, "1000");
try {
sendRequest(params);
} catch (SolrServerException | IOException e) {
@@ -90,7 +91,7 @@ public class TestRequestStatusCollection
params.set(CollectionParams.ACTION, CollectionParams.CollectionAction.SPLITSHARD.toString());
params.set("collection", "collection2");
params.set("shard", "shard1");
- params.set("async", "1001");
+ params.set(CommonAdminParams.ASYNC, "1001");
try {
sendRequest(params);
} catch (SolrServerException | IOException e) {
@@ -116,7 +117,7 @@ public class TestRequestStatusCollection
params.set("replicationFactor", 1);
params.set("maxShardsPerNode", 100);
params.set("collection.configName", "conf1");
- params.set("async", "1002");
+ params.set(CommonAdminParams.ASYNC, "1002");
try {
sendRequest(params);
} catch (SolrServerException | IOException e) {
@@ -145,7 +146,7 @@ public class TestRequestStatusCollection
params.set("replicationFactor", 1);
params.set("maxShardsPerNode", 100);
params.set("collection.configName", "conf1");
- params.set("async", "1002");
+ params.set(CommonAdminParams.ASYNC, "1002");
try {
r = sendRequest(params);
} catch (SolrServerException | IOException e) {
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java Sun Jun 28 18:55:37 2015
@@ -21,6 +21,7 @@ import java.io.File;
import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.params.CommonAdminParams;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
@@ -62,7 +63,7 @@ public class CoreAdminRequestStatusTest
CoreAdminParams.CoreAdminAction.CREATE.toString(),
CoreAdminParams.INSTANCE_DIR, instPropFile.getAbsolutePath(),
CoreAdminParams.NAME, "dummycore",
- "async", "42"),
+ CommonAdminParams.ASYNC, "42"),
resp);
assertNull("Exception on create", resp.getException());
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java?rev=1688040&r1=1688039&r2=1688040&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java Sun Jun 28 18:55:37 2015
@@ -24,6 +24,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CollectionParams.CollectionAction;
+import org.apache.solr.common.params.CommonAdminParams;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.ShardParams;
@@ -266,7 +267,7 @@ public abstract class CollectionAdminReq
if (replicationFactor != null) {
params.set( "replicationFactor", replicationFactor);
}
- params.set("async", asyncId);
+ params.set(CommonAdminParams.ASYNC, asyncId);
if (autoAddReplicas != null) {
params.set(ZkStateReader.AUTO_ADD_REPLICAS, autoAddReplicas);
}
@@ -412,7 +413,7 @@ public abstract class CollectionAdminReq
addProperties(params, properties);
}
- params.set("async", asyncId);
+ params.set(CommonAdminParams.ASYNC, asyncId);
return params;
}
@@ -609,7 +610,7 @@ public abstract class CollectionAdminReq
params.add(ShardParams._ROUTE_, routeKey);
}
if (asyncId != null) {
- params.set("async", asyncId);
+ params.set(CommonAdminParams.ASYNC, asyncId);
}
if (node != null) {
params.add("node", node);
@@ -794,7 +795,7 @@ public abstract class CollectionAdminReq
if (forwardTimeout != null) {
params.set("forward.timeout", forwardTimeout);
}
- params.set("async", asyncId);
+ params.set(CommonAdminParams.ASYNC, asyncId);
if (properties != null) {
addProperties(params, properties);