date:20160825

[2/3] accumulo git commit: ACCUMULO-4422 Initialize logging as first step in server initialization.

2016-08-25 Thread busbey

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.7
Commit: 679a1c3eb9013d8bb0640a617392f921f096b158
Parents: 82f1734
Author: Sean Busbey 
Authored: Wed Aug 24 10:04:01 2016 -0500
Committer: Sean Busbey 
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

[3/3] accumulo git commit: Merge branch '1.6' into 1.7

2016-08-25 Thread busbey

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.7
Commit: 371db68cfc4a82921a0b47c886be3e88c4058cdf
Parents: ffd5028 679a1c3
Author: Sean Busbey 
Authored: Wed Aug 24 10:22:25 2016 -0500
Committer: Sean Busbey 
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 
}

[1/3] accumulo git commit: ACCUMULO-4422 Initialize logging as first step in server initialization.

2016-08-25 Thread busbey

Repository: accumulo
Updated Branches:
  refs/heads/1.6 82f173496 -> 679a1c3eb
  refs/heads/1.7 ffd50280b -> 371db68cf


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.6
Commit: 679a1c3eb9013d8bb0640a617392f921f096b158
Parents: 82f1734
Author: Sean Busbey 
Authored: Wed Aug 24 10:04:01 2016 -0500
Committer: Sean Busbey 
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

[2/3] accumulo git commit: ACCUMULO-4422 Initialize logging as first step in server initialization.

[3/3] accumulo git commit: Merge branch '1.6' into 1.7

[1/3] accumulo git commit: ACCUMULO-4422 Initialize logging as first step in server initialization.

3 matches

Site Navigation

Mail list logo

Footer information