lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r901831 - in /lucene/solr/branches/cloud/src/java/org/apache/solr: cloud/ZkController.java handler/component/QueryElevationComponent.java
Date Thu, 21 Jan 2010 19:17:38 GMT
Author: markrmiller
Date: Thu Jan 21 19:17:37 2010
New Revision: 901831

URL: http://svn.apache.org/viewvc?rev=901831&view=rev
Log:
fix zk config file exists check and queryelevations call of it

Modified:
    lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
    lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?rev=901831&r1=901830&r2=901831&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java Thu Jan 21
19:17:37 2010
@@ -210,7 +210,7 @@
    */
   public boolean configFileExists(String collection, String fileName)
       throws KeeperException, InterruptedException {
-    Stat stat = zkClient.exists(CONFIGS_ZKNODE + "/" + fileName, null);
+    Stat stat = zkClient.exists(CONFIGS_ZKNODE + "/" + collection + "/" + fileName, null);
     return stat != null;
   }
 

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=901831&r1=901830&r2=901831&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
Thu Jan 21 19:17:37 2010
@@ -175,7 +175,8 @@
         // check if using ZooKeeper
         ZkController zooKeeperController = core.getCoreDescriptor().getCoreContainer().getZooKeeperController();
         if(zooKeeperController != null) {
-          exists = zooKeeperController.configFileExists(core.getCoreDescriptor().getCloudDescriptor().getCollectionName(),
f);
+          // TODO : shouldn't have to keep reading the config name when it has been read
before
+          exists = zooKeeperController.configFileExists(zooKeeperController.readConfigName(core.getCoreDescriptor().getCloudDescriptor().getCollectionName()),
f);
         } else {
           File fC = new File( core.getResourceLoader().getConfigDir(), f );
           File fD = new File( core.getDataDir(), f );



Mime
View raw message