You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2016/08/26 15:54:00 UTC
[1/9] accumulo git commit: ACCUMULO-4422 Initialize logging as first
step in server initialization.
Repository: accumulo
Updated Branches:
refs/heads/1.8 271800c36 -> def8f90ef
refs/heads/master 9b0d9e8c9 -> 20ed2b01f
ACCUMULO-4422 Initialize logging as first step in server initialization.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/679a1c3e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/679a1c3e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/679a1c3e
Branch: refs/heads/1.8
Commit: 679a1c3eb9013d8bb0640a617392f921f096b158
Parents: 82f1734
Author: Sean Busbey <bu...@cloudera.com>
Authored: Wed Aug 24 10:04:01 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Wed Aug 24 10:04:01 2016 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++--
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 6d50e94..0191f38 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -136,9 +136,9 @@ public class SimpleGarbageCollector implements Iface {
private Instance instance;
public static void main(String[] args) throws UnknownHostException, IOException {
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
final String app = "gc";
Accumulo.setupLogging(app);
+ SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
Instance instance = HdfsZooInstance.getInstance();
log.info("Version " + Constants.VERSION);
log.info("Instance " + instance.getInstanceID());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/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 cc4a02f..14bdd6b 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
@@ -1156,13 +1156,13 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
public static void main(String[] args) throws Exception {
try {
+ final String app = "master";
+ Accumulo.setupLogging(app);
SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
ServerOpts opts = new ServerOpts();
- final String app = "master";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
Instance instance = HdfsZooInstance.getInstance();
ServerConfiguration conf = new ServerConfiguration(instance);
VolumeManager fs = VolumeManagerImpl.get();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 4e162c3..e5ba9e4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -422,14 +422,14 @@ public class Monitor {
}
public static void main(String[] args) throws Exception {
+ final String app = "monitor";
+ Accumulo.setupLogging(app);
SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
ServerOpts opts = new ServerOpts();
- final String app = "monitor";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
VolumeManager fs = VolumeManagerImpl.get();
instance = HdfsZooInstance.getInstance();
config = new ServerConfiguration(instance);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 1df10a3..ebfed9c 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -292,11 +292,11 @@ public class TraceServer implements Watcher {
}
public static void main(String[] args) throws Exception {
+ final String app = "tracer";
+ Accumulo.setupLogging(app);
SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
ServerOpts opts = new ServerOpts();
- final String app = "tracer";
opts.parseArgs(app, args);
- Accumulo.setupLogging(app);
Instance instance = HdfsZooInstance.getInstance();
ServerConfiguration conf = new ServerConfiguration(instance);
VolumeManager fs = VolumeManagerImpl.get();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 8155ea6..2fdae29 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -3736,12 +3736,12 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
public static void main(String[] args) throws IOException {
try {
+ final String app = "tserver";
+ Accumulo.setupLogging(app);
SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
ServerOpts opts = new ServerOpts();
- final String app = "tserver";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
final Instance instance = HdfsZooInstance.getInstance();
ServerConfiguration conf = new ServerConfiguration(instance);
VolumeManager fs = VolumeManagerImpl.get();
[8/9] accumulo git commit: ACCUMULO-4426 Lift MR-IT instructions to
TESTING.md
Posted by el...@apache.org.
ACCUMULO-4426 Lift MR-IT instructions to TESTING.md
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/def8f90e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/def8f90e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/def8f90e
Branch: refs/heads/1.8
Commit: def8f90eff10d8c598030abfa433ec8907aae735
Parents: e29055f
Author: Josh Elser <el...@apache.org>
Authored: Fri Aug 26 11:03:23 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Aug 26 11:03:23 2016 -0400
----------------------------------------------------------------------
TESTING.md | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/def8f90e/TESTING.md
----------------------------------------------------------------------
diff --git a/TESTING.md b/TESTING.md
index 03ee687..2195108 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -133,6 +133,27 @@ but for different instances, the correct version is terminated. `HADOOP_CONF_DIR
files to construct the FileSystem object for the cluster can be constructed (e.g. core-site.xml and hdfs-site.xml),
which is typically required to interact with HDFS.
+## MapReduce job for Integration tests
+
+[ACCUMULO-3871][6] (re)introduced the ability to parallelize the execution of the Integration Test suite by the use
+of MapReduce/YARN. When a YARN cluster is available, this can drastically reduce the amount of time to run all tests.
+
+To run the tests, you first need a list of the tests. A simple way to get a list, is to scan the accumulo-test jar file for them.
+
+`jar -tf lib/accumulo-test.jar | grep IT.class | tr / . | sed -e 's/.class$//' >accumulo-integration-tests.txt`
+
+Then, put the list of files into HDFS:
+
+`hdfs dfs -mkdir /tmp`
+`hdfs dfs -put accumulo-integration-tests.txt /tmp/tests`
+
+Finally, launch the job, providing the list of tests to run and a location to store the test results. Optionally, a built
+native library shared object can be provided to the Mapper's classpath to enable MiniAccumuloCluster to use the native maps
+instead of the Java-based implementation. (Note that the below paths are the JAR and shared object are based on an installation.
+These files do exist in the build tree, but at different locations)
+
+`yarn jar lib/accumulo-test.jar org.apache.accumulo.test.mrit.IntegrationtestMapReduce -libjars lib/native/libaccumulo.so /tmp/accumulo-integration-tests.txt /tmp/accumulo-integration-test-results`
+
# Manual Distributed Testing
Apache Accumulo also contains a number of tests which are suitable for running against large clusters for hours to days
@@ -144,4 +165,4 @@ at a time, for example the [Continuous Ingest][1] and [Randomwalk test][2] suite
[3]: https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
[4]: http://maven.apache.org/surefire/maven-surefire-plugin/
[5]: http://maven.apache.org/surefire/maven-failsafe-plugin/
-
+[6]: https://issues.apache.org/jira/browse/ACCUMULO-3871
[5/9] accumulo git commit: Merge remote-tracking branch 'origin/1.7'
into 1.8
Posted by el...@apache.org.
Merge remote-tracking branch 'origin/1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e29055f4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e29055f4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e29055f4
Branch: refs/heads/1.8
Commit: e29055f4624820e83b10879af1c19569f9115ed1
Parents: 271800c 371db68
Author: Josh Elser <el...@apache.org>
Authored: Fri Aug 26 10:54:16 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Aug 26 10:54:16 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++--
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
[4/9] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
server/master/src/main/java/org/apache/accumulo/master/Master.java
server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/371db68c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/371db68c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/371db68c
Branch: refs/heads/master
Commit: 371db68cfc4a82921a0b47c886be3e88c4058cdf
Parents: ffd5028 679a1c3
Author: Sean Busbey <bu...@cloudera.com>
Authored: Wed Aug 24 10:22:25 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Wed Aug 24 10:22:25 2016 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++--
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --cc server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index da25d55,0191f38..98acf9a
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -139,14 -133,16 +139,14 @@@ public class SimpleGarbageCollector ext
private GCStatus status = new GCStatus(new GcCycleStats(), new GcCycleStats(), new GcCycleStats(), new GcCycleStats());
- private Instance instance;
-
public static void main(String[] args) throws UnknownHostException, IOException {
- SecurityUtil.serverLogin(SiteConfiguration.getInstance());
final String app = "gc";
Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
++ SecurityUtil.serverLogin(SiteConfiguration.getInstance());
Instance instance = HdfsZooInstance.getInstance();
+ ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
log.info("Version " + Constants.VERSION);
log.info("Instance " + instance.getInstanceID());
- ServerConfiguration conf = new ServerConfiguration(instance);
final VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
Opts opts = new Opts();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java
index 5a2a346,14bdd6b..dc26a11
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@@ -1345,14 -1156,15 +1345,14 @@@ public class Master extends AccumuloSer
public static void main(String[] args) throws Exception {
try {
+ final String app = "master";
+ Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
+ SecurityUtil.serverLogin(SiteConfiguration.getInstance());
ServerOpts opts = new ServerOpts();
- final String app = "master";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
- Instance instance = HdfsZooInstance.getInstance();
- ServerConfiguration conf = new ServerConfiguration(instance);
+ ServerConfigurationFactory conf = new ServerConfigurationFactory(HdfsZooInstance.getInstance());
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
Master master = new Master(conf, fs, hostname);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index c3dd773,e5ba9e4..58cf921
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -417,18 -422,17 +417,18 @@@ public class Monitor
}
public static void main(String[] args) throws Exception {
+ final String app = "monitor";
+ Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
+ SecurityUtil.serverLogin(SiteConfiguration.getInstance());
ServerOpts opts = new ServerOpts();
- final String app = "monitor";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
VolumeManager fs = VolumeManagerImpl.get();
instance = HdfsZooInstance.getInstance();
- config = new ServerConfiguration(instance);
+ config = new ServerConfigurationFactory(instance);
+ context = new AccumuloServerContext(config);
log.info("Version " + Constants.VERSION);
log.info("Instance " + instance.getInstanceID());
Accumulo.init(fs, config, app);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --cc server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 2d5d68d,ebfed9c..4b07dcc
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@@ -305,41 -291,14 +305,41 @@@ public class TraceServer implements Wat
zoo.exists(path, this);
}
+ private static void loginTracer(AccumuloConfiguration acuConf) {
+ Map<String,String> loginMap = acuConf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX);
+ String keyTab = loginMap.get(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + "keytab");
+ if (keyTab == null || keyTab.length() == 0) {
+ keyTab = acuConf.getPath(Property.GENERAL_KERBEROS_KEYTAB);
+ }
+ if (keyTab == null || keyTab.length() == 0)
+ return;
+
+ String principalConfig = acuConf.get(Property.TRACE_USER);
+ if (principalConfig == null || principalConfig.length() == 0)
+ return;
+
+ log.info("Attempting to login as {} with {}", principalConfig, keyTab);
+ if (SecurityUtil.login(principalConfig, keyTab)) {
+ try {
+ // This spawns a thread to periodically renew the logged in (trace) user
+ UserGroupInformation.getLoginUser();
+ return;
+ } catch (IOException io) {
+ log.error("Error starting up renewal thread. This shouldn't be happening.", io);
+ }
+ }
+
+ throw new RuntimeException("Failed to perform Kerberos login for " + principalConfig + " using " + keyTab);
+ }
+
public static void main(String[] args) throws Exception {
+ final String app = "tracer";
+ Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
+ loginTracer(SiteConfiguration.getInstance());
ServerOpts opts = new ServerOpts();
- final String app = "tracer";
opts.parseArgs(app, args);
- Accumulo.setupLogging(app);
Instance instance = HdfsZooInstance.getInstance();
- ServerConfiguration conf = new ServerConfiguration(instance);
+ ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
String hostname = opts.getAddress();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index a7abe05,2fdae29..6762c53
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2920,30 -3736,20 +2920,30 @@@ public class TabletServer extends Accum
public static void main(String[] args) throws IOException {
try {
+ final String app = "tserver";
+ Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
+ SecurityUtil.serverLogin(SiteConfiguration.getInstance());
ServerOpts opts = new ServerOpts();
- final String app = "tserver";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
- final Instance instance = HdfsZooInstance.getInstance();
- ServerConfiguration conf = new ServerConfiguration(instance);
+ ServerConfigurationFactory conf = new ServerConfigurationFactory(HdfsZooInstance.getInstance());
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
- TabletServer server = new TabletServer(conf, fs);
+ final TabletServer server = new TabletServer(conf, fs);
server.config(hostname);
- Accumulo.enableTracing(hostname, app);
- server.run();
+ DistributedTrace.enable(hostname, app, conf.getConfiguration());
+ if (UserGroupInformation.isSecurityEnabled()) {
+ UserGroupInformation loginUser = UserGroupInformation.getLoginUser();
+ loginUser.doAs(new PrivilegedExceptionAction<Void>() {
+ @Override
+ public Void run() {
+ server.run();
+ return null;
+ }
+ });
+ } else {
+ server.run();
+ }
} catch (Exception ex) {
log.error("Uncaught exception in TabletServer.main, exiting", ex);
System.exit(1);
[9/9] accumulo git commit: Merge branch '1.8'
Posted by el...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/20ed2b01
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/20ed2b01
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/20ed2b01
Branch: refs/heads/master
Commit: 20ed2b01f8f6a9376d0c7438c7f6e251ed61ef4e
Parents: 9b0d9e8 def8f90
Author: Josh Elser <el...@apache.org>
Authored: Fri Aug 26 11:39:48 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Aug 26 11:39:48 2016 -0400
----------------------------------------------------------------------
TESTING.md | 23 +++++++++++++++++++-
.../accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../java/org/apache/accumulo/master/Master.java | 4 ++--
.../org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../org/apache/accumulo/tracer/TraceServer.java | 4 ++--
.../apache/accumulo/tserver/TabletServer.java | 4 ++--
6 files changed, 31 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/20ed2b01/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/20ed2b01/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
[3/9] accumulo git commit: Merge branch '1.6' into 1.7
Posted by el...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
server/master/src/main/java/org/apache/accumulo/master/Master.java
server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/371db68c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/371db68c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/371db68c
Branch: refs/heads/1.8
Commit: 371db68cfc4a82921a0b47c886be3e88c4058cdf
Parents: ffd5028 679a1c3
Author: Sean Busbey <bu...@cloudera.com>
Authored: Wed Aug 24 10:22:25 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Wed Aug 24 10:22:25 2016 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++--
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --cc server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index da25d55,0191f38..98acf9a
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -139,14 -133,16 +139,14 @@@ public class SimpleGarbageCollector ext
private GCStatus status = new GCStatus(new GcCycleStats(), new GcCycleStats(), new GcCycleStats(), new GcCycleStats());
- private Instance instance;
-
public static void main(String[] args) throws UnknownHostException, IOException {
- SecurityUtil.serverLogin(SiteConfiguration.getInstance());
final String app = "gc";
Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
++ SecurityUtil.serverLogin(SiteConfiguration.getInstance());
Instance instance = HdfsZooInstance.getInstance();
+ ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
log.info("Version " + Constants.VERSION);
log.info("Instance " + instance.getInstanceID());
- ServerConfiguration conf = new ServerConfiguration(instance);
final VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
Opts opts = new Opts();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java
index 5a2a346,14bdd6b..dc26a11
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@@ -1345,14 -1156,15 +1345,14 @@@ public class Master extends AccumuloSer
public static void main(String[] args) throws Exception {
try {
+ final String app = "master";
+ Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
+ SecurityUtil.serverLogin(SiteConfiguration.getInstance());
ServerOpts opts = new ServerOpts();
- final String app = "master";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
- Instance instance = HdfsZooInstance.getInstance();
- ServerConfiguration conf = new ServerConfiguration(instance);
+ ServerConfigurationFactory conf = new ServerConfigurationFactory(HdfsZooInstance.getInstance());
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
Master master = new Master(conf, fs, hostname);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index c3dd773,e5ba9e4..58cf921
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -417,18 -422,17 +417,18 @@@ public class Monitor
}
public static void main(String[] args) throws Exception {
+ final String app = "monitor";
+ Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
+ SecurityUtil.serverLogin(SiteConfiguration.getInstance());
ServerOpts opts = new ServerOpts();
- final String app = "monitor";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
VolumeManager fs = VolumeManagerImpl.get();
instance = HdfsZooInstance.getInstance();
- config = new ServerConfiguration(instance);
+ config = new ServerConfigurationFactory(instance);
+ context = new AccumuloServerContext(config);
log.info("Version " + Constants.VERSION);
log.info("Instance " + instance.getInstanceID());
Accumulo.init(fs, config, app);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --cc server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 2d5d68d,ebfed9c..4b07dcc
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@@ -305,41 -291,14 +305,41 @@@ public class TraceServer implements Wat
zoo.exists(path, this);
}
+ private static void loginTracer(AccumuloConfiguration acuConf) {
+ Map<String,String> loginMap = acuConf.getAllPropertiesWithPrefix(Property.TRACE_TOKEN_PROPERTY_PREFIX);
+ String keyTab = loginMap.get(Property.TRACE_TOKEN_PROPERTY_PREFIX.getKey() + "keytab");
+ if (keyTab == null || keyTab.length() == 0) {
+ keyTab = acuConf.getPath(Property.GENERAL_KERBEROS_KEYTAB);
+ }
+ if (keyTab == null || keyTab.length() == 0)
+ return;
+
+ String principalConfig = acuConf.get(Property.TRACE_USER);
+ if (principalConfig == null || principalConfig.length() == 0)
+ return;
+
+ log.info("Attempting to login as {} with {}", principalConfig, keyTab);
+ if (SecurityUtil.login(principalConfig, keyTab)) {
+ try {
+ // This spawns a thread to periodically renew the logged in (trace) user
+ UserGroupInformation.getLoginUser();
+ return;
+ } catch (IOException io) {
+ log.error("Error starting up renewal thread. This shouldn't be happening.", io);
+ }
+ }
+
+ throw new RuntimeException("Failed to perform Kerberos login for " + principalConfig + " using " + keyTab);
+ }
+
public static void main(String[] args) throws Exception {
+ final String app = "tracer";
+ Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
+ loginTracer(SiteConfiguration.getInstance());
ServerOpts opts = new ServerOpts();
- final String app = "tracer";
opts.parseArgs(app, args);
- Accumulo.setupLogging(app);
Instance instance = HdfsZooInstance.getInstance();
- ServerConfiguration conf = new ServerConfiguration(instance);
+ ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
String hostname = opts.getAddress();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/371db68c/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index a7abe05,2fdae29..6762c53
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -2920,30 -3736,20 +2920,30 @@@ public class TabletServer extends Accum
public static void main(String[] args) throws IOException {
try {
+ final String app = "tserver";
+ Accumulo.setupLogging(app);
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
+ SecurityUtil.serverLogin(SiteConfiguration.getInstance());
ServerOpts opts = new ServerOpts();
- final String app = "tserver";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
- final Instance instance = HdfsZooInstance.getInstance();
- ServerConfiguration conf = new ServerConfiguration(instance);
+ ServerConfigurationFactory conf = new ServerConfigurationFactory(HdfsZooInstance.getInstance());
VolumeManager fs = VolumeManagerImpl.get();
Accumulo.init(fs, conf, app);
- TabletServer server = new TabletServer(conf, fs);
+ final TabletServer server = new TabletServer(conf, fs);
server.config(hostname);
- Accumulo.enableTracing(hostname, app);
- server.run();
+ DistributedTrace.enable(hostname, app, conf.getConfiguration());
+ if (UserGroupInformation.isSecurityEnabled()) {
+ UserGroupInformation loginUser = UserGroupInformation.getLoginUser();
+ loginUser.doAs(new PrivilegedExceptionAction<Void>() {
+ @Override
+ public Void run() {
+ server.run();
+ return null;
+ }
+ });
+ } else {
+ server.run();
+ }
} catch (Exception ex) {
log.error("Uncaught exception in TabletServer.main, exiting", ex);
System.exit(1);
[7/9] accumulo git commit: ACCUMULO-4426 Lift MR-IT instructions to
TESTING.md
Posted by el...@apache.org.
ACCUMULO-4426 Lift MR-IT instructions to TESTING.md
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/def8f90e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/def8f90e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/def8f90e
Branch: refs/heads/master
Commit: def8f90eff10d8c598030abfa433ec8907aae735
Parents: e29055f
Author: Josh Elser <el...@apache.org>
Authored: Fri Aug 26 11:03:23 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Aug 26 11:03:23 2016 -0400
----------------------------------------------------------------------
TESTING.md | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/def8f90e/TESTING.md
----------------------------------------------------------------------
diff --git a/TESTING.md b/TESTING.md
index 03ee687..2195108 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -133,6 +133,27 @@ but for different instances, the correct version is terminated. `HADOOP_CONF_DIR
files to construct the FileSystem object for the cluster can be constructed (e.g. core-site.xml and hdfs-site.xml),
which is typically required to interact with HDFS.
+## MapReduce job for Integration tests
+
+[ACCUMULO-3871][6] (re)introduced the ability to parallelize the execution of the Integration Test suite by the use
+of MapReduce/YARN. When a YARN cluster is available, this can drastically reduce the amount of time to run all tests.
+
+To run the tests, you first need a list of the tests. A simple way to get a list, is to scan the accumulo-test jar file for them.
+
+`jar -tf lib/accumulo-test.jar | grep IT.class | tr / . | sed -e 's/.class$//' >accumulo-integration-tests.txt`
+
+Then, put the list of files into HDFS:
+
+`hdfs dfs -mkdir /tmp`
+`hdfs dfs -put accumulo-integration-tests.txt /tmp/tests`
+
+Finally, launch the job, providing the list of tests to run and a location to store the test results. Optionally, a built
+native library shared object can be provided to the Mapper's classpath to enable MiniAccumuloCluster to use the native maps
+instead of the Java-based implementation. (Note that the below paths are the JAR and shared object are based on an installation.
+These files do exist in the build tree, but at different locations)
+
+`yarn jar lib/accumulo-test.jar org.apache.accumulo.test.mrit.IntegrationtestMapReduce -libjars lib/native/libaccumulo.so /tmp/accumulo-integration-tests.txt /tmp/accumulo-integration-test-results`
+
# Manual Distributed Testing
Apache Accumulo also contains a number of tests which are suitable for running against large clusters for hours to days
@@ -144,4 +165,4 @@ at a time, for example the [Continuous Ingest][1] and [Randomwalk test][2] suite
[3]: https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
[4]: http://maven.apache.org/surefire/maven-surefire-plugin/
[5]: http://maven.apache.org/surefire/maven-failsafe-plugin/
-
+[6]: https://issues.apache.org/jira/browse/ACCUMULO-3871
[2/9] accumulo git commit: ACCUMULO-4422 Initialize logging as first
step in server initialization.
Posted by el...@apache.org.
ACCUMULO-4422 Initialize logging as first step in server initialization.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/679a1c3e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/679a1c3e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/679a1c3e
Branch: refs/heads/master
Commit: 679a1c3eb9013d8bb0640a617392f921f096b158
Parents: 82f1734
Author: Sean Busbey <bu...@cloudera.com>
Authored: Wed Aug 24 10:04:01 2016 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Wed Aug 24 10:04:01 2016 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++--
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 6d50e94..0191f38 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -136,9 +136,9 @@ public class SimpleGarbageCollector implements Iface {
private Instance instance;
public static void main(String[] args) throws UnknownHostException, IOException {
- SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
final String app = "gc";
Accumulo.setupLogging(app);
+ SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
Instance instance = HdfsZooInstance.getInstance();
log.info("Version " + Constants.VERSION);
log.info("Instance " + instance.getInstanceID());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/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 cc4a02f..14bdd6b 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
@@ -1156,13 +1156,13 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
public static void main(String[] args) throws Exception {
try {
+ final String app = "master";
+ Accumulo.setupLogging(app);
SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
ServerOpts opts = new ServerOpts();
- final String app = "master";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
Instance instance = HdfsZooInstance.getInstance();
ServerConfiguration conf = new ServerConfiguration(instance);
VolumeManager fs = VolumeManagerImpl.get();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 4e162c3..e5ba9e4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -422,14 +422,14 @@ public class Monitor {
}
public static void main(String[] args) throws Exception {
+ final String app = "monitor";
+ Accumulo.setupLogging(app);
SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
ServerOpts opts = new ServerOpts();
- final String app = "monitor";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
VolumeManager fs = VolumeManagerImpl.get();
instance = HdfsZooInstance.getInstance();
config = new ServerConfiguration(instance);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 1df10a3..ebfed9c 100644
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@ -292,11 +292,11 @@ public class TraceServer implements Watcher {
}
public static void main(String[] args) throws Exception {
+ final String app = "tracer";
+ Accumulo.setupLogging(app);
SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
ServerOpts opts = new ServerOpts();
- final String app = "tracer";
opts.parseArgs(app, args);
- Accumulo.setupLogging(app);
Instance instance = HdfsZooInstance.getInstance();
ServerConfiguration conf = new ServerConfiguration(instance);
VolumeManager fs = VolumeManagerImpl.get();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/679a1c3e/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 8155ea6..2fdae29 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -3736,12 +3736,12 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
public static void main(String[] args) throws IOException {
try {
+ final String app = "tserver";
+ Accumulo.setupLogging(app);
SecurityUtil.serverLogin(ServerConfiguration.getSiteConfiguration());
ServerOpts opts = new ServerOpts();
- final String app = "tserver";
opts.parseArgs(app, args);
String hostname = opts.getAddress();
- Accumulo.setupLogging(app);
final Instance instance = HdfsZooInstance.getInstance();
ServerConfiguration conf = new ServerConfiguration(instance);
VolumeManager fs = VolumeManagerImpl.get();
[6/9] accumulo git commit: Merge remote-tracking branch 'origin/1.7'
into 1.8
Posted by el...@apache.org.
Merge remote-tracking branch 'origin/1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e29055f4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e29055f4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e29055f4
Branch: refs/heads/master
Commit: e29055f4624820e83b10879af1c19569f9115ed1
Parents: 271800c 371db68
Author: Josh Elser <el...@apache.org>
Authored: Fri Aug 26 10:54:16 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Aug 26 10:54:16 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++--
.../src/main/java/org/apache/accumulo/monitor/Monitor.java | 4 ++--
.../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 4 ++--
.../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e29055f4/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------