You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2015/03/18 16:54:47 UTC
svn commit: r1667579 - in
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema:
SchemaManager.java ZkIndexSchemaReader.java
Author: sarowe
Date: Wed Mar 18 15:54:47 2015
New Revision: 1667579
URL: http://svn.apache.org/r1667579
Log:
SOLR-6141: fix schema update lock usage
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java?rev=1667579&r1=1667578&r2=1667579&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/SchemaManager.java Wed Mar 18 15:54:47 2015
@@ -421,11 +421,9 @@ public class SchemaManager {
if (in instanceof ZkSolrResourceLoader.ZkByteArrayInputStream) {
int version = ((ZkSolrResourceLoader.ZkByteArrayInputStream) in).getStat().getVersion();
log.info("managed schema loaded . version : {} ", version);
- return new ManagedIndexSchema(req.getCore().getSolrConfig(),
- req.getSchema().getResourceName() ,new InputSource(in),
- true,
- req.getSchema().getResourceName(),
- version,new Object());
+ return new ManagedIndexSchema
+ (req.getCore().getSolrConfig(), req.getSchema().getResourceName(), new InputSource(in),
+ true, req.getSchema().getResourceName(), version, req.getSchema().getSchemaUpdateLock());
} else {
return (ManagedIndexSchema) req.getCore().getLatestSchema();
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java?rev=1667579&r1=1667578&r2=1667579&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java Wed Mar 18 15:54:47 2015
@@ -108,8 +108,8 @@ public class ZkIndexSchemaReader impleme
InputSource inputSource = new InputSource(new ByteArrayInputStream(data));
String resourceName = managedIndexSchemaFactory.getManagedSchemaResourceName();
ManagedIndexSchema newSchema = new ManagedIndexSchema
- (managedIndexSchemaFactory.getConfig(), resourceName, inputSource,
- managedIndexSchemaFactory.isMutable(), resourceName, stat.getVersion(), new Object());
+ (managedIndexSchemaFactory.getConfig(), resourceName, inputSource, managedIndexSchemaFactory.isMutable(),
+ resourceName, stat.getVersion(), oldSchema.getSchemaUpdateLock());
managedIndexSchemaFactory.setSchema(newSchema);
long stop = System.nanoTime();
log.info("Finished refreshing schema in " + TimeUnit.MILLISECONDS.convert(stop - start, TimeUnit.NANOSECONDS) + " ms");