You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/01/30 18:56:43 UTC

svn commit: r1237850 [4/4] - in /lucene/dev/branches/lucene3661: ./ lucene/ lucene/contrib/ lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ lucene/contrib/misc/ lucene/contrib/misc/src/java/ lucene/contrib/misc/src/java/or...

Modified: lucene/dev/branches/lucene3661/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1237850&r1=1237849&r2=1237850&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/lucene3661/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Mon Jan 30 17:56:40 2012
@@ -40,6 +40,7 @@ import org.apache.solr.core.CoreDescript
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
+import org.apache.zookeeper.data.Stat;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -49,6 +50,54 @@ public class OverseerTest extends SolrTe
   private static final boolean DEBUG = false;
 
   
+  private static class MockZKController{
+    
+    private final SolrZkClient zkClient;
+    private final String nodeName;
+    
+    public MockZKController(String zkAddress, String nodeName) throws InterruptedException, TimeoutException, IOException, KeeperException {
+      this.nodeName = nodeName;
+      zkClient = new SolrZkClient(zkAddress, TIMEOUT);
+      Overseer.createClientNodes(zkClient, nodeName);
+      
+      // live node
+      final String nodePath = ZkStateReader.LIVE_NODES_ZKNODE + "/" + "node1";
+      zkClient.makePath(nodePath, CreateMode.EPHEMERAL, true);
+    }
+
+    private void deleteNode(final String path) {
+      try {
+        Stat stat = zkClient.exists(path, null, false);
+        zkClient.delete(path, stat.getVersion(), false);
+      } catch (KeeperException e) {
+        fail("Unexpected KeeperException!" + e);
+      } catch (InterruptedException e) {
+        fail("Unexpected InterruptedException!" + e);
+      }
+    }
+
+    public void close(){
+      try {
+        deleteNode(ZkStateReader.LIVE_NODES_ZKNODE + "/" + "node1");
+        zkClient.close();
+      } catch (InterruptedException e) {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+      }
+    }
+    
+    public void publishState(String coreName, String stateName) throws KeeperException, InterruptedException{
+      HashMap<String,String> coreProps = new HashMap<String,String>();
+      coreProps.put(ZkStateReader.STATE_PROP, stateName);
+      coreProps.put(ZkStateReader.NODE_NAME_PROP, nodeName);
+      coreProps.put(ZkStateReader.CORE_NAME_PROP, coreName);
+      CoreState state = new CoreState(coreName, "collection1", coreProps);
+      final String statePath = Overseer.STATES_NODE + "/" + nodeName;
+      zkClient.setData(statePath, ZkStateReader.toJSON(new CoreState[] {state}), true);
+    }
+    
+  }
+  
   @BeforeClass
   public static void beforeClass() throws Exception {
     initCore();
@@ -438,11 +487,11 @@ public class OverseerTest extends SolrTe
     SolrZkClient controllerClient = null;
     SolrZkClient overseerClient = null;
     ZkStateReader reader = null;
+    MockZKController mockController = null;
     
     try {
       server.run();
       controllerClient = new SolrZkClient(server.getZkAddress(), TIMEOUT);
-      
       AbstractZkTestCase.tryCleanSolrZkNode(server.getZkHost());
       AbstractZkTestCase.makeSolrZkNode(server.getZkHost());
       controllerClient.makePath(ZkStateReader.LIVE_NODES_ZKNODE, true);
@@ -450,45 +499,35 @@ public class OverseerTest extends SolrTe
       reader = new ZkStateReader(controllerClient);
       reader.createClusterStateWatchersAndUpdate();
 
-      Overseer.createClientNodes(controllerClient, "node1");
-      overseerClient = electNewOverseer(server.getZkAddress());
-      
-      // live node
-      final String nodePath = ZkStateReader.LIVE_NODES_ZKNODE + "/" + "node1";
-      controllerClient.makePath(nodePath, CreateMode.EPHEMERAL, true);
+      mockController = new MockZKController(server.getZkAddress(), "node1");
       
-      HashMap<String,String> coreProps = new HashMap<String,String>();
-      coreProps.put(ZkStateReader.STATE_PROP, ZkStateReader.RECOVERING);
-      coreProps.put(ZkStateReader.NODE_NAME_PROP, "node1");
-      CoreState state = new CoreState("core1", "collection1", coreProps);
-      
-      final String statePath = Overseer.STATES_NODE + "/node1";
-      // publish node state (recovering)
-      controllerClient.setData(statePath, ZkStateReader.toJSON(new CoreState[] {state}), true);
+      overseerClient = electNewOverseer(server.getZkAddress());
+
+      mockController.publishState("core1", ZkStateReader.RECOVERING);
       
       // wait overseer assignment
       waitForSliceCount(reader, "collection1", 1);
       
       verifyStatus(reader, ZkStateReader.RECOVERING);
 
-      // publish node state (active)
-      coreProps.put(ZkStateReader.STATE_PROP, ZkStateReader.ACTIVE);
-      coreProps.put(ZkStateReader.SHARD_ID_PROP, "shard1");
-      state = new CoreState("core1", "collection1", coreProps);
-      controllerClient.setData(statePath,
-          ZkStateReader.toJSON(new CoreState[] {state}), true);
+      int version = getCloudStateVersion(controllerClient);
+      
+      mockController.publishState("core1", ZkStateReader.ACTIVE);
+      
+      while(version == getCloudStateVersion(controllerClient));
 
       verifyStatus(reader, ZkStateReader.ACTIVE);
+      version = getCloudStateVersion(controllerClient);
       overseerClient.close();
-      
-      coreProps.put(ZkStateReader.STATE_PROP, ZkStateReader.RECOVERING);
-      state = new CoreState("core1", "collection1", coreProps);
-             
-      controllerClient.setData(statePath,
-          ZkStateReader.toJSON(new CoreState[] {state}), true);
+      Thread.sleep(1000); //wait for overseer to get killed
 
-      overseerClient = electNewOverseer(server.getZkAddress());
+      mockController.publishState("core1", ZkStateReader.RECOVERING);
+      version = getCloudStateVersion(controllerClient);
       
+      overseerClient = electNewOverseer(server.getZkAddress());
+
+      while(version == getCloudStateVersion(controllerClient));
+
       verifyStatus(reader, ZkStateReader.RECOVERING);
       
       assertEquals("Live nodes count does not match", 1, reader.getCloudState()
@@ -497,6 +536,10 @@ public class OverseerTest extends SolrTe
           .getSlice("collection1", "shard1").getShards().size());      
     } finally {
       
+      if (mockController != null) {
+        mockController.close();
+      }
+      
       if (overseerClient != null) {
        overseerClient.close();
       }
@@ -509,6 +552,80 @@ public class OverseerTest extends SolrTe
       server.shutdown();
     }
   }
