accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/01: Merge branch '1.8'
Date Thu, 07 Dec 2017 03:57:03 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit acee578ad6fcd994eadd932f34ad42c387b650f5
Merge: 2f9c72c 0c51162
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Wed Dec 6 22:56:42 2017 -0500

    Merge branch '1.8'
    
    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

 .../server/metrics/Metrics2ThriftMetrics.java       |  2 ++
 .../server/metrics/MetricsSystemHelper.java         | 21 +++++++++++++++++++++
 .../apache/accumulo/gc/SimpleGarbageCollector.java  |  2 ++
 .../java/org/apache/accumulo/master/Master.java     |  2 ++
 .../master/metrics/Metrics2ReplicationMetrics.java  |  5 ++++-
 .../java/org/apache/accumulo/monitor/Monitor.java   |  2 ++
 .../org/apache/accumulo/tracer/TraceServer.java     |  2 ++
 .../org/apache/accumulo/tserver/TabletServer.java   |  2 ++
 .../metrics/Metrics2TabletServerMetrics.java        |  3 +++
 .../metrics/Metrics2TabletServerMinCMetrics.java    |  3 +++
 .../metrics/Metrics2TabletServerScanMetrics.java    |  3 +++
 .../metrics/Metrics2TabletServerUpdateMetrics.java  |  3 +++
 12 files changed, 49 insertions(+), 1 deletion(-)

diff --cc server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 74ef6c9,b2391d4..b4ff28e
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -154,10 -152,13 +155,11 @@@ public class SimpleGarbageCollector ext
      log.info("Version " + Constants.VERSION);
      log.info("Instance " + instance.getInstanceID());
      final VolumeManager fs = VolumeManagerImpl.get();
