incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/7] git commit: Merge branch '0.1.5' into 0.1.5-sessions
Date Wed, 22 May 2013 23:46:30 GMT
Merge branch '0.1.5' into 0.1.5-sessions


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/aa49cf4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/aa49cf4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/aa49cf4c

Branch: refs/heads/0.1.5
Commit: aa49cf4c61dc8d2c9fd973a7e0d76f6eae0a22fd
Parents: 557f187 7e31cd2
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sun May 19 17:38:11 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sun May 19 17:38:11 2013 -0400

----------------------------------------------------------------------
 .../blur/manager/writer/TransactionRecorder.java   |  121 ++++++++++-----
 .../manager/writer/TransactionRecorderTest.java    |  106 +++++++------
 .../org/apache/blur/thrift/BlurClusterTest.java    |    4 +
 3 files changed, 139 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aa49cf4c/src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
----------------------------------------------------------------------
diff --cc src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
index 8b00010,5be43f3..e1b6cd0
--- a/src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
+++ b/src/blur-core/src/test/java/org/apache/blur/thrift/BlurClusterTest.java
@@@ -136,14 -137,11 +137,17 @@@ public class BlurClusterTest 
      
      MiniCluster.killShardServer(1);
      
+     //make sure the WAL syncs
+     Thread.sleep(TimeUnit.SECONDS.toMillis(1));
+     
 +    //This should block until shards have failed over
      client.shardServerLayout("test");
      
 +    for (int i = 0; i < 40; i++) {
 +      System.out.println(client.query("test", blurQuery).getTotalResults());
 +      Thread.sleep(1000);
 +    }
 +    
      assertEquals(length, client.query("test", blurQuery).getTotalResults());
      
    }


Mime
View raw message