ACCUMULO-4064 Add instanceId and version logging for all processes Master already had it, add it for tabletserver, gc, tracer and monitor.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a1dd58d1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a1dd58d1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a1dd58d1 Branch: refs/heads/1.6 Commit: a1dd58d1b78f3bbe03357a6395a0feac01c54eda Parents: b6504bb Author: Josh Elser <els...@apache.org> Authored: Wed Dec 30 22:15:42 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Dec 30 22:24:27 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 ++ .../src/main/java/org/apache/accumulo/monitor/Monitor.java | 2 ++ .../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 2 ++ .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 4 ++++ 4 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a1dd58d1/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 1c6836b..b98daf7 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 @@ -140,6 +140,8 @@ public class SimpleGarbageCollector implements Iface { final String app = "gc"; Accumulo.setupLogging(app); Instance instance = HdfsZooInstance.getInstance(); + 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); http://git-wip-us.apache.org/repos/asf/accumulo/blob/a1dd58d1/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 77e2400..4e162c3 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 @@ -433,6 +433,8 @@ public class Monitor { VolumeManager fs = VolumeManagerImpl.get(); instance = HdfsZooInstance.getInstance(); config = new ServerConfiguration(instance); + log.info("Version " + Constants.VERSION); + log.info("Instance " + instance.getInstanceID()); Accumulo.init(fs, config, app); Monitor monitor = new Monitor(); Accumulo.enableTracing(hostname, app); http://git-wip-us.apache.org/repos/asf/accumulo/blob/a1dd58d1/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 f530977..1df10a3 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 @@ -172,6 +172,8 @@ public class TraceServer implements Watcher { public TraceServer(ServerConfiguration serverConfiguration, String hostname) throws Exception { this.serverConfiguration = serverConfiguration; + log.info("Version " + Constants.VERSION); + log.info("Instance " + serverConfiguration.getInstance().getInstanceID()); AccumuloConfiguration conf = serverConfiguration.getConfiguration(); table = conf.get(Property.TRACE_TABLE); Connector connector = null; http://git-wip-us.apache.org/repos/asf/accumulo/blob/a1dd58d1/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 0ec5339..29cf0d3 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 @@ -268,6 +268,10 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu this.serverConfig = conf; this.instance = conf.getInstance(); this.fs = fs; + + log.info("Version " + Constants.VERSION); + log.info("Instance " + instance.getInstanceID()); + this.logSorter = new LogSorter(instance, fs, getSystemConfiguration()); SimpleTimer.getInstance().schedule(new Runnable() { @Override
