You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/03/09 16:01:56 UTC

svn commit: r1665254 - in /lucene/dev/trunk/solr/solrj/src: java/org/apache/solr/client/solrj/impl/CloudSolrClient.java test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java

Author: romseygeek
Date: Mon Mar  9 15:01:56 2015
New Revision: 1665254

URL: http://svn.apache.org/r1665254
Log:
SOLR-7125: Call process() before trying to upload/download configs

Modified:
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java?rev=1665254&r1=1665253&r2=1665254&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java Mon Mar  9 15:01:56 2015
@@ -514,6 +514,7 @@ public class CloudSolrClient extends Sol
    * @throws IOException if an IO error occurs
    */
   public void uploadConfig(Path configPath, String configName) throws IOException {
+    connect();
     zkStateReader.getConfigManager().uploadConfigDir(configPath, configName);
   }
 
@@ -524,6 +525,7 @@ public class CloudSolrClient extends Sol
    * @throws IOException  if an I/O exception occurs
    */
   public void downloadConfig(String configName, Path downloadPath) throws IOException {
+    connect();
     zkStateReader.getConfigManager().downloadConfigDir(configName, downloadPath);
   }
 

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java?rev=1665254&r1=1665253&r2=1665254&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java Mon Mar  9 15:01:56 2015
@@ -21,9 +21,11 @@ import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.request.CollectionAdminRequest;
 import org.apache.solr.cloud.MiniSolrCloudCluster;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.common.cloud.ZkConfigManager;
 import org.junit.Test;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
 
 public class TestCloudSolrClientConnections extends SolrTestCaseJ4 {
@@ -61,4 +63,33 @@ public class TestCloudSolrClientConnecti
 
   }
 
+  @Test
+  public void testCloudClientUploads() throws Exception {
+
+    File solrXml = getFile("solrj").toPath().resolve("solr/solr.xml").toFile();
+    Path configPath = getFile("solrj").toPath().resolve("solr/configsets/configset-2/conf");
+
+    MiniSolrCloudCluster cluster = new MiniSolrCloudCluster(0, createTempDir().toFile(), solrXml, buildJettyConfig("/solr"));
+    try {
+      CloudSolrClient client = cluster.getSolrClient();
+      try {
+        client.uploadConfig(configPath, "testconfig");
+        fail("Requests to a non-running cluster should throw a SolrException");
+      } catch (SolrException e) {
+        assertTrue("Unexpected message: " + e.getMessage(), e.getMessage().contains("cluster not found/not ready"));
+      }
+
+      cluster.startJettySolrRunner();
+      client.connect(20, TimeUnit.SECONDS);
+
+      client.uploadConfig(configPath, "testconfig");
+
+      ZkConfigManager configManager = new ZkConfigManager(client.getZkStateReader().getZkClient());
+      assertTrue("List of uploaded configs does not contain 'testconfig'", configManager.listConfigs().contains("testconfig"));
+
+    } finally {
+      cluster.shutdown();
+    }
+  }
+
 }