+  
+  @Test
+  public void testDoubleAssignment() throws Exception {
+    String zkDir = dataDir.getAbsolutePath() + File.separator
+        + "zookeeper/server1/data";
+    
+    System.setProperty(ZkStateReader.NUM_SHARDS_PROP, "2");
+
+    ZkTestServer server = new ZkTestServer(zkDir);
+    
+    SolrZkClient controllerClient = null;
+    SolrZkClient overseerClient = null;
+    ZkStateReader reader = null;
+    MockZKController mockController = null;
+    
+    try {
+      server.run();
+      controllerClient = new SolrZkClient(server.getZkAddress(), TIMEOUT);
+      
+      AbstractZkTestCase.tryCleanSolrZkNode(server.getZkHost());
+      AbstractZkTestCase.makeSolrZkNode(server.getZkHost());
+      controllerClient.makePath(ZkStateReader.LIVE_NODES_ZKNODE, true);
+      
+      reader = new ZkStateReader(controllerClient);
+      reader.createClusterStateWatchersAndUpdate();
+
+      mockController = new MockZKController(server.getZkAddress(), "node1");
+      
+      overseerClient = electNewOverseer(server.getZkAddress());
+
+      mockController.publishState("core1", ZkStateReader.RECOVERING);
+
+      // wait overseer assignment
+      waitForSliceCount(reader, "collection1", 1);
+      
+      verifyStatus(reader, ZkStateReader.RECOVERING);
+
+      mockController.close();
+
+      int version = getCloudStateVersion(controllerClient);
+      
+      mockController = new MockZKController(server.getZkAddress(), "node1");
+      mockController.publishState("core1", ZkStateReader.RECOVERING);
+
+      while (version == getCloudStateVersion(controllerClient));
+      
+      reader.updateCloudState(true);
+      CloudState state = reader.getCloudState();
+      assertEquals("more than 1 shard id was assigned to same core", 1, state.getSlices("collection1").size());
+
+    } finally {
+      System.clearProperty(ZkStateReader.NUM_SHARDS_PROP);
+      if (overseerClient != null) {
+       overseerClient.close();
+      }
+      if (mockController != null) {
+        mockController.close();
+      }
+
+      if (controllerClient != null) {
+        controllerClient.close();
+      }
+      if (reader != null) {
+        reader.close();
+      }
+      server.shutdown();
+    }
+  }
+
+  private int getCloudStateVersion(SolrZkClient controllerClient)
+      throws KeeperException, InterruptedException {
+    return controllerClient.exists(ZkStateReader.CLUSTER_STATE, null, false).getVersion();
+  }
+
 
   private SolrZkClient electNewOverseer(String address) throws InterruptedException,
       TimeoutException, IOException, KeeperException {

Modified: lucene/dev/branches/lucene3661/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java?rev=1237850&r1=1237849&r2=1237850&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java (original)
+++ lucene/dev/branches/lucene3661/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java Mon Jan 30 17:56:40 2012
@@ -92,10 +92,10 @@ public class TestSolrDeletionPolicy1 ext
     addDocs();
     Map<Long, IndexCommit> commits = delPolicy.getCommits();
     IndexCommit latest = delPolicy.getLatestCommit();
-    for (Long version : commits.keySet()) {
-      if (commits.get(version) == latest)
+    for (Long gen : commits.keySet()) {
+      if (commits.get(gen) == latest)
         continue;
-      assertEquals(1, commits.get(version).getSegmentCount());
+      assertEquals(1, commits.get(gen).getSegmentCount());
     }
   }
 
@@ -126,7 +126,7 @@ public class TestSolrDeletionPolicy1 ext
     );
 
     commits = delPolicy.getCommits();
-    assertTrue(!commits.containsKey(ic.getVersion()));
+    assertTrue(!commits.containsKey(ic.getGeneration()));
   }
 
 }

Modified: lucene/dev/branches/lucene3661/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3661/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1237850&r1=1237849&r2=1237850&view=diff
==============================================================================
--- lucene/dev/branches/lucene3661/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/branches/lucene3661/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Mon Jan 30 17:56:40 2012
@@ -132,7 +132,7 @@ public abstract class SolrTestCaseJ4 ext
      // wait a bit in case any ending threads have anything to release
      int retries = 0;
      while (endNumOpens - numOpens != endNumCloses - numCloses) {
-       if (retries++ > 60) {
+       if (retries++ > 120) {
          break;
        }
        try {