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

SOLR-11925: Rename RoutedAliasCreateCollectionCmd as MaintainRoutedAliasCmd (internal Cmd)

This commit is contained in:
David Smiley 2018-02-08 23:16:12 -05:00
parent 02b5172ea2
commit 1527ce57d4
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/core/src/java/org/apache/solr/cloud/api/collections/CreateAliasCmd.java
View File

@ -121,7 +121,7 @@ public class CreateAliasCmd implements OverseerCollectionMessageHandler.Cmd {
String initialCollectionName = TimeRoutedAlias.formatCollectionNameFromInstant(aliasName, startTime); String initialCollectionName = TimeRoutedAlias.formatCollectionNameFromInstant(aliasName, startTime);
// Create the collection // Create the collection
RoutedAliasCreateCollectionCmd.createCollectionAndWait(state, aliasName, aliasMetadata, initialCollectionName, ocmh); MaintainRoutedAliasCmd.createCollectionAndWait(state, aliasName, aliasMetadata, initialCollectionName, ocmh);
validateAllCollectionsExistAndNoDups(Collections.singletonList(initialCollectionName), zkStateReader); validateAllCollectionsExistAndNoDups(Collections.singletonList(initialCollectionName), zkStateReader);
// Create/update the alias // Create/update the alias

9
solr/core/src/java/org/apache/solr/cloud/api/collections/RoutedAliasCreateCollectionCmd.java → solr/core/src/java/org/apache/solr/cloud/api/collections/MaintainRoutedAliasCmd.java
View File

@ -64,26 +64,25 @@ import static org.apache.solr.common.params.CommonParams.NAME;
* @since 7.3 * @since 7.3
* @lucene.internal * @lucene.internal
*/ */
// TODO rename class to MaintainRoutedAliasCmd public class MaintainRoutedAliasCmd implements OverseerCollectionMessageHandler.Cmd {
public class RoutedAliasCreateCollectionCmd implements OverseerCollectionMessageHandler.Cmd {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String IF_MOST_RECENT_COLL_NAME = "ifMostRecentCollName"; //TODO rename to createAfter public static final String IF_MOST_RECENT_COLL_NAME = "ifMostRecentCollName"; //TODO rename to createAfter
private final OverseerCollectionMessageHandler ocmh; private final OverseerCollectionMessageHandler ocmh;
public RoutedAliasCreateCollectionCmd(OverseerCollectionMessageHandler ocmh) { public MaintainRoutedAliasCmd(OverseerCollectionMessageHandler ocmh) {
this.ocmh = ocmh; this.ocmh = ocmh;
} }
/** Invokes this command from the client. If there's a problem it will throw an exception. */ /** Invokes this command from the client. If there's a problem it will throw an exception. */
public static NamedList remoteInvoke(CollectionsHandler collHandler, String aliasName, String mostRecentCollName) public static NamedList remoteInvoke(CollectionsHandler collHandler, String aliasName, String mostRecentCollName)
throws Exception { throws Exception {
final String operation = CollectionParams.CollectionAction.ROUTEDALIAS_CREATECOLL.toLower(); final String operation = CollectionParams.CollectionAction.MAINTAINROUTEDALIAS.toLower();
Map<String, Object> msg = new HashMap<>(); Map<String, Object> msg = new HashMap<>();
msg.put(Overseer.QUEUE_OPERATION, operation); msg.put(Overseer.QUEUE_OPERATION, operation);
msg.put(CollectionParams.NAME, aliasName); msg.put(CollectionParams.NAME, aliasName);
msg.put(RoutedAliasCreateCollectionCmd.IF_MOST_RECENT_COLL_NAME, mostRecentCollName); msg.put(MaintainRoutedAliasCmd.IF_MOST_RECENT_COLL_NAME, mostRecentCollName);
final SolrResponse rsp = collHandler.sendToOCPQueue(new ZkNodeProps(msg)); final SolrResponse rsp = collHandler.sendToOCPQueue(new ZkNodeProps(msg));
if (rsp.getException() != null) { if (rsp.getException() != null) {
throw rsp.getException(); throw rsp.getException();

2
solr/core/src/java/org/apache/solr/cloud/api/collections/OverseerCollectionMessageHandler.java
View File

@ -230,7 +230,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler,
.put(CREATEROUTEDALIAS, new CreateAliasCmd(this)) .put(CREATEROUTEDALIAS, new CreateAliasCmd(this))
.put(DELETEALIAS, new DeleteAliasCmd(this)) .put(DELETEALIAS, new DeleteAliasCmd(this))
.put(MODIFYALIAS, new ModifyAliasCmd(this)) .put(MODIFYALIAS, new ModifyAliasCmd(this))
.put(ROUTEDALIAS_CREATECOLL, new RoutedAliasCreateCollectionCmd(this)) .put(MAINTAINROUTEDALIAS, new MaintainRoutedAliasCmd(this))
.put(OVERSEERSTATUS, new OverseerStatusCmd(this)) .put(OVERSEERSTATUS, new OverseerStatusCmd(this))
.put(DELETESHARD, new DeleteShardCmd(this)) .put(DELETESHARD, new DeleteShardCmd(this))
.put(DELETEREPLICA, new DeleteReplicaCmd(this)) .put(DELETEREPLICA, new DeleteReplicaCmd(this))

2
solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java
View File

@ -51,7 +51,7 @@ import static org.apache.solr.common.params.CommonParams.TZ;
* Holds configuration for a routed alias, and some common code and constants. * Holds configuration for a routed alias, and some common code and constants.
* *
* @see CreateAliasCmd * @see CreateAliasCmd
* @see RoutedAliasCreateCollectionCmd * @see MaintainRoutedAliasCmd
* @see org.apache.solr.update.processor.TimeRoutedAliasUpdateProcessor * @see org.apache.solr.update.processor.TimeRoutedAliasUpdateProcessor
*/ */
public class TimeRoutedAlias { public class TimeRoutedAlias {

4
solr/core/src/java/org/apache/solr/update/processor/TimeRoutedAliasUpdateProcessor.java
View File

@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.solr.cloud.ZkController; import org.apache.solr.cloud.ZkController;
import org.apache.solr.cloud.api.collections.RoutedAliasCreateCollectionCmd; import org.apache.solr.cloud.api.collections.MaintainRoutedAliasCmd;
import org.apache.solr.cloud.api.collections.TimeRoutedAlias; import org.apache.solr.cloud.api.collections.TimeRoutedAlias;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.Aliases; import org.apache.solr.common.cloud.Aliases;
@ -275,7 +275,7 @@ public class TimeRoutedAliasUpdateProcessor extends UpdateRequestProcessor {
final Semaphore semaphore = aliasToSemaphoreMap.computeIfAbsent(getAliasName(), n -> new Semaphore(1)); final Semaphore semaphore = aliasToSemaphoreMap.computeIfAbsent(getAliasName(), n -> new Semaphore(1));
if (semaphore.tryAcquire()) { if (semaphore.tryAcquire()) {
try { try {
RoutedAliasCreateCollectionCmd.remoteInvoke(collHandler, getAliasName(), mostRecentCollName); MaintainRoutedAliasCmd.remoteInvoke(collHandler, getAliasName(), mostRecentCollName);
// we don't care about the response. It's possible no collection was created because // we don't care about the response. It's possible no collection was created because
// of a race and that's okay... we'll ultimately retry any way. // of a race and that's okay... we'll ultimately retry any way.

2
solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
View File

@ -80,7 +80,7 @@ public interface CollectionParams {
DELETEALIAS(true, LockLevel.COLLECTION), DELETEALIAS(true, LockLevel.COLLECTION),
MODIFYALIAS(true, LockLevel.COLLECTION), MODIFYALIAS(true, LockLevel.COLLECTION),
LISTALIASES(false, LockLevel.NONE), LISTALIASES(false, LockLevel.NONE),
ROUTEDALIAS_CREATECOLL(true, LockLevel.COLLECTION), MAINTAINROUTEDALIAS(true, LockLevel.COLLECTION),
DELETEROUTEDALIASCOLLECTIONS(true, LockLevel.COLLECTION), DELETEROUTEDALIASCOLLECTIONS(true, LockLevel.COLLECTION),
SPLITSHARD(true, LockLevel.SHARD), SPLITSHARD(true, LockLevel.SHARD),
DELETESHARD(true, LockLevel.SHARD), DELETESHARD(true, LockLevel.SHARD),