You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2014/10/03 18:07:00 UTC
svn commit: r1629246 - in /lucene/dev/branches/branch_5x/solr: ./
core/src/java/org/apache/solr/cloud/ core/src/java/org/apache/solr/rest/
core/src/java/org/apache/solr/rest/schema/
core/src/java/org/apache/solr/schema/ core/src/test/org/apache/solr/sc...
Author: thelabdude
Date: Fri Oct 3 16:06:59 2014
New Revision: 1629246
URL: http://svn.apache.org/r1629246
Log:
SOLR-6249: support re-establishing a new watcher on the managed schema znode after zk session expiration.
Added:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/SchemaZkVersionResource.java (with props)
Modified:
lucene/dev/branches/branch_5x/solr/CHANGES.txt
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.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=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Oct 3 16:06:59 2014
@@ -241,6 +241,11 @@ Other Changes
* SOLR-6550: Provide simple mechanism for passing additional metadata / context about a server-side
SolrException back to the client-side (Timothy Potter)
+* SOLR-6249: Schema API changes return success before all cores are updated; client application
+ can provide the optional updateTimeoutSecs parameter to cause the server handling the
+ managed schema update to block until all replicas of the same collection have processed the
+ update or until the specified timeout is reached (Timothy Potter)
+
================== 4.10.1 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkController.java Fri Oct 3 16:06:59 2014
@@ -189,6 +189,9 @@ public final class ZkController {
// and interact with zookeeper via the Solr admin UI on a node outside the cluster,
// and so one that will not be killed or stopped when testing. See developer cloud-scripts.
private boolean zkRunOnly = Boolean.getBoolean("zkRunOnly"); // expert
+
+ // keeps track of a list of objects that need to know a new ZooKeeper session was created after expiration occurred
+ private List<OnReconnect> reconnectListeners = new ArrayList<OnReconnect>();
public ZkController(final CoreContainer cc, String zkServerAddress, int zkClientTimeout, int zkClientConnectTimeout, String localHost, String locaHostPort,
String localHostContext, int leaderVoteWait, int leaderConflictResolveWait, boolean genericCoreNodeNames, final CurrentCoreDescriptorProvider registerOnReconnect)
@@ -239,8 +242,9 @@ public final class ZkController {
@Override
public void command() {
+ log.info("ZooKeeper session re-connected ... refreshing core states after session expiration.");
+
try {
-
// this is troublesome - we dont want to kill anything the old
// leader accepted
// though I guess sync will likely get those updates back? But
@@ -294,7 +298,19 @@ public final class ZkController {
}
}
}
-
+
+ // notify any other objects that need to know when the session was re-connected
+ synchronized (reconnectListeners) {
+ for (OnReconnect listener : reconnectListeners) {
+ try {
+ listener.command();
+ } catch (Exception exc) {
+ // not much we can do here other than warn in the log
+ log.warn("Error when notifying OnReconnect listener "+listener+" after session re-connected.", exc);
+ }
+ }
+ }
+
} catch (InterruptedException e) {
// Restore the interrupted status
Thread.currentThread().interrupt();
@@ -2013,4 +2029,16 @@ public final class ZkController {
}
}
}
+
+ /**
+ * Add a listener to be notified once there is a new session created after a ZooKeeper session expiration occurs;
+ * in most cases, listeners will be components that have watchers that need to be re-created.
+ */
+ public void addOnReconnectListener(OnReconnect listener) {
+ if (listener != null) {
+ synchronized (reconnectListeners) {
+ reconnectListeners.add(listener);
+ }
+ }
+ }
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java Fri Oct 3 16:06:59 2014
@@ -28,6 +28,7 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.core.SolrResourceLoader;
+import org.apache.solr.schema.ZkIndexSchemaReader;
import org.apache.zookeeper.KeeperException;
/**
@@ -38,6 +39,7 @@ public class ZkSolrResourceLoader extend
private final String collectionZkPath;
private ZkController zkController;
+ private ZkIndexSchemaReader zkIndexSchemaReader;
public ZkSolrResourceLoader(String instanceDir, String collection,
ZkController zooKeeperController) {
@@ -129,4 +131,10 @@ public class ZkSolrResourceLoader extend
public ZkController getZkController() {
return zkController;
}
+
+ public void setZkIndexSchemaReader(ZkIndexSchemaReader zkIndexSchemaReader) {
+ this.zkIndexSchemaReader = zkIndexSchemaReader;
+ }
+
+ public ZkIndexSchemaReader getZkIndexSchemaReader() { return zkIndexSchemaReader; }
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java Fri Oct 3 16:06:59 2014
@@ -18,7 +18,6 @@ package org.apache.solr.rest;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.ContentStreamBase;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrCore;
@@ -48,6 +47,7 @@ import java.net.URLDecoder;
*/
public abstract class BaseSolrResource extends ServerResource {
protected static final String SHOW_DEFAULTS = "showDefaults";
+ public static final String UPDATE_TIMEOUT_SECS = "updateTimeoutSecs";
private SolrCore solrCore;
private IndexSchema schema;
@@ -55,12 +55,14 @@ public abstract class BaseSolrResource e
private SolrQueryResponse solrResponse;
private QueryResponseWriter responseWriter;
private String contentType;
+ private int updateTimeoutSecs = -1;
public SolrCore getSolrCore() { return solrCore; }
public IndexSchema getSchema() { return schema; }
public SolrQueryRequest getSolrRequest() { return solrRequest; }
public SolrQueryResponse getSolrResponse() { return solrResponse; }
public String getContentType() { return contentType; }
+ protected int getUpdateTimeoutSecs() { return updateTimeoutSecs; }
protected BaseSolrResource() {
super();
@@ -122,6 +124,14 @@ public abstract class BaseSolrResource e
solrRequest.getContext().put("webapp", firstPathElement); // Context path
}
SolrCore.preDecorateResponse(solrRequest, solrResponse);
+
+ // client application can set a timeout for update requests
+ Object updateTimeoutSecsParam = getSolrRequest().getParams().get(UPDATE_TIMEOUT_SECS);
+ if (updateTimeoutSecsParam != null)
+ updateTimeoutSecs = (updateTimeoutSecsParam instanceof Number)
+ ? ((Number) updateTimeoutSecsParam).intValue()
+ : Integer.parseInt(updateTimeoutSecsParam.toString());
+
}
}
} catch (Throwable t) {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java Fri Oct 3 16:06:59 2014
@@ -29,6 +29,7 @@ import org.apache.solr.rest.schema.Field
import org.apache.solr.rest.schema.SchemaNameResource;
import org.apache.solr.rest.schema.SchemaSimilarityResource;
import org.apache.solr.rest.schema.SchemaVersionResource;
+import org.apache.solr.rest.schema.SchemaZkVersionResource;
import org.apache.solr.rest.schema.SolrQueryParserDefaultOperatorResource;
import org.apache.solr.rest.schema.SolrQueryParserResource;
import org.apache.solr.rest.schema.UniqueKeyFieldResource;
@@ -78,6 +79,8 @@ public class SolrSchemaRestApi extends A
public static final String UNIQUE_KEY_FIELD = IndexSchema.UNIQUE_KEY.toLowerCase(Locale.ROOT);
public static final String UNIQUE_KEY_FIELD_PATH = "/" + UNIQUE_KEY_FIELD;
+
+ public static final String ZK_VERSION_PATH = "/zkversion";
/**
* Returns reserved endpoints under /schema
@@ -95,6 +98,7 @@ public class SolrSchemaRestApi extends A
reservedEndpoints.add(RestManager.SCHEMA_BASE_PATH + SOLR_QUERY_PARSER_PATH);
reservedEndpoints.add(RestManager.SCHEMA_BASE_PATH + DEFAULT_OPERATOR_PATH);
reservedEndpoints.add(RestManager.SCHEMA_BASE_PATH + UNIQUE_KEY_FIELD_PATH);
+ reservedEndpoints.add(RestManager.SCHEMA_BASE_PATH + ZK_VERSION_PATH);
return Collections.unmodifiableSet(reservedEndpoints);
}
@@ -156,6 +160,8 @@ public class SolrSchemaRestApi extends A
router.attach(SOLR_QUERY_PARSER_PATH, SolrQueryParserResource.class);
router.attach(DEFAULT_OPERATOR_PATH, SolrQueryParserDefaultOperatorResource.class);
+ router.attach(ZK_VERSION_PATH, SchemaZkVersionResource.class);
+
router.attachDefault(RestManager.ManagedEndpoint.class);
// attach all the dynamically registered schema resources
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java Fri Oct 3 16:06:59 2014
@@ -16,10 +16,13 @@ package org.apache.solr.rest.schema;
* limitations under the License.
*/
+import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.SimpleOrderedMap;
+import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.rest.BaseSolrResource;
import org.apache.solr.schema.IndexSchema;
+import org.apache.solr.schema.ManagedIndexSchema;
import org.apache.solr.schema.SchemaField;
import org.restlet.resource.ResourceException;
@@ -100,6 +103,29 @@ abstract class BaseFieldResource extends
return properties;
}
+ /**
+ * When running in cloud mode, waits for a schema update to be
+ * applied by all active replicas of the current collection.
+ */
+ protected void waitForSchemaUpdateToPropagate(IndexSchema newSchema) {
+ // If using ZooKeeper and the client application has requested an update timeout, then block until all
+ // active replicas for this collection process the updated schema
+ if (getUpdateTimeoutSecs() > 0 && newSchema != null &&
+ newSchema.getResourceLoader() instanceof ZkSolrResourceLoader)
+ {
+ CoreDescriptor cd = getSolrCore().getCoreDescriptor();
+ String collection = cd.getCollectionName();
+ if (collection != null) {
+ ZkSolrResourceLoader zkLoader = (ZkSolrResourceLoader) newSchema.getResourceLoader();
+ ManagedIndexSchema.waitForSchemaZkVersionAgreement(collection,
+ cd.getCloudDescriptor().getCoreNodeName(),
+ ((ManagedIndexSchema) newSchema).getSchemaZkVersion(),
+ zkLoader.getZkController(),
+ getUpdateTimeoutSecs());
+ }
+ }
+ }
+
// protected access on this class triggers a bug in javadoc generation caught by
// documentation-link: "BROKEN LINK" reported in javadoc for classes using
// NewFieldArguments because the link target file is BaseFieldResource.NewFieldArguments,
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java Fri Oct 3 16:06:59 2014
@@ -17,10 +17,13 @@ package org.apache.solr.rest.schema;
* limitations under the License.
*/
+import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.util.SimpleOrderedMap;
+import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.rest.BaseSolrResource;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
+import org.apache.solr.schema.ManagedIndexSchema;
import org.restlet.resource.ResourceException;
import java.util.List;
@@ -57,4 +60,40 @@ abstract class BaseFieldTypeResource ext
/** Return a list of names of DynamicFields that have the given FieldType */
protected abstract List<String> getDynamicFieldsWithFieldType(FieldType fieldType);
+
+ /**
+ * Adds one or more new FieldType definitions to the managed schema for the given core.
+ */
+ protected void addNewFieldTypes(List<FieldType> newFieldTypes, ManagedIndexSchema oldSchema) {
+ IndexSchema newSchema = null;
+ boolean success = false;
+ while (!success) {
+ try {
+ synchronized (oldSchema.getSchemaUpdateLock()) {
+ newSchema = oldSchema.addFieldTypes(newFieldTypes);
+ getSolrCore().setLatestSchema(newSchema);
+ success = true;
+ }
+ } catch (ManagedIndexSchema.SchemaChangedInZkException e) {
+ oldSchema = (ManagedIndexSchema)getSolrCore().getLatestSchema();
+ }
+ }
+
+ // If using ZooKeeper and the client application has requested an update timeout, then block until all
+ // active replicas for this collection process the updated schema
+ if (getUpdateTimeoutSecs() > 0 && newSchema != null &&
+ newSchema.getResourceLoader() instanceof ZkSolrResourceLoader)
+ {
+ CoreDescriptor cd = getSolrCore().getCoreDescriptor();
+ String collection = cd.getCollectionName();
+ if (collection != null) {
+ ZkSolrResourceLoader zkLoader = (ZkSolrResourceLoader) newSchema.getResourceLoader();
+ ManagedIndexSchema.waitForSchemaZkVersionAgreement(collection,
+ cd.getCloudDescriptor().getCoreNodeName(),
+ ((ManagedIndexSchema) newSchema).getSchemaZkVersion(),
+ zkLoader.getZkController(),
+ getUpdateTimeoutSecs());
+ }
+ }
+ }
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java Fri Oct 3 16:06:59 2014
@@ -168,11 +168,12 @@ public class CopyFieldCollectionResource
log.error(message.toString().trim());
throw new SolrException(ErrorCode.BAD_REQUEST, message.toString().trim());
}
+ IndexSchema newSchema = null;
boolean success = false;
while (!success) {
try {
synchronized (oldSchema.getSchemaUpdateLock()) {
- IndexSchema newSchema = oldSchema.addCopyFields(fieldsToCopy);
+ newSchema = oldSchema.addCopyFields(fieldsToCopy);
if (null != newSchema) {
getSolrCore().setLatestSchema(newSchema);
success = true;
@@ -185,6 +186,7 @@ public class CopyFieldCollectionResource
oldSchema = (ManagedIndexSchema)getSolrCore().getLatestSchema();
}
}
+ waitForSchemaUpdateToPropagate(newSchema);
}
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java Fri Oct 3 16:06:59 2014
@@ -159,6 +159,7 @@ public class DynamicFieldCollectionResou
newDynamicFields.add(oldSchema.newDynamicField(fieldNamePattern, fieldType, map));
newDynamicFieldArguments.add(new NewFieldArguments(fieldNamePattern, fieldType, map));
}
+ IndexSchema newSchema = null;
boolean firstAttempt = true;
boolean success = false;
while ( ! success) {
@@ -177,7 +178,7 @@ public class DynamicFieldCollectionResou
}
firstAttempt = false;
synchronized (oldSchema.getSchemaUpdateLock()) {
- IndexSchema newSchema = oldSchema.addDynamicFields(newDynamicFields, copyFields);
+ newSchema = oldSchema.addDynamicFields(newDynamicFields, copyFields);
if (null != newSchema) {
getSolrCore().setLatestSchema(newSchema);
success = true;
@@ -190,6 +191,9 @@ public class DynamicFieldCollectionResou
oldSchema = (ManagedIndexSchema)getSolrCore().getLatestSchema();
}
}
+
+ waitForSchemaUpdateToPropagate(newSchema);
+
}
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java Fri Oct 3 16:06:59 2014
@@ -157,12 +157,13 @@ public class DynamicFieldResource extend
if (copyFieldNames != null) {
map.remove(IndexSchema.COPY_FIELDS);
}
+ IndexSchema newSchema = null;
boolean success = false;
while ( ! success) {
try {
SchemaField newDynamicField = oldSchema.newDynamicField(fieldNamePattern, fieldType, map);
synchronized (oldSchema.getSchemaUpdateLock()) {
- IndexSchema newSchema = oldSchema.addDynamicField(newDynamicField, copyFieldNames);
+ newSchema = oldSchema.addDynamicField(newDynamicField, copyFieldNames);
if (null != newSchema) {
getSolrCore().setLatestSchema(newSchema);
success = true;
@@ -175,6 +176,8 @@ public class DynamicFieldResource extend
oldSchema = (ManagedIndexSchema)getSolrCore().getLatestSchema();
}
}
+ // if in cloud mode, wait for schema updates to propagate to all replicas
+ waitForSchemaUpdateToPropagate(newSchema);
}
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java Fri Oct 3 16:06:59 2014
@@ -17,10 +17,12 @@ package org.apache.solr.rest.schema;
*/
+import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.SimpleOrderedMap;
+import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.rest.GETable;
import org.apache.solr.rest.POSTable;
import org.apache.solr.schema.IndexSchema;
@@ -177,6 +179,7 @@ public class FieldCollectionResource ext
newFields.add(oldSchema.newField(fieldName, fieldType, map));
newFieldArguments.add(new NewFieldArguments(fieldName, fieldType, map));
}
+ IndexSchema newSchema = null;
boolean firstAttempt = true;
boolean success = false;
while (!success) {
@@ -196,7 +199,7 @@ public class FieldCollectionResource ext
}
firstAttempt = false;
synchronized (oldSchema.getSchemaUpdateLock()) {
- IndexSchema newSchema = oldSchema.addFields(newFields, copyFields);
+ newSchema = oldSchema.addFields(newFields, copyFields);
if (null != newSchema) {
getSolrCore().setLatestSchema(newSchema);
success = true;
@@ -209,6 +212,7 @@ public class FieldCollectionResource ext
oldSchema = getSolrCore().getLatestSchema();
}
}
+ waitForSchemaUpdateToPropagate(newSchema);
}
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java Fri Oct 3 16:06:59 2014
@@ -16,8 +16,11 @@ package org.apache.solr.rest.schema;
* limitations under the License.
*/
+import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.solr.core.CoreDescriptor;
+import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.rest.GETable;
import org.apache.solr.rest.PUTable;
import org.apache.solr.schema.IndexSchema;
@@ -162,12 +165,14 @@ public class FieldResource extends BaseF
if (copyFieldNames != null) {
map.remove(IndexSchema.COPY_FIELDS);
}
+
+ IndexSchema newSchema = null;
boolean success = false;
while (!success) {
try {
SchemaField newField = oldSchema.newField(fieldName, fieldType, map);
synchronized (oldSchema.getSchemaUpdateLock()) {
- IndexSchema newSchema = oldSchema.addField(newField, copyFieldNames);
+ newSchema = oldSchema.addField(newField, copyFieldNames);
if (null != newSchema) {
getSolrCore().setLatestSchema(newSchema);
success = true;
@@ -180,6 +185,7 @@ public class FieldResource extends BaseF
oldSchema = (ManagedIndexSchema)getSolrCore().getLatestSchema();
}
}
+ waitForSchemaUpdateToPropagate(newSchema);
}
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java Fri Oct 3 16:06:59 2014
@@ -19,7 +19,6 @@ package org.apache.solr.rest.schema;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.core.SolrCore;
import org.apache.solr.rest.GETable;
import org.apache.solr.rest.POSTable;
import org.apache.solr.schema.FieldType;
@@ -195,23 +194,4 @@ public class FieldTypeCollectionResource
// now deploy the added types (all or nothing)
addNewFieldTypes(newFieldTypes, oldSchema);
}
-
- /**
- * Adds one or more new FieldType definitions to the managed schema for the given core.
- */
- protected void addNewFieldTypes(List<FieldType> newFieldTypes, ManagedIndexSchema oldSchema) {
- boolean success = false;
- while (!success) {
- try {
- synchronized (oldSchema.getSchemaUpdateLock()) {
- IndexSchema newSchema = oldSchema.addFieldTypes(newFieldTypes);
- getSolrCore().setLatestSchema(newSchema);
- success = true;
- }
- } catch (ManagedIndexSchema.SchemaChangedInZkException e) {
- log.debug("Schema changed while processing request, retrying");
- oldSchema = (ManagedIndexSchema)getSolrCore().getLatestSchema();
- }
- }
- }
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java Fri Oct 3 16:06:59 2014
@@ -164,28 +164,7 @@ public class FieldTypeResource extends B
protected void addOrUpdateFieldType(Map<String,Object> fieldTypeJson) {
ManagedIndexSchema oldSchema = (ManagedIndexSchema) getSchema();
FieldType newFieldType = buildFieldTypeFromJson(oldSchema, typeName, fieldTypeJson);
- addNewFieldType(newFieldType, oldSchema);
- }
-
- /**
- * Adds a new FieldType definitions to the managed schema for the given core.
- */
- protected void addNewFieldType(FieldType newFieldType, ManagedIndexSchema oldSchema) {
- boolean success = false;
- while (!success) {
- try {
- Object updateLock = oldSchema.getSchemaUpdateLock();
- synchronized (updateLock) {
- IndexSchema newSchema = oldSchema.addFieldTypes(Collections.singletonList(newFieldType));
- getSolrCore().setLatestSchema(newSchema);
-
- success = true;
- }
- } catch (ManagedIndexSchema.SchemaChangedInZkException e) {
- log.info("Schema changed while processing request, retrying");
- oldSchema = (ManagedIndexSchema)getSolrCore().getLatestSchema();
- }
- }
+ addNewFieldTypes(Collections.singletonList(newFieldType), oldSchema);
}
/**
Added: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/SchemaZkVersionResource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/SchemaZkVersionResource.java?rev=1629246&view=auto
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/SchemaZkVersionResource.java (added)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/rest/schema/SchemaZkVersionResource.java Fri Oct 3 16:06:59 2014
@@ -0,0 +1,79 @@
+package org.apache.solr.rest.schema;
+/*
+ * 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.
+ */
+
+import org.apache.solr.cloud.ZkSolrResourceLoader;
+import org.apache.solr.rest.BaseSolrResource;
+import org.apache.solr.rest.GETable;
+import org.apache.solr.schema.IndexSchema;
+import org.apache.solr.schema.ManagedIndexSchema;
+import org.apache.solr.schema.ZkIndexSchemaReader;
+import org.restlet.representation.Representation;
+import org.restlet.resource.ResourceException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * This class responds to requests at /solr/(corename)/schema/zkversion
+ */
+public class SchemaZkVersionResource extends BaseSolrResource implements GETable {
+ private static final Logger log = LoggerFactory.getLogger(SchemaZkVersionResource.class);
+
+ protected int refreshIfBelowVersion = -1;
+
+ public SchemaZkVersionResource() {
+ super();
+ }
+
+ @Override
+ public void doInit() throws ResourceException {
+ super.doInit();
+
+ // sometimes the client knows which version it expects
+ Object refreshParam = getSolrRequest().getParams().get("refreshIfBelowVersion");
+ if (refreshParam != null)
+ refreshIfBelowVersion = (refreshParam instanceof Number) ? ((Number)refreshParam).intValue()
+ : Integer.parseInt(refreshParam.toString());
+ }
+
+ @Override
+ public Representation get() {
+ try {
+ int zkVersion = -1;
+ IndexSchema schema = getSchema();
+ if (schema instanceof ManagedIndexSchema) {
+ ManagedIndexSchema managed = (ManagedIndexSchema)schema;
+ zkVersion = managed.getSchemaZkVersion();
+ if (refreshIfBelowVersion != -1 && zkVersion < refreshIfBelowVersion) {
+ log.info("REFRESHING SCHEMA (refreshIfBelowVersion="+refreshIfBelowVersion+
+ ", currentVersion="+zkVersion+") before returning version!");
+ ZkSolrResourceLoader zkSolrResourceLoader = (ZkSolrResourceLoader)getSolrCore().getResourceLoader();
+ ZkIndexSchemaReader zkIndexSchemaReader = zkSolrResourceLoader.getZkIndexSchemaReader();
+ managed = zkIndexSchemaReader.refreshSchemaFromZk(refreshIfBelowVersion);
+ zkVersion = managed.getSchemaZkVersion();
+ }
+ }
+ getSolrResponse().add("zkversion", zkVersion);
+ } catch (Exception e) {
+ getSolrResponse().setException(e);
+ }
+ handlePostExecution(log);
+
+ return new SolrOutputRepresentation();
+ }
+}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java Fri Oct 3 16:06:59 2014
@@ -22,22 +22,36 @@ import org.apache.lucene.analysis.util.C
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.solr.analysis.TokenizerChain;
+import org.apache.solr.client.solrj.SolrRequest;
+import org.apache.solr.client.solrj.SolrResponse;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.cloud.ZkController;
import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.solr.common.cloud.ClusterState;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.cloud.ZkCoreNodeProps;
+import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.ContentStream;
+import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.Config;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.rest.schema.FieldTypeXmlAdapter;
+import org.apache.solr.util.DefaultSolrThreadFactory;
import org.apache.solr.util.FileUtils;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.data.Stat;
import org.w3c.dom.Document;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
@@ -49,7 +63,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -58,8 +71,14 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
/** Solr-managed schema - non-user-editable, but can be mutable via internal and external REST API requests. */
public final class ManagedIndexSchema extends IndexSchema {
@@ -192,6 +211,169 @@ public final class ManagedIndexSchema ex
return success;
}
+ /**
+ * Block up to a specified maximum time until we see agreement on the schema
+ * version in ZooKeeper across all replicas for a collection.
+ */
+ public static void waitForSchemaZkVersionAgreement(String collection, String localCoreNodeName,
+ int schemaZkVersion, ZkController zkController, int maxWaitSecs)
+ {
+ long startMs = System.currentTimeMillis();
+
+ // get a list of active replica cores to query for the schema zk version (skipping this core of course)
+ List<GetZkSchemaVersionCallable> concurrentTasks = new ArrayList<>();
+ for (String coreUrl : getActiveReplicaCoreUrls(zkController, collection, localCoreNodeName))
+ concurrentTasks.add(new GetZkSchemaVersionCallable(coreUrl, schemaZkVersion));
+ if (concurrentTasks.isEmpty())
+ return; // nothing to wait for ...
+
+
+ log.info("Waiting up to "+maxWaitSecs+" secs for "+concurrentTasks.size()+
+ " replicas to apply schema update version "+schemaZkVersion+" for collection "+collection);
+
+ // use an executor service to invoke schema zk version requests in parallel with a max wait time
+ int poolSize = Math.min(concurrentTasks.size(), 10);
+ ExecutorService parallelExecutor =
+ Executors.newFixedThreadPool(poolSize, new DefaultSolrThreadFactory("managedSchemaExecutor"));
+ try {
+ List<Future<Integer>> results =
+ parallelExecutor.invokeAll(concurrentTasks, maxWaitSecs, TimeUnit.SECONDS);
+
+ // determine whether all replicas have the update
+ List<String> failedList = null; // lazily init'd
+ for (int f=0; f < results.size(); f++) {
+ int vers = -1;
+ Future<Integer> next = results.get(f);
+ if (next.isDone() && !next.isCancelled()) {
+ // looks to have finished, but need to check the version value too
+ try {
+ vers = next.get();
+ } catch (ExecutionException e) {
+ // shouldn't happen since we checked isCancelled
+ }
+ }
+
+ if (vers == -1) {
+ String coreUrl = concurrentTasks.get(f).coreUrl;
+ log.warn("Core "+coreUrl+" version mismatch! Expected "+schemaZkVersion+" but got "+vers);
+ if (failedList == null) failedList = new ArrayList<>();
+ failedList.add(coreUrl);
+ }
+ }
+
+ // if any tasks haven't completed within the specified timeout, it's an error
+ if (failedList != null)
+ throw new SolrException(ErrorCode.SERVER_ERROR, failedList.size()+" out of "+(concurrentTasks.size() + 1)+
+ " replicas failed to update their schema to version "+schemaZkVersion+" within "+
+ maxWaitSecs+" seconds! Failed cores: "+failedList);
+
+ } catch (InterruptedException ie) {
+ log.warn("Core "+localCoreNodeName+" was interrupted waiting for schema version "+schemaZkVersion+
+ " to propagate to "+concurrentTasks.size()+" replicas for collection "+collection);
+
+ Thread.currentThread().interrupt();
+ } finally {
+ if (!parallelExecutor.isShutdown())
+ parallelExecutor.shutdownNow();
+ }
+
+ long diffMs = (System.currentTimeMillis() - startMs);
+ log.info("Took "+Math.round(diffMs/1000d)+" secs for "+concurrentTasks.size()+
+ " replicas to apply schema update version "+schemaZkVersion+" for collection "+collection);
+ }
+
+ protected static List<String> getActiveReplicaCoreUrls(ZkController zkController, String collection, String localCoreNodeName) {
+ List<String> activeReplicaCoreUrls = new ArrayList<>();
+ ZkStateReader zkStateReader = zkController.getZkStateReader();
+ ClusterState clusterState = zkStateReader.getClusterState();
+ Set<String> liveNodes = clusterState.getLiveNodes();
+ Collection<Slice> activeSlices = clusterState.getActiveSlices(collection);
+ if (activeSlices != null && activeSlices.size() > 0) {
+ for (Slice next : activeSlices) {
+ Map<String, Replica> replicasMap = next.getReplicasMap();
+ if (replicasMap != null) {
+ for (Map.Entry<String, Replica> entry : replicasMap.entrySet()) {
+ Replica replica = entry.getValue();
+ if (!localCoreNodeName.equals(replica.getName()) &&
+ ZkStateReader.ACTIVE.equals(replica.getStr(ZkStateReader.STATE_PROP)) &&
+ liveNodes.contains(replica.getNodeName())) {
+ ZkCoreNodeProps replicaCoreProps = new ZkCoreNodeProps(replica);
+ activeReplicaCoreUrls.add(replicaCoreProps.getCoreUrl());
+ }
+ }
+ }
+ }
+ }
+ return activeReplicaCoreUrls;
+ }
+
+ private static class GetZkSchemaVersionCallable extends SolrRequest implements Callable<Integer> {
+
+ private String coreUrl;
+ private int expectedZkVersion;
+
+ GetZkSchemaVersionCallable(String coreUrl, int expectedZkVersion) {
+ super(METHOD.GET, "/schema/zkversion");
+
+ this.coreUrl = coreUrl;
+ this.expectedZkVersion = expectedZkVersion;
+ }
+
+ @Override
+ public SolrParams getParams() {
+ ModifiableSolrParams wparams = new ModifiableSolrParams();
+ wparams.set("refreshIfBelowVersion", expectedZkVersion);
+ return wparams;
+ }
+
+ @Override
+ public Integer call() throws Exception {
+ HttpSolrServer solr = new HttpSolrServer(coreUrl);
+ int remoteVersion = -1;
+ try {
+ // eventually, this loop will get killed by the ExecutorService's timeout
+ while (remoteVersion == -1 || remoteVersion < expectedZkVersion) {
+ try {
+ HttpSolrServer.HttpUriRequestResponse mrr = solr.httpUriRequest(this);
+ NamedList<Object> zkversionResp = mrr.future.get();
+ if (zkversionResp != null)
+ remoteVersion = (Integer)zkversionResp.get("zkversion");
+
+ if (remoteVersion < expectedZkVersion) {
+ // rather than waiting and re-polling, let's be proactive and tell the replica
+ // to refresh its schema from ZooKeeper, if that fails, then the
+ //Thread.sleep(1000); // slight delay before requesting version again
+ log.error("Replica "+coreUrl+" returned schema version "+
+ remoteVersion+" and has not applied schema version "+expectedZkVersion);
+ }
+
+ } catch (Exception e) {
+ if (e instanceof InterruptedException) {
+ break; // stop looping
+ } else {
+ log.warn("Failed to get /schema/zkversion from " + coreUrl + " due to: " + e);
+ }
+ }
+ }
+ } finally {
+ solr.shutdown();
+ }
+
+ return remoteVersion;
+ }
+
+ @Override
+ public Collection<ContentStream> getContentStreams() throws IOException {
+ return null;
+ }
+
+ @Override
+ public SolrResponse process(SolrServer server) throws SolrServerException, IOException {
+ return null;
+ }
+ }
+
+
public class FieldExistsException extends SolrException {
public FieldExistsException(ErrorCode code, String msg) {
super(code, msg);
@@ -203,7 +385,7 @@ public final class ManagedIndexSchema ex
super(code, msg);
}
}
-
+
@Override
public ManagedIndexSchema addField(SchemaField newField) {
return addFields(Arrays.asList(newField));
@@ -483,6 +665,10 @@ public final class ManagedIndexSchema ex
}
return sf;
}
+
+ public int getSchemaZkVersion() {
+ return schemaZkVersion;
+ }
@Override
public SchemaField newDynamicField(String fieldNamePattern, String fieldType, Map<String,?> options) {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java Fri Oct 3 16:06:59 2014
@@ -389,6 +389,8 @@ public class ManagedIndexSchemaFactory e
this.core = core;
if (loader instanceof ZkSolrResourceLoader) {
this.zkIndexSchemaReader = new ZkIndexSchemaReader(this);
+ ZkSolrResourceLoader zkLoader = (ZkSolrResourceLoader)loader;
+ zkLoader.setZkIndexSchemaReader(this.zkIndexSchemaReader);
} else {
this.zkIndexSchemaReader = null;
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java Fri Oct 3 16:06:59 2014
@@ -18,6 +18,7 @@ package org.apache.solr.schema;
import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.solr.common.cloud.OnReconnect;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.zookeeper.KeeperException;
@@ -32,7 +33,7 @@ import java.io.ByteArrayInputStream;
import java.util.concurrent.TimeUnit;
/** Keeps a ManagedIndexSchema up-to-date when changes are made to the serialized managed schema in ZooKeeper */
-public class ZkIndexSchemaReader {
+public class ZkIndexSchemaReader implements OnReconnect {
private static final Logger log = LoggerFactory.getLogger(ZkIndexSchemaReader.class);
private final ManagedIndexSchemaFactory managedIndexSchemaFactory;
private SolrZkClient zkClient;
@@ -44,6 +45,7 @@ public class ZkIndexSchemaReader {
this.zkClient = zkLoader.getZkController().getZkClient();
managedSchemaPath = zkLoader.getCollectionZkPath() + "/" + managedIndexSchemaFactory.getManagedSchemaResourceName();
createSchemaWatcher();
+ zkLoader.getZkController().addOnReconnectListener(this);
}
public Object getSchemaUpdateLock() {
@@ -51,7 +53,7 @@ public class ZkIndexSchemaReader {
}
public void createSchemaWatcher() {
- log.info("Creating ZooKeeper watch for the managed schema at " + managedSchemaPath + " ...");
+ log.info("Creating ZooKeeper watch for the managed schema at " + managedSchemaPath);
try {
zkClient.exists(managedSchemaPath, new Watcher() {
@@ -63,7 +65,7 @@ public class ZkIndexSchemaReader {
}
log.info("A schema change: {}, has occurred - updating schema from ZooKeeper ...", event);
try {
- updateSchema(this);
+ updateSchema(this, -1);
} catch (KeeperException e) {
if (e.code() == KeeperException.Code.SESSIONEXPIRED || e.code() == KeeperException.Code.CONNECTIONLOSS) {
log.warn("ZooKeeper watch triggered, but Solr cannot talk to ZK");
@@ -89,20 +91,45 @@ public class ZkIndexSchemaReader {
}
}
- private void updateSchema(Watcher watcher) throws KeeperException, InterruptedException {
+ public ManagedIndexSchema refreshSchemaFromZk(int expectedZkVersion) throws KeeperException, InterruptedException {
+ updateSchema(null, expectedZkVersion);
+ return managedIndexSchemaFactory.getSchema();
+ }
+
+ private void updateSchema(Watcher watcher, int expectedZkVersion) throws KeeperException, InterruptedException {
Stat stat = new Stat();
synchronized (getSchemaUpdateLock()) {
final ManagedIndexSchema oldSchema = managedIndexSchemaFactory.getSchema();
- byte[] data = zkClient.getData(managedSchemaPath, watcher, stat, true);
- if (stat.getVersion() != oldSchema.schemaZkVersion) {
- log.info("Retrieved schema from ZooKeeper");
- long start = System.nanoTime();
- InputSource inputSource = new InputSource(new ByteArrayInputStream(data));
- ManagedIndexSchema newSchema = oldSchema.reloadFields(inputSource, stat.getVersion());
- managedIndexSchemaFactory.setSchema(newSchema);
- long stop = System.nanoTime();
- log.info("Finished refreshing schema in " + TimeUnit.MILLISECONDS.convert(stop - start, TimeUnit.NANOSECONDS) + " ms");
+ if (expectedZkVersion == -1 || oldSchema.schemaZkVersion < expectedZkVersion) {
+ byte[] data = zkClient.getData(managedSchemaPath, watcher, stat, true);
+ if (stat.getVersion() != oldSchema.schemaZkVersion) {
+ log.info("Retrieved schema version "+stat.getVersion()+" from ZooKeeper");
+ long start = System.nanoTime();
+ InputSource inputSource = new InputSource(new ByteArrayInputStream(data));
+ ManagedIndexSchema newSchema = oldSchema.reloadFields(inputSource, stat.getVersion());
+ managedIndexSchemaFactory.setSchema(newSchema);
+ long stop = System.nanoTime();
+ log.info("Finished refreshing schema in " + TimeUnit.MILLISECONDS.convert(stop - start, TimeUnit.NANOSECONDS) + " ms");
+ } else {
+ log.info("Current schema version "+oldSchema.schemaZkVersion+" is already the latest");
+ }
}
}
}
+
+ /**
+ * Called after a ZooKeeper session expiration occurs; need to re-create the watcher and update the current
+ * schema from ZooKeeper.
+ */
+ @Override
+ public void command() {
+ try {
+ // setup a new watcher to get notified when the managed schema changes
+ createSchemaWatcher();
+ // force update now as the schema may have changed while our zk session was expired
+ updateSchema(null, -1);
+ } catch (Exception exc) {
+ log.error("Failed to update managed-schema watcher after session expiration due to: "+exc, exc);
+ }
+ }
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java Fri Oct 3 16:06:59 2014
@@ -17,8 +17,15 @@ package org.apache.solr.schema;
*/
import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
+import org.apache.solr.common.cloud.ClusterState;
+import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.common.cloud.Slice;
+import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.cloud.ZkCoreNodeProps;
+import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.util.BaseTestHarness;
import org.apache.solr.util.RESTfulServerProvider;
import org.apache.solr.util.RestTestHarness;
@@ -27,6 +34,8 @@ import org.restlet.ext.servlet.ServerSer
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.zookeeper.data.Stat;
+
import org.junit.BeforeClass;
import java.util.ArrayList;
@@ -96,51 +105,65 @@ public class TestCloudManagedSchemaConcu
}
}
- private static void addFieldPut(RestTestHarness publisher, String fieldName) throws Exception {
+ private static void addFieldPut(RestTestHarness publisher, String fieldName, int updateTimeoutSecs) throws Exception {
final String content = "{\"type\":\"text\",\"stored\":\"false\"}";
String request = "/schema/fields/" + fieldName + "?wt=xml";
+ if (updateTimeoutSecs > 0)
+ request += "&updateTimeoutSecs="+updateTimeoutSecs;
String response = publisher.put(request, content);
verifySuccess(request, response);
}
- private static void addFieldPost(RestTestHarness publisher, String fieldName) throws Exception {
+ private static void addFieldPost(RestTestHarness publisher, String fieldName, int updateTimeoutSecs) throws Exception {
final String content = "[{\"name\":\""+fieldName+"\",\"type\":\"text\",\"stored\":\"false\"}]";
String request = "/schema/fields/?wt=xml";
+ if (updateTimeoutSecs > 0)
+ request += "&updateTimeoutSecs="+updateTimeoutSecs;
String response = publisher.post(request, content);
verifySuccess(request, response);
}
- private static void addDynamicFieldPut(RestTestHarness publisher, String dynamicFieldPattern) throws Exception {
+ private static void addDynamicFieldPut(RestTestHarness publisher, String dynamicFieldPattern, int updateTimeoutSecs) throws Exception {
final String content = "{\"type\":\"text\",\"stored\":\"false\"}";
String request = "/schema/dynamicfields/" + dynamicFieldPattern + "?wt=xml";
+ if (updateTimeoutSecs > 0)
+ request += "&updateTimeoutSecs="+updateTimeoutSecs;
String response = publisher.put(request, content);
verifySuccess(request, response);
}
- private static void addDynamicFieldPost(RestTestHarness publisher, String dynamicFieldPattern) throws Exception {
+ private static void addDynamicFieldPost(RestTestHarness publisher, String dynamicFieldPattern, int updateTimeoutSecs) throws Exception {
final String content = "[{\"name\":\""+dynamicFieldPattern+"\",\"type\":\"text\",\"stored\":\"false\"}]";
String request = "/schema/dynamicfields/?wt=xml";
+ if (updateTimeoutSecs > 0)
+ request += "&updateTimeoutSecs="+updateTimeoutSecs;
String response = publisher.post(request, content);
verifySuccess(request, response);
}
- private static void copyField(RestTestHarness publisher, String source, String dest) throws Exception {
+ private static void copyField(RestTestHarness publisher, String source, String dest, int updateTimeoutSecs) throws Exception {
final String content = "[{\"source\":\""+source+"\",\"dest\":[\""+dest+"\"]}]";
String request = "/schema/copyfields/?wt=xml";
+ if (updateTimeoutSecs > 0)
+ request += "&updateTimeoutSecs="+updateTimeoutSecs;
String response = publisher.post(request, content);
verifySuccess(request, response);
}
- private static void addFieldTypePut(RestTestHarness publisher, String typeName) throws Exception {
+ private static void addFieldTypePut(RestTestHarness publisher, String typeName, int updateTimeoutSecs) throws Exception {
final String content = "{\"class\":\"solr.TrieIntField\"}";
String request = "/schema/fieldtypes/" + typeName + "?wt=xml";
+ if (updateTimeoutSecs > 0)
+ request += "&updateTimeoutSecs="+updateTimeoutSecs;
String response = publisher.put(request, content);
verifySuccess(request, response);
}
- private static void addFieldTypePost(RestTestHarness publisher, String typeName) throws Exception {
+ private static void addFieldTypePost(RestTestHarness publisher, String typeName, int updateTimeoutSecs) throws Exception {
final String content = "[{\"name\":\""+typeName+"\",\"class\":\"solr.TrieIntField\"}]";
String request = "/schema/fieldtypes/?wt=xml";
+ if (updateTimeoutSecs > 0)
+ request += "&updateTimeoutSecs="+updateTimeoutSecs;
String response = publisher.post(request, content);
verifySuccess(request, response);
}
@@ -220,6 +243,7 @@ public class TestCloudManagedSchemaConcu
@Override
public void doTest() throws Exception {
+ verifyWaitForSchemaUpdateToPropagate();
setupHarnesses();
concurrentOperationsTest();
schemaLockTest();
@@ -244,23 +268,23 @@ public class TestCloudManagedSchemaConcu
PUT_AddField {
@Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
String fieldname = PUT_FIELDNAME + info.numAddFieldPuts++;
- addFieldPut(publisher, fieldname);
+ addFieldPut(publisher, fieldname, 15);
}
},
POST_AddField {
@Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
String fieldname = POST_FIELDNAME + info.numAddFieldPosts++;
- addFieldPost(publisher, fieldname);
+ addFieldPost(publisher, fieldname, 15);
}
},
PUT_AddDynamicField {
@Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- addDynamicFieldPut(publisher, PUT_DYNAMIC_FIELDNAME + info.numAddDynamicFieldPuts++ + "_*");
+ addDynamicFieldPut(publisher, PUT_DYNAMIC_FIELDNAME + info.numAddDynamicFieldPuts++ + "_*", 15);
}
},
POST_AddDynamicField {
@Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- addDynamicFieldPost(publisher, POST_DYNAMIC_FIELDNAME + info.numAddDynamicFieldPosts++ + "_*");
+ addDynamicFieldPost(publisher, POST_DYNAMIC_FIELDNAME + info.numAddDynamicFieldPosts++ + "_*", 15);
}
},
POST_AddCopyField {
@@ -273,7 +297,7 @@ public class TestCloudManagedSchemaConcu
sourceField = "name";
} else if (sourceType == 1) { // newly created
sourceField = "copySource" + fieldNum;
- addFieldPut(publisher, sourceField);
+ addFieldPut(publisher, sourceField, 15);
} else { // dynamic
sourceField = "*_dynamicSource" + fieldNum + "_t";
// * only supported if both src and dst use it
@@ -286,23 +310,23 @@ public class TestCloudManagedSchemaConcu
destField = "title";
} else { // newly created
destField = "copyDest" + fieldNum;
- addFieldPut(publisher, destField);
+ addFieldPut(publisher, destField, 15);
}
}
- copyField(publisher, sourceField, destField);
+ copyField(publisher, sourceField, destField, 15);
info.copyFields.add(new CopyFieldInfo(sourceField, destField));
}
},
PUT_AddFieldType {
@Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
String typeName = PUT_FIELDTYPE + info.numAddFieldTypePuts++;
- addFieldTypePut(publisher, typeName);
+ addFieldTypePut(publisher, typeName, 15);
}
},
POST_AddFieldType {
@Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
String typeName = POST_FIELDTYPE + info.numAddFieldTypePosts++;
- addFieldTypePost(publisher, typeName);
+ addFieldTypePost(publisher, typeName, 15);
}
};
@@ -315,6 +339,95 @@ public class TestCloudManagedSchemaConcu
}
}
+ private void verifyWaitForSchemaUpdateToPropagate() throws Exception {
+ String testCollectionName = "collection1";
+
+ ClusterState clusterState = cloudClient.getZkStateReader().getClusterState();
+ Replica shard1Leader = clusterState.getLeader(testCollectionName, "shard1");
+ final String coreUrl = (new ZkCoreNodeProps(shard1Leader)).getCoreUrl();
+ assertNotNull(coreUrl);
+
+ RestTestHarness harness = new RestTestHarness(new RESTfulServerProvider() {
+ public String getBaseURL() {
+ return coreUrl.endsWith("/") ? coreUrl.substring(0, coreUrl.length()-1) : coreUrl;
+ }
+ });
+
+ addFieldTypePut(harness, "fooInt", 15);
+
+ // go into ZK to get the version of the managed schema after the update
+ SolrZkClient zkClient = cloudClient.getZkStateReader().getZkClient();
+ Stat stat = new Stat();
+ String znodePath = "/configs/conf1/managed-schema";
+ byte[] managedSchemaBytes = zkClient.getData(znodePath, null, stat, false);
+ int schemaZkVersion = stat.getVersion();
+
+ // now loop over all replicas and verify each has the same schema version
+ Replica randomReplicaNotLeader = null;
+ for (Slice slice : clusterState.getActiveSlices(testCollectionName)) {
+ for (Replica replica : slice.getReplicas()) {
+ validateZkVersion(replica, schemaZkVersion, 0, false);
+
+ // save a random replica to test zk watcher behavior
+ if (randomReplicaNotLeader == null && !replica.getName().equals(shard1Leader.getName()))
+ randomReplicaNotLeader = replica;
+ }
+ }
+ assertNotNull(randomReplicaNotLeader);
+
+ // now update the data and then verify the znode watcher fires correctly
+ // before an after a zk session expiration (see SOLR-6249)
+ zkClient.setData(znodePath, managedSchemaBytes, schemaZkVersion, false);
+ stat = new Stat();
+ managedSchemaBytes = zkClient.getData(znodePath, null, stat, false);
+ int updatedSchemaZkVersion = stat.getVersion();
+ assertTrue(updatedSchemaZkVersion > schemaZkVersion);
+ validateZkVersion(randomReplicaNotLeader, updatedSchemaZkVersion, 2, true);
+
+ // ok - looks like the watcher fired correctly on the replica
+ // now, expire that replica's zk session and then verify the watcher fires again (after reconnect)
+ JettySolrRunner randomReplicaJetty =
+ getJettyOnPort(getReplicaPort(randomReplicaNotLeader));
+ assertNotNull(randomReplicaJetty);
+ chaosMonkey.expireSession(randomReplicaJetty);
+
+ // update the data again to cause watchers to fire
+ zkClient.setData(znodePath, managedSchemaBytes, updatedSchemaZkVersion, false);
+ stat = new Stat();
+ managedSchemaBytes = zkClient.getData(znodePath, null, stat, false);
+ updatedSchemaZkVersion = stat.getVersion();
+ // give up to 10 secs for the replica to recover after zk session loss and see the update
+ validateZkVersion(randomReplicaNotLeader, updatedSchemaZkVersion, 10, true);
+ }
+
+ /**
+ * Sends a GET request to get the zk schema version from a specific replica.
+ */
+ protected void validateZkVersion(Replica replica, int schemaZkVersion, int waitSecs, boolean retry) throws Exception {
+ final String replicaUrl = (new ZkCoreNodeProps(replica)).getCoreUrl();
+ RestTestHarness testHarness = new RestTestHarness(new RESTfulServerProvider() {
+ public String getBaseURL() {
+ return replicaUrl.endsWith("/") ? replicaUrl.substring(0, replicaUrl.length()-1) : replicaUrl;
+ }
+ });
+
+ long waitMs = waitSecs * 1000L;
+ if (waitMs > 0) Thread.sleep(waitMs); // wait a moment for the zk watcher to fire
+
+ try {
+ testHarness.validateQuery("/schema/zkversion?wt=xml", "//zkversion=" + schemaZkVersion);
+ } catch (Exception exc) {
+ if (retry) {
+ // brief wait before retrying
+ Thread.sleep(waitMs > 0 ? waitMs : 2000L);
+
+ testHarness.validateQuery("/schema/zkversion?wt=xml", "//zkversion=" + schemaZkVersion);
+ } else {
+ throw exc;
+ }
+ }
+ }
+
private void concurrentOperationsTest() throws Exception {
// First, add a bunch of fields and dynamic fields via PUT and POST, as well as copyFields,
@@ -405,7 +518,9 @@ public class TestCloudManagedSchemaConcu
}
public void run() {
try {
- addFieldPut(harness, fieldName);
+ // don't have the client side wait for all replicas to see the update or that defeats the purpose
+ // of testing the locking support on the server-side
+ addFieldPut(harness, fieldName, -1);
} catch (Exception e) {
// log.error("###ACTUAL FAILURE!");
throw new RuntimeException(e);
@@ -420,7 +535,7 @@ public class TestCloudManagedSchemaConcu
}
public void run() {
try {
- addFieldPost(harness, fieldName);
+ addFieldPost(harness, fieldName, -1);
} catch (Exception e) {
// log.error("###ACTUAL FAILURE!");
throw new RuntimeException(e);
@@ -435,7 +550,7 @@ public class TestCloudManagedSchemaConcu
}
public void run() {
try {
- addFieldTypePut(harness, fieldName);
+ addFieldTypePut(harness, fieldName, -1);
} catch (Exception e) {
// log.error("###ACTUAL FAILURE!");
throw new RuntimeException(e);
@@ -450,7 +565,7 @@ public class TestCloudManagedSchemaConcu
}
public void run() {
try {
- addFieldTypePost(harness, fieldName);
+ addFieldTypePost(harness, fieldName, -1);
} catch (Exception e) {
// log.error("###ACTUAL FAILURE!");
throw new RuntimeException(e);
@@ -465,7 +580,7 @@ public class TestCloudManagedSchemaConcu
}
public void run() {
try {
- addFieldPut(harness, fieldName);
+ addFieldPut(harness, fieldName, -1);
} catch (Exception e) {
// log.error("###ACTUAL FAILURE!");
throw new RuntimeException(e);
@@ -480,7 +595,7 @@ public class TestCloudManagedSchemaConcu
}
public void run() {
try {
- addFieldPost(harness, fieldName);
+ addFieldPost(harness, fieldName, -1);
} catch (Exception e) {
// log.error("###ACTUAL FAILURE!");
throw new RuntimeException(e);
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java?rev=1629246&r1=1629245&r2=1629246&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java Fri Oct 3 16:06:59 2014
@@ -549,6 +549,14 @@ public abstract class AbstractFullDistri
return jetty;
}
+ protected int getReplicaPort(Replica replica) {
+ String replicaNode = replica.getNodeName();
+ String tmp = replicaNode.substring(replicaNode.indexOf(':')+1);
+ if (tmp.indexOf('_') != -1)
+ tmp = tmp.substring(0,tmp.indexOf('_'));
+ return Integer.parseInt(tmp);
+ }
+
protected JettySolrRunner getJettyOnPort(int port) {
JettySolrRunner theJetty = null;
for (JettySolrRunner jetty : jettys) {