+     MetricsSystemHelper.configure(SimpleGarbageCollector.class.getSimpleName());
 -    Accumulo.init(fs, conf, app);
 -    Opts opts = new Opts();
 -    opts.parseArgs(app, args);
 -    SimpleGarbageCollector gc = new SimpleGarbageCollector(opts, fs, conf);
 +    Accumulo.init(fs, instance, conf, app);
 +    SimpleGarbageCollector gc = new SimpleGarbageCollector(opts, instance, fs, conf);
  
 -    DistributedTrace.enable(opts.getAddress(), app, conf.getConfiguration());
 +    DistributedTrace.enable(opts.getAddress(), app, conf.getSystemConfiguration());
      try {
        gc.run();
      } finally {
diff --cc server/master/src/main/java/org/apache/accumulo/master/Master.java
index 1e72e4b,43c5c07..4532129
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@@ -127,8 -122,8 +127,9 @@@ import org.apache.accumulo.server.maste
  import org.apache.accumulo.server.master.state.ZooStore;
  import org.apache.accumulo.server.master.state.ZooTabletStateStore;
  import org.apache.accumulo.server.metrics.Metrics;
+ import org.apache.accumulo.server.metrics.MetricsSystemHelper;
  import org.apache.accumulo.server.replication.ZooKeeperInitialization;
 +import org.apache.accumulo.server.rpc.HighlyAvailableServiceWrapper;
  import org.apache.accumulo.server.rpc.RpcWrapper;
  import org.apache.accumulo.server.rpc.ServerAddress;
  import org.apache.accumulo.server.rpc.TCredentialsUpdatingWrapper;
@@@ -1438,16 -1421,18 +1439,17 @@@ public class Master extends AccumuloSer
    public static void main(String[] args) throws Exception {
      try {
        final String app = "master";
 -      Accumulo.setupLogging(app);
 -      SecurityUtil.serverLogin(SiteConfiguration.getInstance());
 -
        ServerOpts opts = new ServerOpts();
        opts.parseArgs(app, args);
 +      SecurityUtil.serverLogin(SiteConfiguration.getInstance());
        String hostname = opts.getAddress();
 -      ServerConfigurationFactory conf = new ServerConfigurationFactory(HdfsZooInstance.getInstance());
 +      Instance instance = HdfsZooInstance.getInstance();
 +      ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
        VolumeManager fs = VolumeManagerImpl.get();
+       MetricsSystemHelper.configure(Master.class.getSimpleName());
 -      Accumulo.init(fs, conf, app);
 -      Master master = new Master(conf, fs, hostname);
 -      DistributedTrace.enable(hostname, app, conf.getConfiguration());
 +      Accumulo.init(fs, instance, conf, app);
 +      Master master = new Master(instance, conf, fs, hostname);
 +      DistributedTrace.enable(hostname, app, conf.getSystemConfiguration());
        master.run();
      } catch (Exception ex) {
        log.error("Unexpected exception, exiting", ex);
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 868d328,a35518e..cfc065f
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -427,15 -431,13 +428,16 @@@ public class Monitor implements HighlyA
      VolumeManager fs = VolumeManagerImpl.get();
      instance = HdfsZooInstance.getInstance();
      config = new ServerConfigurationFactory(instance);
 -    context = new AccumuloServerContext(config);
 +    context = new AccumuloServerContext(instance, config);
      log.info("Version " + Constants.VERSION);
      log.info("Instance " + instance.getInstanceID());
+     MetricsSystemHelper.configure(Monitor.class.getSimpleName());
 -    Accumulo.init(fs, config, app);
 +    Accumulo.init(fs, instance, config, app);
      Monitor monitor = new Monitor();
 -    DistributedTrace.enable(hostname, app, config.getConfiguration());
 +    // Servlets need access to limit requests when the monitor is not active, but Servlets
are instantiated
 +    // via reflection. Expose the service this way instead.
 +    Monitor.HA_SERVICE_INSTANCE = monitor;
 +    DistributedTrace.enable(hostname, app, config.getSystemConfiguration());
      try {
        monitor.run(hostname);
      } finally {
diff --cc server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
index 16d72db,e2983bc..0296f61
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/TraceServer.java
@@@ -385,9 -385,10 +386,10 @@@ public class TraceServer implements Wat
      Instance instance = HdfsZooInstance.getInstance();
      ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
      VolumeManager fs = VolumeManagerImpl.get();
+     MetricsSystemHelper.configure(TraceServer.class.getSimpleName());
 -    Accumulo.init(fs, conf, app);
 +    Accumulo.init(fs, instance, conf, app);
      String hostname = opts.getAddress();
 -    TraceServer server = new TraceServer(conf, hostname);
 +    TraceServer server = new TraceServer(instance, conf, hostname);
      try {
        server.run();
      } finally {
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 6bdcfd0,fef942e..09791d2
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -3062,17 -2951,18 +3063,18 @@@ public class TabletServer extends Accum
    public static void main(String[] args) throws IOException {
      try {
        final String app = "tserver";
 -      Accumulo.setupLogging(app);
 -      SecurityUtil.serverLogin(SiteConfiguration.getInstance());
        ServerOpts opts = new ServerOpts();
        opts.parseArgs(app, args);
 +      SecurityUtil.serverLogin(SiteConfiguration.getInstance());
        String hostname = opts.getAddress();
 -      ServerConfigurationFactory conf = new ServerConfigurationFactory(HdfsZooInstance.getInstance());
 +      Instance instance = HdfsZooInstance.getInstance();
 +      ServerConfigurationFactory conf = new ServerConfigurationFactory(instance);
        VolumeManager fs = VolumeManagerImpl.get();
+       MetricsSystemHelper.configure(TabletServer.class.getSimpleName());
 -      Accumulo.init(fs, conf, app);
 -      final TabletServer server = new TabletServer(conf, fs);
 +      Accumulo.init(fs, instance, conf, app);
 +      final TabletServer server = new TabletServer(instance, conf, fs);
        server.config(hostname);
 -      DistributedTrace.enable(hostname, app, conf.getConfiguration());
 +      DistributedTrace.enable(hostname, app, conf.getSystemConfiguration());
        if (UserGroupInformation.isSecurityEnabled()) {
          UserGroupInformation loginUser = UserGroupInformation.getLoginUser();
          loginUser.doAs(new PrivilegedExceptionAction<Void>() {

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <commits@accumulo.apache.org>.

Mime
View raw message