You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/11/27 21:41:07 UTC
svn commit: r1642229 [7/7] - in /lucene/dev/branches/lucene6005: ./
dev-tools/ dev-tools/eclipse/dot.settings/
dev-tools/idea/lucene/benchmark/src/ dev-tools/idea/lucene/highlighter/
dev-tools/maven/ dev-tools/scripts/ lucene/ lucene/analysis/ lucene/a...
Modified: lucene/dev/branches/lucene6005/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/solrj/build.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/solrj/build.xml (original)
+++ lucene/dev/branches/lucene6005/solr/solrj/build.xml Thu Nov 27 20:41:01 2014
@@ -44,8 +44,8 @@
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
<sequential>
- <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only"/>
- <ivy:retrieve conf="test" type="jar,bundle,test" sync="${ivy.sync}" log="download-only"
+ <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"/>
+ <ivy:retrieve conf="test" type="jar,bundle,test" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"
pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
</sequential>
</target>
Modified: lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Thu Nov 27 20:41:01 2014
@@ -140,7 +140,7 @@ public class ConnectionManager implement
closeKeeper(keeper);
throw new RuntimeException(e1);
}
-
+
log.info("Connection with ZooKeeper reestablished.");
try {
client.updateKeeper(keeper);
@@ -154,24 +154,9 @@ public class ConnectionManager implement
throw new RuntimeException(t);
}
- // The new event thread will call connected
- // we just start the reconnect thread and
- // do nothing else
-
if (onReconnect != null) {
- Thread thread = new Thread() {
- @Override
- public void run() {
- try {
- onReconnect.command();
- } catch (Exception e) {
- log.warn("Exception running onReconnect command", e);
- }
- }
- };
- thread.start();
+ onReconnect.command();
}
-
}
});
} catch (Exception e) {
Modified: lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Thu Nov 27 20:41:01 2014
@@ -144,7 +144,7 @@ public class SolrZkClient implements Clo
+ zkServerAddress, this, zkServerAddress, strat, onReconnect, beforeReconnect);
try {
- strat.connect(zkServerAddress, zkClientTimeout, connManager,
+ strat.connect(zkServerAddress, zkClientTimeout, wrapWatcher(connManager),
new ZkUpdate() {
@Override
public void update(SolrZooKeeper zooKeeper) {
Modified: lucene/dev/branches/lucene6005/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java (original)
+++ lucene/dev/branches/lucene6005/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java Thu Nov 27 20:41:01 2014
@@ -327,13 +327,13 @@ public class CloudSolrServerTest extends
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("qt", "/admin/mbeans");
params.set("stats", "true");
- params.set("key", "org.apache.solr.handler.StandardRequestHandler");
+ params.set("key", "standard");
params.set("cat", "QUERYHANDLER");
// use generic request to avoid extra processing of queries
QueryRequest req = new QueryRequest(params);
NamedList<Object> resp = server.request(req);
return (Long) resp.findRecursive("solr-mbeans", "QUERYHANDLER",
- "org.apache.solr.handler.StandardRequestHandler", "stats", "requests");
+ "standard", "stats", "requests");
}
@Override
Modified: lucene/dev/branches/lucene6005/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/lucene6005/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Thu Nov 27 20:41:01 2014
@@ -304,7 +304,13 @@ public abstract class SolrTestCaseJ4 ext
System.setProperty("solr.tests.maxBufferedDocs", String.valueOf(iwc.getMaxBufferedDocs()));
System.setProperty("solr.tests.ramBufferSizeMB", String.valueOf(iwc.getRAMBufferSizeMB()));
- System.setProperty("solr.tests.mergeScheduler", iwc.getMergeScheduler().getClass().getName());
+
+ String mergeSchedulerClass = iwc.getMergeScheduler().getClass().getName();
+ if (mergeSchedulerClass.contains("$")) {
+ // anonymous subclass - we can't instantiate via the resource loader, so use CMS instead
+ mergeSchedulerClass = "org.apache.lucene.index.ConcurrentMergeScheduler";
+ }
+ System.setProperty("solr.tests.mergeScheduler", mergeSchedulerClass);
// don't ask iwc.getMaxThreadStates(), sometimes newIWC uses
// RandomDocumentsWriterPerThreadPool and all hell breaks loose