You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/08/07 17:39:13 UTC
[1/2] git commit: ACCUMULO-3051 give zookeeper updates time to
propagate
Repository: accumulo
Updated Branches:
refs/heads/master 6ef85f9c5 -> a458a2fae
ACCUMULO-3051 give zookeeper updates time to propagate
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a458a2fa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a458a2fa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a458a2fa
Branch: refs/heads/master
Commit: a458a2fae92fbd0239a1ebf243cf65f2ee3ff2f0
Parents: 4b03644
Author: Eric C. Newton <er...@gmail.com>
Authored: Thu Aug 7 11:38:31 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Thu Aug 7 11:38:53 2014 -0400
----------------------------------------------------------------------
.../replication/UnorderedWorkAssignerReplicationIT.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a458a2fa/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
index 7ea7e32..5ad11c3 100644
--- a/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
@@ -147,6 +147,9 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT {
connMaster.tableOperations().setProperty(masterTable, Property.TABLE_REPLICATION.getKey(), "true");
connMaster.tableOperations().setProperty(masterTable, Property.TABLE_REPLICATION_TARGET.getKey() + peerClusterName, peerTableId);
+ // Wait for zookeeper updates (configuration) to propogate
+ UtilWaitThread.sleep(3 * 1000);
+
// Write some data to table1
BatchWriter bw = connMaster.createBatchWriter(masterTable, new BatchWriterConfig());
for (int rows = 0; rows < 5000; rows++) {
@@ -311,6 +314,9 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT {
connMaster.tableOperations().setProperty(masterTable2, Property.TABLE_REPLICATION.getKey(), "true");
connMaster.tableOperations().setProperty(masterTable2, Property.TABLE_REPLICATION_TARGET.getKey() + peerClusterName, peerTableId2);
+ // Wait for zookeeper updates (configuration) to propogate
+ UtilWaitThread.sleep(3 * 1000);
+
// Write some data to table1
BatchWriter bw = connMaster.createBatchWriter(masterTable1, new BatchWriterConfig());
long masterTable1Records = 0l;
@@ -573,6 +579,9 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacIT {
connMaster.tableOperations().setProperty(masterTable2, Property.TABLE_REPLICATION.getKey(), "true");
connMaster.tableOperations().setProperty(masterTable2, Property.TABLE_REPLICATION_TARGET.getKey() + peerClusterName, peerTableId2);
+ // Wait for zookeeper updates (configuration) to propogate
+ UtilWaitThread.sleep(3 * 1000);
+
// Write some data to table1
BatchWriter bw = connMaster.createBatchWriter(masterTable1, new BatchWriterConfig());
for (int rows = 0; rows < 2500; rows++) {
[2/2] git commit: ACCUMULO-3025 check for a null pointer
Posted by ec...@apache.org.
ACCUMULO-3025 check for a null pointer
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b036443
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b036443
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b036443
Branch: refs/heads/master
Commit: 4b03644334461e84fdf7df27ba89b6699a6e7011
Parents: 6ef85f9
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Aug 4 17:49:24 2014 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Thu Aug 7 11:38:53 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/start/classloader/vfs/ContextManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4b036443/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
index f23494a..c7bc120 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
@@ -173,7 +173,7 @@ public class ContextManager {
ClassLoader loader = context.getClassLoader();
if (loader == null) {
- // ooppss, context was closed by another thread, try again
+ // oops, context was closed by another thread, try again
return getClassLoader(contextName);
}