[1/2] accumulo git commit: ACCUMULO-3754 use Iterators.size to loop over an iterator
Repository: accumulo
Updated Branches:
refs/heads/master ead923a20 - b87fd2362
ACCUMULO-3754 use Iterators.size to loop over an iterator
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ba7fb3e1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ba7fb3e1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ba7fb3e1
Branch: refs/heads/master
Commit: ba7fb3e15e0bf66e51a13bd441c3d8ef387a6a1f
Parents: 1aea14c
Author: Eric C. Newton eric.new...@gmail.com
Authored: Mon Apr 27 16:34:26 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Mon Apr 27 16:34:26 2015 -0400
--
.../core/client/mock/MockConnectorTest.java | 26 +---
.../client/mock/MockTableOperationsTest.java| 8 +++---
.../examples/simple/shard/ContinuousQuery.java | 7 ++
.../impl/MiniAccumuloClusterImplTest.java | 8 +++---
.../accumulo/server/util/TabletIterator.java| 8 +++---
.../apache/accumulo/test/IMMLGBenchmark.java| 11 +++--
.../metadata/MetadataBatchScanTest.java | 9 ++-
.../accumulo/proxy/ProxyDurabilityIT.java | 4 +--
.../org/apache/accumulo/test/CleanWalIT.java| 5 ++--
.../test/ConfigurableMajorCompactionIT.java | 5 ++--
.../test/CreateTableWithNewTableConfigIT.java | 10 +++-
.../accumulo/test/InterruptibleScannersIT.java | 8 +++---
.../test/MasterRepairsDualAssignmentIT.java | 5 ++--
.../apache/accumulo/test/MetaGetsReadersIT.java | 5 ++--
.../accumulo/test/MultiTableRecoveryIT.java | 3 +--
.../test/RecoveryCompactionsAreFlushesIT.java | 5 ++--
.../org/apache/accumulo/test/ShellServerIT.java | 5 ++--
.../apache/accumulo/test/SplitRecoveryIT.java | 5 ++--
.../accumulo/test/VerifySerialRecoveryIT.java | 9 +++
.../apache/accumulo/test/WaitForBalanceIT.java | 6 ++---
.../test/functional/BadIteratorMincIT.java | 12 +++--
.../test/functional/BatchWriterFlushIT.java | 13 +++---
.../test/functional/BigRootTabletIT.java| 4 ++-
.../accumulo/test/functional/CleanTmpIT.java| 3 ++-
.../accumulo/test/functional/CompactionIT.java | 4 ++-
.../accumulo/test/functional/ConcurrencyIT.java | 4 ++-
.../functional/ConfigurableCompactionIT.java| 4 ++-
.../test/functional/DeleteEverythingIT.java | 3 ++-
.../accumulo/test/functional/DeleteRowsIT.java | 4 ++-
.../accumulo/test/functional/DurabilityIT.java | 4 ++-
.../accumulo/test/functional/ExamplesIT.java| 4 ++-
.../test/functional/FunctionalTestUtils.java| 12 +++--
.../test/functional/GarbageCollectorIT.java | 13 --
.../accumulo/test/functional/MetadataIT.java| 4 ++-
.../accumulo/test/functional/ReadWriteIT.java | 5 ++--
.../accumulo/test/functional/RowDeleteIT.java | 8 +++---
.../test/functional/SessionDurabilityIT.java| 4 ++-
.../accumulo/test/functional/TableIT.java | 6 +++--
.../accumulo/test/functional/VisibilityIT.java | 10
.../test/replication/KerberosReplicationIT.java | 5 ++--
.../replication/MultiInstanceReplicationIT.java | 11 -
.../test/replication/ReplicationIT.java | 13 +++---
.../UnorderedWorkAssignerReplicationIT.java | 11 -
43 files changed, 139 insertions(+), 174 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ba7fb3e1/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index 4b90d72..980498e 100644
---
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -51,6 +51,8 @@ import org.apache.hadoop.io.Text;
import org.junit.Assert;
import org.junit.Test;
+import com.google.common.collect.Iterators;
+
public class MockConnectorTest {
Random random = new Random();
@@ -186,11 +188,7 @@ public class MockConnectorTest {
Scanner scanner = c.createScanner(test, Authorizations.EMPTY);
-int count = 0;
-for (@SuppressWarnings(unused)
-EntryKey,Value entry : scanner) {
- count++;
-}
+int count = Iterators.size(scanner.iterator());
assertEquals(0, count);
@@ -263,11 +261,7 @@ public class MockConnectorTest {
private void checkRemaining(Connector c, String tableName, int count) throws
Exception {
Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
-int total = 0;
-for (@SuppressWarnings(unused)
-EntryKey,Value entry : scanner) {
- total++;
-}
+int total =
[1/6] accumulo git commit: ACCUMULO-3750 Exit the Master if NoAuthException
Repository: accumulo
Updated Branches:
refs/heads/1.6 0bcbab7d6 - bc87145ad
refs/heads/1.7 4fa8a8fb2 - 66075c3ea
refs/heads/master 0f0a519f5 - cf0bcb3fb
ACCUMULO-3750 Exit the Master if NoAuthException
If the Master gets a NoAuthException trying to get its
lock, there's a configuration issue. Bail out immediately.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bc87145a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bc87145a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bc87145a
Branch: refs/heads/1.6
Commit: bc87145ad54ac9912ce8bb878e231ef8dd7bad6a
Parents: 0bcbab7
Author: Josh Elser els...@apache.org
Authored: Mon Apr 27 17:52:06 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Apr 27 17:53:24 2015 -0400
--
.../src/main/java/org/apache/accumulo/master/Master.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bc87145a/server/master/src/main/java/org/apache/accumulo/master/Master.java
--
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java
b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 5a96abc..b3d2ac5 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -129,6 +129,7 @@ import org.apache.thrift.TException;
import org.apache.thrift.server.TServer;
import org.apache.thrift.transport.TTransportException;
import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.KeeperException.NoAuthException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.data.Stat;
@@ -1104,6 +1105,12 @@ public class Master implements LiveTServerSet.Listener,
TableObserver, CurrentSt
public synchronized void failedToAcquireLock(Exception e) {
log.warn(Failed to get master lock + e);
+ if (e instanceof NoAuthException) {
+String msg = Failed to acquire master lock due to incorrect ZooKeeper
authentication.;
+log.error(msg + Ensure instance.secret is consistent across Accumulo
configuration, e);
+Halt.halt(msg, -1);
+ }
+
if (acquiredLock) {
Halt.halt(Zoolock in unexpected state FAL + acquiredLock + +
failedToAcquireLock, -1);
}
[6/6] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf0bcb3f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf0bcb3f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf0bcb3f Branch: refs/heads/master Commit: cf0bcb3fbc2446fda1ec13b6e23499efc1a14992 Parents: 0f0a519 66075c3 Author: Josh Elser els...@apache.org Authored: Mon Apr 27 17:58:43 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Mon Apr 27 17:58:43 2015 -0400 -- .../src/main/java/org/apache/accumulo/master/Master.java | 7 +++ 1 file changed, 7 insertions(+) --
[3/6] accumulo git commit: ACCUMULO-3750 Exit the Master if NoAuthException
ACCUMULO-3750 Exit the Master if NoAuthException
If the Master gets a NoAuthException trying to get its
lock, there's a configuration issue. Bail out immediately.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bc87145a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bc87145a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bc87145a
Branch: refs/heads/master
Commit: bc87145ad54ac9912ce8bb878e231ef8dd7bad6a
Parents: 0bcbab7
Author: Josh Elser els...@apache.org
Authored: Mon Apr 27 17:52:06 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Apr 27 17:53:24 2015 -0400
--
.../src/main/java/org/apache/accumulo/master/Master.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bc87145a/server/master/src/main/java/org/apache/accumulo/master/Master.java
--
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java
b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 5a96abc..b3d2ac5 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -129,6 +129,7 @@ import org.apache.thrift.TException;
import org.apache.thrift.server.TServer;
import org.apache.thrift.transport.TTransportException;
import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.KeeperException.NoAuthException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.data.Stat;
@@ -1104,6 +1105,12 @@ public class Master implements LiveTServerSet.Listener,
TableObserver, CurrentSt
public synchronized void failedToAcquireLock(Exception e) {
log.warn(Failed to get master lock + e);
+ if (e instanceof NoAuthException) {
+String msg = Failed to acquire master lock due to incorrect ZooKeeper
authentication.;
+log.error(msg + Ensure instance.secret is consistent across Accumulo
configuration, e);
+Halt.halt(msg, -1);
+ }
+
if (acquiredLock) {
Halt.halt(Zoolock in unexpected state FAL + acquiredLock + +
failedToAcquireLock, -1);
}
accumulo git commit: ACCUMULO-3754 remove very unfortunate syntax from Eclipse refactoring
Repository: accumulo
Updated Branches:
refs/heads/1.7 ba7fb3e15 - f74946d7f
ACCUMULO-3754 remove very unfortunate syntax from Eclipse refactoring
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f74946d7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f74946d7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f74946d7
Branch: refs/heads/1.7
Commit: f74946d7f1c9b1f4235da7a30cc2d4192f8ee0be
Parents: ba7fb3e
Author: Eric C. Newton eric.new...@gmail.com
Authored: Mon Apr 27 17:01:53 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Mon Apr 27 17:01:53 2015 -0400
--
.../test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java | 3 +--
test/src/test/java/org/apache/accumulo/test/CleanWalIT.java| 2 +-
.../apache/accumulo/test/ConfigurableMajorCompactionIT.java| 2 +-
.../apache/accumulo/test/MasterRepairsDualAssignmentIT.java| 2 +-
test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 2 +-
.../test/java/org/apache/accumulo/test/SplitRecoveryIT.java| 2 +-
.../org/apache/accumulo/test/functional/BadIteratorMincIT.java | 2 +-
.../org/apache/accumulo/test/functional/BigRootTabletIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/CleanTmpIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/CompactionIT.java | 2 +-
.../org/apache/accumulo/test/functional/ConcurrencyIT.java | 2 +-
.../accumulo/test/functional/ConfigurableCompactionIT.java | 2 +-
.../apache/accumulo/test/functional/DeleteEverythingIT.java| 2 +-
.../java/org/apache/accumulo/test/functional/DeleteRowsIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/DurabilityIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/ExamplesIT.java | 2 +-
.../apache/accumulo/test/functional/FunctionalTestUtils.java | 2 +-
.../apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +-
.../java/org/apache/accumulo/test/functional/MetadataIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/ReadWriteIT.java | 4 ++--
.../java/org/apache/accumulo/test/functional/RowDeleteIT.java | 6 +++---
.../apache/accumulo/test/functional/SessionDurabilityIT.java | 2 +-
.../test/java/org/apache/accumulo/test/functional/TableIT.java | 4 ++--
23 files changed, 27 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
index 9c524be..53653da 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
@@ -138,8 +138,7 @@ public class ProxyDurabilityIT extends ConfigurableMacIT {
}
private int count(String tableName) throws Exception {
-Connector c = getConnector();
-return Iterators.size(((Iterable?) c.createScanner(tableName,
Authorizations.EMPTY)).iterator());
+return Iterators.size((getConnector().createScanner(tableName,
Authorizations.EMPTY)).iterator());
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
b/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
index 57fad5d..3f9e1cc 100644
--- a/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
@@ -140,7 +140,7 @@ public class CleanWalIT extends AccumuloClusterIT {
int count(String tableName, Connector conn) throws Exception {
Scanner s = conn.createScanner(tableName, Authorizations.EMPTY);
-return Iterators.size(((Iterable?) s).iterator());
+return Iterators.size(s.iterator());
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
b/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
index e2ec222..2a13aed 100644
---
a/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
+++
b/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
@@ -104,7 +104,7 @@ public class ConfigurableMajorCompactionIT extends
ConfigurableMacIT {
Scanner s =
[1/2] accumulo git commit: ACCUMULO-3754 remove very unfortunate syntax from Eclipse refactoring
Repository: accumulo
Updated Branches:
refs/heads/master b87fd2362 - 45e316f56
ACCUMULO-3754 remove very unfortunate syntax from Eclipse refactoring
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f74946d7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f74946d7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f74946d7
Branch: refs/heads/master
Commit: f74946d7f1c9b1f4235da7a30cc2d4192f8ee0be
Parents: ba7fb3e
Author: Eric C. Newton eric.new...@gmail.com
Authored: Mon Apr 27 17:01:53 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Mon Apr 27 17:01:53 2015 -0400
--
.../test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java | 3 +--
test/src/test/java/org/apache/accumulo/test/CleanWalIT.java| 2 +-
.../apache/accumulo/test/ConfigurableMajorCompactionIT.java| 2 +-
.../apache/accumulo/test/MasterRepairsDualAssignmentIT.java| 2 +-
test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 2 +-
.../test/java/org/apache/accumulo/test/SplitRecoveryIT.java| 2 +-
.../org/apache/accumulo/test/functional/BadIteratorMincIT.java | 2 +-
.../org/apache/accumulo/test/functional/BigRootTabletIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/CleanTmpIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/CompactionIT.java | 2 +-
.../org/apache/accumulo/test/functional/ConcurrencyIT.java | 2 +-
.../accumulo/test/functional/ConfigurableCompactionIT.java | 2 +-
.../apache/accumulo/test/functional/DeleteEverythingIT.java| 2 +-
.../java/org/apache/accumulo/test/functional/DeleteRowsIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/DurabilityIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/ExamplesIT.java | 2 +-
.../apache/accumulo/test/functional/FunctionalTestUtils.java | 2 +-
.../apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +-
.../java/org/apache/accumulo/test/functional/MetadataIT.java | 2 +-
.../java/org/apache/accumulo/test/functional/ReadWriteIT.java | 4 ++--
.../java/org/apache/accumulo/test/functional/RowDeleteIT.java | 6 +++---
.../apache/accumulo/test/functional/SessionDurabilityIT.java | 2 +-
.../test/java/org/apache/accumulo/test/functional/TableIT.java | 4 ++--
23 files changed, 27 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
index 9c524be..53653da 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
@@ -138,8 +138,7 @@ public class ProxyDurabilityIT extends ConfigurableMacIT {
}
private int count(String tableName) throws Exception {
-Connector c = getConnector();
-return Iterators.size(((Iterable?) c.createScanner(tableName,
Authorizations.EMPTY)).iterator());
+return Iterators.size((getConnector().createScanner(tableName,
Authorizations.EMPTY)).iterator());
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
b/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
index 57fad5d..3f9e1cc 100644
--- a/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/CleanWalIT.java
@@ -140,7 +140,7 @@ public class CleanWalIT extends AccumuloClusterIT {
int count(String tableName, Connector conn) throws Exception {
Scanner s = conn.createScanner(tableName, Authorizations.EMPTY);
-return Iterators.size(((Iterable?) s).iterator());
+return Iterators.size(s.iterator());
}
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f74946d7/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
b/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
index e2ec222..2a13aed 100644
---
a/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
+++
b/test/src/test/java/org/apache/accumulo/test/ConfigurableMajorCompactionIT.java
@@ -104,7 +104,7 @@ public class ConfigurableMajorCompactionIT extends
ConfigurableMacIT {
Scanner s =
[2/2] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/45e316f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45e316f5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/45e316f5 Branch: refs/heads/master Commit: 45e316f564ca01d8f7398985957cbf219bc7efb8 Parents: b87fd23 f74946d Author: Eric C. Newton eric.new...@gmail.com Authored: Mon Apr 27 17:02:07 2015 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Mon Apr 27 17:02:07 2015 -0400 -- .../test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java | 3 +-- test/src/test/java/org/apache/accumulo/test/CleanWalIT.java| 2 +- .../apache/accumulo/test/ConfigurableMajorCompactionIT.java| 2 +- .../apache/accumulo/test/MasterRepairsDualAssignmentIT.java| 2 +- test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 2 +- .../test/java/org/apache/accumulo/test/SplitRecoveryIT.java| 2 +- .../org/apache/accumulo/test/functional/BadIteratorMincIT.java | 2 +- .../org/apache/accumulo/test/functional/BigRootTabletIT.java | 2 +- .../java/org/apache/accumulo/test/functional/CleanTmpIT.java | 2 +- .../java/org/apache/accumulo/test/functional/CompactionIT.java | 2 +- .../org/apache/accumulo/test/functional/ConcurrencyIT.java | 2 +- .../accumulo/test/functional/ConfigurableCompactionIT.java | 2 +- .../apache/accumulo/test/functional/DeleteEverythingIT.java| 2 +- .../java/org/apache/accumulo/test/functional/DeleteRowsIT.java | 2 +- .../java/org/apache/accumulo/test/functional/DurabilityIT.java | 2 +- .../java/org/apache/accumulo/test/functional/ExamplesIT.java | 2 +- .../apache/accumulo/test/functional/FunctionalTestUtils.java | 2 +- .../apache/accumulo/test/functional/GarbageCollectorIT.java| 2 +- .../java/org/apache/accumulo/test/functional/MetadataIT.java | 2 +- .../java/org/apache/accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../java/org/apache/accumulo/test/functional/RowDeleteIT.java | 6 +++--- .../apache/accumulo/test/functional/SessionDurabilityIT.java | 2 +- .../test/java/org/apache/accumulo/test/functional/TableIT.java | 4 ++-- 23 files changed, 27 insertions(+), 28 deletions(-) --
[5/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/66075c3e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/66075c3e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/66075c3e Branch: refs/heads/1.7 Commit: 66075c3eaf67cfe5cc8cd5e1c16ec595b98ae3c5 Parents: 4fa8a8f bc87145 Author: Josh Elser els...@apache.org Authored: Mon Apr 27 17:58:34 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Mon Apr 27 17:58:34 2015 -0400 -- .../src/main/java/org/apache/accumulo/master/Master.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66075c3e/server/master/src/main/java/org/apache/accumulo/master/Master.java --
[2/6] accumulo git commit: ACCUMULO-3750 Exit the Master if NoAuthException
ACCUMULO-3750 Exit the Master if NoAuthException
If the Master gets a NoAuthException trying to get its
lock, there's a configuration issue. Bail out immediately.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bc87145a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bc87145a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bc87145a
Branch: refs/heads/1.7
Commit: bc87145ad54ac9912ce8bb878e231ef8dd7bad6a
Parents: 0bcbab7
Author: Josh Elser els...@apache.org
Authored: Mon Apr 27 17:52:06 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Apr 27 17:53:24 2015 -0400
--
.../src/main/java/org/apache/accumulo/master/Master.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bc87145a/server/master/src/main/java/org/apache/accumulo/master/Master.java
--
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java
b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 5a96abc..b3d2ac5 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -129,6 +129,7 @@ import org.apache.thrift.TException;
import org.apache.thrift.server.TServer;
import org.apache.thrift.transport.TTransportException;
import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.KeeperException.NoAuthException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.data.Stat;
@@ -1104,6 +1105,12 @@ public class Master implements LiveTServerSet.Listener,
TableObserver, CurrentSt
public synchronized void failedToAcquireLock(Exception e) {
log.warn(Failed to get master lock + e);
+ if (e instanceof NoAuthException) {
+String msg = Failed to acquire master lock due to incorrect ZooKeeper
authentication.;
+log.error(msg + Ensure instance.secret is consistent across Accumulo
configuration, e);
+Halt.halt(msg, -1);
+ }
+
if (acquiredLock) {
Halt.halt(Zoolock in unexpected state FAL + acquiredLock + +
failedToAcquireLock, -1);
}
[4/6] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/66075c3e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/66075c3e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/66075c3e Branch: refs/heads/master Commit: 66075c3eaf67cfe5cc8cd5e1c16ec595b98ae3c5 Parents: 4fa8a8f bc87145 Author: Josh Elser els...@apache.org Authored: Mon Apr 27 17:58:34 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Mon Apr 27 17:58:34 2015 -0400 -- .../src/main/java/org/apache/accumulo/master/Master.java | 7 +++ 1 file changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66075c3e/server/master/src/main/java/org/apache/accumulo/master/Master.java --
[2/2] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b87fd236 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b87fd236 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b87fd236 Branch: refs/heads/master Commit: b87fd236257d5feacb0fe7d4bfaa923cca9a482b Parents: ead923a ba7fb3e Author: Eric C. Newton eric.new...@gmail.com Authored: Mon Apr 27 16:34:35 2015 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Mon Apr 27 16:34:35 2015 -0400 -- .../core/client/mock/MockConnectorTest.java | 26 +--- .../client/mock/MockTableOperationsTest.java| 8 +++--- .../examples/simple/shard/ContinuousQuery.java | 7 ++ .../impl/MiniAccumuloClusterImplTest.java | 8 +++--- .../accumulo/server/util/TabletIterator.java| 8 +++--- .../apache/accumulo/test/IMMLGBenchmark.java| 11 +++-- .../metadata/MetadataBatchScanTest.java | 9 ++- .../accumulo/proxy/ProxyDurabilityIT.java | 4 +-- .../org/apache/accumulo/test/CleanWalIT.java| 5 ++-- .../test/ConfigurableMajorCompactionIT.java | 5 ++-- .../test/CreateTableWithNewTableConfigIT.java | 10 +++- .../accumulo/test/InterruptibleScannersIT.java | 8 +++--- .../test/MasterRepairsDualAssignmentIT.java | 5 ++-- .../apache/accumulo/test/MetaGetsReadersIT.java | 5 ++-- .../accumulo/test/MultiTableRecoveryIT.java | 3 +-- .../test/RecoveryCompactionsAreFlushesIT.java | 5 ++-- .../org/apache/accumulo/test/ShellServerIT.java | 5 ++-- .../apache/accumulo/test/SplitRecoveryIT.java | 5 ++-- .../accumulo/test/VerifySerialRecoveryIT.java | 9 +++ .../apache/accumulo/test/WaitForBalanceIT.java | 6 ++--- .../test/functional/BadIteratorMincIT.java | 12 +++-- .../test/functional/BatchWriterFlushIT.java | 13 +++--- .../test/functional/BigRootTabletIT.java| 4 ++- .../accumulo/test/functional/CleanTmpIT.java| 3 ++- .../accumulo/test/functional/CompactionIT.java | 4 ++- .../accumulo/test/functional/ConcurrencyIT.java | 4 ++- .../functional/ConfigurableCompactionIT.java| 4 ++- .../test/functional/DeleteEverythingIT.java | 3 ++- .../accumulo/test/functional/DeleteRowsIT.java | 4 ++- .../accumulo/test/functional/DurabilityIT.java | 4 ++- .../accumulo/test/functional/ExamplesIT.java| 4 ++- .../test/functional/FunctionalTestUtils.java| 12 +++-- .../test/functional/GarbageCollectorIT.java | 13 -- .../accumulo/test/functional/MetadataIT.java| 4 ++- .../accumulo/test/functional/ReadWriteIT.java | 5 ++-- .../accumulo/test/functional/RowDeleteIT.java | 8 +++--- .../test/functional/SessionDurabilityIT.java| 4 ++- .../accumulo/test/functional/TableIT.java | 6 +++-- .../accumulo/test/functional/VisibilityIT.java | 10 .../test/replication/KerberosReplicationIT.java | 5 ++-- .../replication/MultiInstanceReplicationIT.java | 11 - .../test/replication/ReplicationIT.java | 13 +++--- .../UnorderedWorkAssignerReplicationIT.java | 11 - 43 files changed, 139 insertions(+), 174 deletions(-) --
accumulo git commit: ACCUMULO-3754 fixed missing import
Repository: accumulo
Updated Branches:
refs/heads/1.7 f74946d7f - 4fa8a8fb2
ACCUMULO-3754 fixed missing import
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4fa8a8fb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fa8a8fb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4fa8a8fb
Branch: refs/heads/1.7
Commit: 4fa8a8fb2293f0327f0744ce494bdda381131d72
Parents: f74946d
Author: Eric C. Newton eric.new...@gmail.com
Authored: Mon Apr 27 17:14:36 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Mon Apr 27 17:14:36 2015 -0400
--
.../test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4fa8a8fb/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
index d7c0bab..7d1c53e 100644
--- a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
@@ -40,6 +40,8 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.RawLocalFileSystem;
import org.junit.Test;
+import com.google.common.collect.Iterators;
+
public class MultiTableRecoveryIT extends ConfigurableMacIT {
@Override
[2/2] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f0a519f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f0a519f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f0a519f Branch: refs/heads/master Commit: 0f0a519f531806cc8817587f54c781c210f3 Parents: 45e316f 4fa8a8f Author: Eric C. Newton eric.new...@gmail.com Authored: Mon Apr 27 17:14:44 2015 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Mon Apr 27 17:14:44 2015 -0400 -- .../test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java | 2 ++ 1 file changed, 2 insertions(+) --
[1/2] accumulo git commit: ACCUMULO-3754 fixed missing import
Repository: accumulo
Updated Branches:
refs/heads/master 45e316f56 - 0f0a519f5
ACCUMULO-3754 fixed missing import
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4fa8a8fb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fa8a8fb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4fa8a8fb
Branch: refs/heads/master
Commit: 4fa8a8fb2293f0327f0744ce494bdda381131d72
Parents: f74946d
Author: Eric C. Newton eric.new...@gmail.com
Authored: Mon Apr 27 17:14:36 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Mon Apr 27 17:14:36 2015 -0400
--
.../test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4fa8a8fb/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
index d7c0bab..7d1c53e 100644
--- a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java
@@ -40,6 +40,8 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.RawLocalFileSystem;
import org.junit.Test;
+import com.google.common.collect.Iterators;
+
public class MultiTableRecoveryIT extends ConfigurableMacIT {
@Override
[2/3] accumulo git commit: ACCUMULO-3646 Update iterator doc on entries past seek()
ACCUMULO-3646 Update iterator doc on entries past seek()
Add warning to SKVI javadoc and to iterator chapter in Accumulo manual.
Fix inconsistency with Javadoc in iterator chapter.
Add warning on aliasing of getTopKey()/getTopValue() to chapter.
Closes #33
Signed-off-by: Josh Elser els...@apache.org
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/481b1192
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/481b1192
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/481b1192
Branch: refs/heads/master
Commit: 481b11922ff8aec26168a5afebcca5fe72c5ec4b
Parents: 66075c3
Author: Dylan Hutchison dhutc...@mit.edu
Authored: Sat Apr 25 20:02:04 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Apr 27 23:03:55 2015 -0400
--
.../core/iterators/SortedKeyValueIterator.java | 8 ++
.../main/asciidoc/chapters/iterator_design.txt | 27 +++-
2 files changed, 29 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/481b1192/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
index 232dc2a..f6d3170 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
@@ -106,6 +106,10 @@ public interface SortedKeyValueIteratorK extends
WritableComparable?,V extend
* Returns top key. Can be called 0 or more times without affecting behavior
of next() or hasTop(). Note that in minor compaction scope and in non-full major
* compaction scopes the iterator may see deletion entries. These entries
should be preserved by all iterators except ones that are strictly scan-time
* iterators that will never be configured for the minc or majc scopes.
Deletion entries are only removed during full major compactions.
+ * p
+ * For performance reasons, iterators reserve the right to reuse objects
returned by ttgetTopKey/tt when {@link #next()} is called, changing the data
+ * that the object references. Iterators that need to save an object
returned by ttgetTopKey/tt ought to copy the object's data into a new object
+ * in order to avoid aliasing bugs.
*
* @return ttK/tt
* @exception IllegalStateException
@@ -117,6 +121,10 @@ public interface SortedKeyValueIteratorK extends
WritableComparable?,V extend
/**
* Returns top value. Can be called 0 or more times without affecting
behavior of next() or hasTop().
+ * p
+ * For performance reasons, iterators reserve the right to reuse objects
returned by ttgetTopValue/tt when {@link #next()} is called, changing the
+ * underlying data that the object references. Iterators that need to save
an object returned by ttgetTopValue/tt ought to copy the object's data
+ * into a new object in order to avoid aliasing bugs.
*
* @return ttV/tt
* @exception IllegalStateException
http://git-wip-us.apache.org/repos/asf/accumulo/blob/481b1192/docs/src/main/asciidoc/chapters/iterator_design.txt
--
diff --git a/docs/src/main/asciidoc/chapters/iterator_design.txt
b/docs/src/main/asciidoc/chapters/iterator_design.txt
index b4c1c69..02c9973 100644
--- a/docs/src/main/asciidoc/chapters/iterator_design.txt
+++ b/docs/src/main/asciidoc/chapters/iterator_design.txt
@@ -119,8 +119,9 @@ Range. For example, a regular expression Iterator would
consume all records whic
pattern before returning from `seek`.
It is important to retain the original Range passed to this method to know
when this Iterator should stop
-reading more Key-Value pairs. Ignoring this will typically not result in
errors; however, it will result
-in wasted time from unnecessary computation.
+reading more Key-Value pairs. Ignoring this typically does not affect scans
from a Scanner, but it
+will result in duplicate keys emitting from a BatchScan if the scanned table
has more than one tablet.
+Best practice is to never emit entries outside the seek range.
`next`
@@ -145,8 +146,21 @@ alter the internal state of the Iterator.
These methods simply return the current Key-Value pair for this iterator. If
`hasTop` returns true,
both of these methods should return non-null objects. If `hasTop` returns
false, it is undefined
-what these methods should return. Multiple calls to these methods should not
alter the state
-of the Iterator like `hasTop`.
+what these methods should return. Like `hasTop`, multiple calls to
[3/3] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e9ad5345 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e9ad5345 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e9ad5345 Branch: refs/heads/master Commit: e9ad5345f7e009e055fd74b3c33ec5225c55291a Parents: cf0bcb3 481b119 Author: Josh Elser els...@apache.org Authored: Mon Apr 27 23:11:23 2015 -0400 Committer: Josh Elser els...@apache.org Committed: Mon Apr 27 23:11:23 2015 -0400 -- .../core/iterators/SortedKeyValueIterator.java | 8 ++ .../main/asciidoc/chapters/iterator_design.txt | 27 +++- 2 files changed, 29 insertions(+), 6 deletions(-) --
[1/3] accumulo git commit: ACCUMULO-3646 Update iterator doc on entries past seek()
Repository: accumulo
Updated Branches:
refs/heads/1.7 66075c3ea - 481b11922
refs/heads/master cf0bcb3fb - e9ad5345f
ACCUMULO-3646 Update iterator doc on entries past seek()
Add warning to SKVI javadoc and to iterator chapter in Accumulo manual.
Fix inconsistency with Javadoc in iterator chapter.
Add warning on aliasing of getTopKey()/getTopValue() to chapter.
Closes #33
Signed-off-by: Josh Elser els...@apache.org
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/481b1192
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/481b1192
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/481b1192
Branch: refs/heads/1.7
Commit: 481b11922ff8aec26168a5afebcca5fe72c5ec4b
Parents: 66075c3
Author: Dylan Hutchison dhutc...@mit.edu
Authored: Sat Apr 25 20:02:04 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Mon Apr 27 23:03:55 2015 -0400
--
.../core/iterators/SortedKeyValueIterator.java | 8 ++
.../main/asciidoc/chapters/iterator_design.txt | 27 +++-
2 files changed, 29 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/481b1192/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
index 232dc2a..f6d3170 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
@@ -106,6 +106,10 @@ public interface SortedKeyValueIteratorK extends
WritableComparable?,V extend
* Returns top key. Can be called 0 or more times without affecting behavior
of next() or hasTop(). Note that in minor compaction scope and in non-full major
* compaction scopes the iterator may see deletion entries. These entries
should be preserved by all iterators except ones that are strictly scan-time
* iterators that will never be configured for the minc or majc scopes.
Deletion entries are only removed during full major compactions.
+ * p
+ * For performance reasons, iterators reserve the right to reuse objects
returned by ttgetTopKey/tt when {@link #next()} is called, changing the data
+ * that the object references. Iterators that need to save an object
returned by ttgetTopKey/tt ought to copy the object's data into a new object
+ * in order to avoid aliasing bugs.
*
* @return ttK/tt
* @exception IllegalStateException
@@ -117,6 +121,10 @@ public interface SortedKeyValueIteratorK extends
WritableComparable?,V extend
/**
* Returns top value. Can be called 0 or more times without affecting
behavior of next() or hasTop().
+ * p
+ * For performance reasons, iterators reserve the right to reuse objects
returned by ttgetTopValue/tt when {@link #next()} is called, changing the
+ * underlying data that the object references. Iterators that need to save
an object returned by ttgetTopValue/tt ought to copy the object's data
+ * into a new object in order to avoid aliasing bugs.
*
* @return ttV/tt
* @exception IllegalStateException
http://git-wip-us.apache.org/repos/asf/accumulo/blob/481b1192/docs/src/main/asciidoc/chapters/iterator_design.txt
--
diff --git a/docs/src/main/asciidoc/chapters/iterator_design.txt
b/docs/src/main/asciidoc/chapters/iterator_design.txt
index b4c1c69..02c9973 100644
--- a/docs/src/main/asciidoc/chapters/iterator_design.txt
+++ b/docs/src/main/asciidoc/chapters/iterator_design.txt
@@ -119,8 +119,9 @@ Range. For example, a regular expression Iterator would
consume all records whic
pattern before returning from `seek`.
It is important to retain the original Range passed to this method to know
when this Iterator should stop
-reading more Key-Value pairs. Ignoring this will typically not result in
errors; however, it will result
-in wasted time from unnecessary computation.
+reading more Key-Value pairs. Ignoring this typically does not affect scans
from a Scanner, but it
+will result in duplicate keys emitting from a BatchScan if the scanned table
has more than one tablet.
+Best practice is to never emit entries outside the seek range.
`next`
@@ -145,8 +146,21 @@ alter the internal state of the Iterator.
These methods simply return the current Key-Value pair for this iterator. If
`hasTop` returns true,
both of these methods should return non-null objects. If `hasTop` returns
false, it is undefined
-what these methods should return. Multiple calls to these methods should not
[3/4] accumulo git commit: Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1aea14c7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1aea14c7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1aea14c7 Branch: refs/heads/master Commit: 1aea14c72e7bd820ce554b413d06f30c5ea5f71d Parents: 951257a 18650ac Author: Eric C. Newton eric.new...@gmail.com Authored: Mon Apr 27 13:46:33 2015 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Mon Apr 27 13:46:33 2015 -0400 -- .../core/client/ClientConfiguration.java| 20 +- .../core/client/MutationsRejectedException.java | 14 +- .../client/impl/ReplicationOperationsImpl.java | 4 +- .../org/apache/accumulo/core/conf/Property.java | 4 +- .../system/SourceSwitchingIterator.java | 59 +- .../accumulo/core/metadata/RootTable.java | 1 + .../core/metadata/schema/MetadataSchema.java| 48 ++ .../core/tabletserver/log/LogEntry.java | 78 ++- .../core/client/ClientConfigurationTest.java| 21 +- .../core/metadata/MetadataTableSchemaTest.java | 47 ++ .../src/test/resources/multi-valued.client.conf | 2 +- .../standalone/StandaloneClusterControl.java| 5 +- .../minicluster/MiniAccumuloInstance.java | 2 +- .../org/apache/accumulo/server/TabletLevel.java | 34 ++ .../apache/accumulo/server/fs/VolumeUtil.java | 22 +- .../apache/accumulo/server/init/Initialize.java | 1 + .../server/master/state/MetaDataStateStore.java | 47 +- .../master/state/MetaDataTableScanner.java | 6 +- .../master/state/TabletLocationState.java | 7 + .../server/master/state/TabletStateStore.java | 16 +- .../master/state/ZooTabletStateStore.java | 35 +- .../accumulo/server/replication/StatusUtil.java | 13 + .../accumulo/server/util/ListVolumesUsed.java | 18 +- .../server/util/MasterMetadataUtil.java | 18 +- .../accumulo/server/util/MetadataTableUtil.java | 239 +--- .../server/util/ReplicationTableUtil.java | 13 +- .../server/util/ReplicationTableUtilTest.java | 2 +- .../gc/GarbageCollectWriteAheadLogs.java| 499 +++- .../accumulo/gc/SimpleGarbageCollector.java | 1 - .../CloseWriteAheadLogReferences.java | 23 +- .../gc/GarbageCollectWriteAheadLogsTest.java| 567 --- .../CloseWriteAheadLogReferencesTest.java | 152 + .../java/org/apache/accumulo/master/Master.java | 3 + .../master/MasterClientServiceHandler.java | 3 +- .../accumulo/master/TabletGroupWatcher.java | 37 +- .../accumulo/master/replication/WorkMaker.java | 1 + .../accumulo/master/state/MergeStats.java | 3 +- .../master/ReplicationOperationsImplTest.java | 9 +- .../apache/accumulo/master/TestMergeState.java | 2 +- .../master/state/RootTabletStateStoreTest.java | 4 +- .../src/main/findbugs/exclude-filter.xml| 2 +- .../server/GarbageCollectionLogger.java | 3 +- .../apache/accumulo/tserver/TabletServer.java | 182 +++--- .../compaction/MajorCompactionRequest.java | 15 +- .../apache/accumulo/tserver/log/DfsLogger.java | 14 +- .../accumulo/tserver/log/SortedLogRecovery.java | 8 +- .../tserver/log/TabletServerLogger.java | 187 +++--- .../accumulo/tserver/tablet/CommitSession.java | 3 +- .../tserver/tablet/DatafileManager.java | 4 +- .../apache/accumulo/tserver/tablet/Tablet.java | 59 +- .../tserver/tablet/TabletCommitter.java | 3 +- .../accumulo/tserver/log/LogEntryTest.java | 56 ++ .../test/performance/thrift/NullTserver.java| 6 +- .../accumulo/proxy/ProxyDurabilityIT.java | 9 +- .../apache/accumulo/proxy/SimpleProxyBase.java | 30 +- .../test/BadDeleteMarkersCreatedIT.java | 2 +- .../org/apache/accumulo/test/BalanceIT.java | 20 +- .../org/apache/accumulo/test/CleanWalIT.java| 1 + .../accumulo/test/ConditionalWriterIT.java | 1 + .../accumulo/test/GarbageCollectWALIT.java | 81 +++ .../MissingWalHeaderCompletesRecoveryIT.java| 14 +- .../accumulo/test/NoMutationRecoveryIT.java | 178 -- .../org/apache/accumulo/test/ShellServerIT.java | 2 +- .../org/apache/accumulo/test/UnusedWALIT.java | 144 + .../java/org/apache/accumulo/test/VolumeIT.java | 17 + .../accumulo/test/functional/ReadWriteIT.java | 8 + .../accumulo/test/functional/WALSunnyDayIT.java | 250 .../test/functional/WatchTheWatchCountIT.java | 2 +- .../test/performance/RollWALPerformanceIT.java | 126 + ...bageCollectorCommunicatesWithTServersIT.java | 35 +- .../replication/MultiInstanceReplicationIT.java | 2 +- .../test/replication/ReplicationIT.java | 370 test/src/test/resources/TestCompactionStrat.jar | Bin
[1/2] accumulo git commit: ACCUMULO-3753 use Iterator.size to run over the metadata table
Repository: accumulo
Updated Branches:
refs/heads/1.7 18650ac66 - 1aea14c72
ACCUMULO-3753 use Iterator.size to run over the metadata table
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/951257ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/951257ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/951257ac
Branch: refs/heads/1.7
Commit: 951257ac39290d50df06c134da76baecd7a0ebc9
Parents: ac08cc4
Author: Eric C. Newton eric.new...@gmail.com
Authored: Mon Apr 27 13:46:06 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Mon Apr 27 13:46:06 2015 -0400
--
test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/951257ac/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
--
diff --git a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
index d124ce9..9a84512 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
@@ -125,7 +125,7 @@ public abstract class SimpleProxyBase extends
SharedMiniClusterIT {
private ByteBuffer creds = null;
private void waitForAccumulo(Connector c) throws Exception {
-Iterators.cycle(c.createScanner(MetadataTable.NAME, Authorizations.EMPTY));
+Iterators.size(c.createScanner(MetadataTable.NAME,
Authorizations.EMPTY).iterator());
}
@Before
[4/4] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ead923a2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ead923a2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ead923a2 Branch: refs/heads/master Commit: ead923a20e9a996fb7c43fa91ee331751010c70a Parents: f442676 1aea14c Author: Eric C. Newton eric.new...@gmail.com Authored: Mon Apr 27 13:46:41 2015 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Mon Apr 27 13:46:41 2015 -0400 -- --
[1/4] accumulo git commit: ACCUMULO-3753 use Iterator.size to run over the metadata table
Repository: accumulo
Updated Branches:
refs/heads/master 488f441f7 - ead923a20
ACCUMULO-3753 use Iterator.size to run over the metadata table
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/951257ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/951257ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/951257ac
Branch: refs/heads/master
Commit: 951257ac39290d50df06c134da76baecd7a0ebc9
Parents: ac08cc4
Author: Eric C. Newton eric.new...@gmail.com
Authored: Mon Apr 27 13:46:06 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Mon Apr 27 13:46:06 2015 -0400
--
test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/951257ac/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
--
diff --git a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
index d124ce9..9a84512 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
@@ -125,7 +125,7 @@ public abstract class SimpleProxyBase extends
SharedMiniClusterIT {
private ByteBuffer creds = null;
private void waitForAccumulo(Connector c) throws Exception {
-Iterators.cycle(c.createScanner(MetadataTable.NAME, Authorizations.EMPTY));
+Iterators.size(c.createScanner(MetadataTable.NAME,
Authorizations.EMPTY).iterator());
}
@Before
[2/2] accumulo git commit: Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1aea14c7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1aea14c7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1aea14c7 Branch: refs/heads/1.7 Commit: 1aea14c72e7bd820ce554b413d06f30c5ea5f71d Parents: 951257a 18650ac Author: Eric C. Newton eric.new...@gmail.com Authored: Mon Apr 27 13:46:33 2015 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Mon Apr 27 13:46:33 2015 -0400 -- .../core/client/ClientConfiguration.java| 20 +- .../core/client/MutationsRejectedException.java | 14 +- .../client/impl/ReplicationOperationsImpl.java | 4 +- .../org/apache/accumulo/core/conf/Property.java | 4 +- .../system/SourceSwitchingIterator.java | 59 +- .../accumulo/core/metadata/RootTable.java | 1 + .../core/metadata/schema/MetadataSchema.java| 48 ++ .../core/tabletserver/log/LogEntry.java | 78 ++- .../core/client/ClientConfigurationTest.java| 21 +- .../core/metadata/MetadataTableSchemaTest.java | 47 ++ .../src/test/resources/multi-valued.client.conf | 2 +- .../standalone/StandaloneClusterControl.java| 5 +- .../minicluster/MiniAccumuloInstance.java | 2 +- .../org/apache/accumulo/server/TabletLevel.java | 34 ++ .../apache/accumulo/server/fs/VolumeUtil.java | 22 +- .../apache/accumulo/server/init/Initialize.java | 1 + .../server/master/state/MetaDataStateStore.java | 47 +- .../master/state/MetaDataTableScanner.java | 6 +- .../master/state/TabletLocationState.java | 7 + .../server/master/state/TabletStateStore.java | 16 +- .../master/state/ZooTabletStateStore.java | 35 +- .../accumulo/server/replication/StatusUtil.java | 13 + .../accumulo/server/util/ListVolumesUsed.java | 18 +- .../server/util/MasterMetadataUtil.java | 18 +- .../accumulo/server/util/MetadataTableUtil.java | 239 +--- .../server/util/ReplicationTableUtil.java | 13 +- .../server/util/ReplicationTableUtilTest.java | 2 +- .../gc/GarbageCollectWriteAheadLogs.java| 499 +++- .../accumulo/gc/SimpleGarbageCollector.java | 1 - .../CloseWriteAheadLogReferences.java | 23 +- .../gc/GarbageCollectWriteAheadLogsTest.java| 567 --- .../CloseWriteAheadLogReferencesTest.java | 152 + .../java/org/apache/accumulo/master/Master.java | 3 + .../master/MasterClientServiceHandler.java | 3 +- .../accumulo/master/TabletGroupWatcher.java | 37 +- .../accumulo/master/replication/WorkMaker.java | 1 + .../accumulo/master/state/MergeStats.java | 3 +- .../master/ReplicationOperationsImplTest.java | 9 +- .../apache/accumulo/master/TestMergeState.java | 2 +- .../master/state/RootTabletStateStoreTest.java | 4 +- .../src/main/findbugs/exclude-filter.xml| 2 +- .../server/GarbageCollectionLogger.java | 3 +- .../apache/accumulo/tserver/TabletServer.java | 182 +++--- .../compaction/MajorCompactionRequest.java | 15 +- .../apache/accumulo/tserver/log/DfsLogger.java | 14 +- .../accumulo/tserver/log/SortedLogRecovery.java | 8 +- .../tserver/log/TabletServerLogger.java | 187 +++--- .../accumulo/tserver/tablet/CommitSession.java | 3 +- .../tserver/tablet/DatafileManager.java | 4 +- .../apache/accumulo/tserver/tablet/Tablet.java | 59 +- .../tserver/tablet/TabletCommitter.java | 3 +- .../accumulo/tserver/log/LogEntryTest.java | 56 ++ .../test/performance/thrift/NullTserver.java| 6 +- .../accumulo/proxy/ProxyDurabilityIT.java | 9 +- .../apache/accumulo/proxy/SimpleProxyBase.java | 30 +- .../test/BadDeleteMarkersCreatedIT.java | 2 +- .../org/apache/accumulo/test/BalanceIT.java | 20 +- .../org/apache/accumulo/test/CleanWalIT.java| 1 + .../accumulo/test/ConditionalWriterIT.java | 1 + .../accumulo/test/GarbageCollectWALIT.java | 81 +++ .../MissingWalHeaderCompletesRecoveryIT.java| 14 +- .../accumulo/test/NoMutationRecoveryIT.java | 178 -- .../org/apache/accumulo/test/ShellServerIT.java | 2 +- .../org/apache/accumulo/test/UnusedWALIT.java | 144 + .../java/org/apache/accumulo/test/VolumeIT.java | 17 + .../accumulo/test/functional/ReadWriteIT.java | 8 + .../accumulo/test/functional/WALSunnyDayIT.java | 250 .../test/functional/WatchTheWatchCountIT.java | 2 +- .../test/performance/RollWALPerformanceIT.java | 126 + ...bageCollectorCommunicatesWithTServersIT.java | 35 +- .../replication/MultiInstanceReplicationIT.java | 2 +- .../test/replication/ReplicationIT.java | 370 test/src/test/resources/TestCompactionStrat.jar | Bin 1681
[2/4] accumulo git commit: Merge branch '1.7'
Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f442676c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f442676c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f442676c Branch: refs/heads/master Commit: f442676ca341c650b109762208bf4ce7c0b7aaa3 Parents: 488f441 951257a Author: Eric C. Newton eric.new...@gmail.com Authored: Mon Apr 27 13:46:14 2015 -0400 Committer: Eric C. Newton eric.new...@gmail.com Committed: Mon Apr 27 13:46:14 2015 -0400 -- test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f442676c/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java --
