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 2015/05/21 18:47:09 UTC
[3/4] accumulo git commit: ACCUMULO-3423 merge origin
ACCUMULO-3423 merge origin
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/08633f02
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/08633f02
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/08633f02
Branch: refs/heads/master
Commit: 08633f02bc25ed04db1c1799bc7eeaff425fb91f
Parents: 0b48793 cf9b9a4
Author: Eric Newton <er...@gmail.com>
Authored: Thu May 21 11:46:59 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu May 21 11:46:59 2015 -0400
----------------------------------------------------------------------
CHANGES | 1 +
assemble/bin/config.sh | 6 +-
assemble/bin/start-server.sh | 4 +-
.../core/client/impl/ConditionalWriterImpl.java | 2 +-
.../org/apache/accumulo/core/conf/Property.java | 4 +-
.../accumulo/core/file/rfile/bcfile/Utils.java | 2 +-
.../iterators/user/IntersectingIterator.java | 19 ++--
.../mapred/AccumuloFileOutputFormatTest.java | 2 +
.../mapreduce/AccumuloFileOutputFormatTest.java | 2 +
.../main/asciidoc/chapters/administration.txt | 2 +-
.../accumulo/examples/simple/shard/Index.java | 7 +-
minicluster/pom.xml | 10 ++
.../standalone/StandaloneAccumuloCluster.java | 12 ++-
.../standalone/StandaloneClusterControl.java | 25 +++++
.../minicluster/MiniAccumuloRunner.java | 4 +
.../impl/MiniAccumuloClusterImpl.java | 76 +++++++------
.../impl/MiniAccumuloConfigImpl.java | 45 ++++++--
.../StandaloneAccumuloClusterTest.java | 53 +++++++++
...niAccumuloClusterExistingZooKeepersTest.java | 107 +++++++++++++++++++
pom.xml | 20 +++-
.../apache/accumulo/server/init/Initialize.java | 2 +-
.../accumulo/server/util/SendLogToChainsaw.java | 2 +-
.../org/apache/accumulo/monitor/util/Table.java | 2 +-
.../monitor/util/celltypes/NumberType.java | 2 +-
.../accumulo/tserver/log/LocalWALRecovery.java | 75 ++++++-------
.../accumulo/tserver/tablet/RootFilesTest.java | 7 +-
.../shell/commands/FormatterCommandTest.java | 2 +-
.../start/classloader/AccumuloClassLoader.java | 7 +-
.../classloader/vfs/UniqueFileReplicator.java | 3 +-
.../accumulo/test/continuous/TimeBinner.java | 3 +
.../test/continuous/UndefinedAnalyzer.java | 84 ++++++++-------
.../test/functional/CacheTestWriter.java | 3 +
.../apache/accumulo/test/randomwalk/Node.java | 16 +--
.../test/randomwalk/multitable/CopyTool.java | 6 +-
.../apache/accumulo/test/AuditMessageIT.java | 5 +-
.../accumulo/test/functional/ConstraintIT.java | 24 ++++-
.../accumulo/test/proxy/SimpleProxyBase.java | 16 ++-
.../test/replication/ReplicationIT.java | 92 ++++++++--------
38 files changed, 541 insertions(+), 213 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/08633f02/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/08633f02/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
index ba68cc2,ef81f2c..41cb75a
--- a/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/replication/ReplicationIT.java
@@@ -502,9 -537,9 +528,9 @@@ public class ReplicationIT extends Conf
// when that happens
while (keepRunning.get()) {
try {
- logs.putAll(getLogs(conn));
+ logs.putAll(getAllLogs(conn));
- } catch (TableNotFoundException e) {
- log.error("Metadata table doesn't exist");
+ } catch (Exception e) {
+ log.error("Error getting logs", e);
}
}
}