Switch from TabletServer to Accumulo for the prefix.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/deef1434 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/deef1434 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/deef1434 Branch: refs/heads/metrics2 Commit: deef14342c45c2b7bff91b4039d0784d51f7c36e Parents: 3cf6223 Author: Josh Elser <els...@apache.org> Authored: Tue Dec 2 17:07:30 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Dec 2 17:11:46 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/tserver/TabletServer.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/deef1434/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 2fd753d..c94bf82 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 @@ -16,6 +16,9 @@ */ package org.apache.accumulo.tserver; +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.server.problems.ProblemType.TABLET_LOAD; + import java.io.FileNotFoundException; import java.io.IOException; import java.lang.management.ManagementFactory; @@ -49,8 +52,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantLock; -import com.google.common.net.HostAndPort; - import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; @@ -238,8 +239,7 @@ import org.apache.thrift.server.TServer; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.NoNodeException; -import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.accumulo.server.problems.ProblemType.TABLET_LOAD; +import com.google.common.net.HostAndPort; public class TabletServer extends AccumuloServerContext implements Runnable { private static final Logger log = Logger.getLogger(TabletServer.class); @@ -342,7 +342,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { this.resourceManager = new TabletServerResourceManager(this, fs); this.security = AuditedSecurityOperation.getInstance(this); - metricsSystem = DefaultMetricsSystem.initialize("TabletServer"); + metricsSystem = DefaultMetricsSystem.initialize("Accumulo"); mincMetrics = new TabletServerMinCMetrics(metricsSystem); updateMetrics = new TabletServerUpdateMetrics(metricsSystem); scanMetrics = new TabletServerScanMetrics(metricsSystem); @@ -360,7 +360,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { private final AtomicLong totalQueuedMutationSize = new AtomicLong(0); private final ReentrantLock recoveryLock = new ReentrantLock(true); - + private class ThriftClientHandler extends ClientServiceHandler implements TabletClientService.Iface { ThriftClientHandler() { @@ -2216,7 +2216,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { recoveryLock.unlock(); } } - + public void addLoggersToMetadata(List<DfsLogger> logs, KeyExtent extent, int id) { if (!this.onlineTablets.containsKey(extent)) { log.info("Not adding " + logs.size() + " logs for extent " + extent + " as alias " + id + " tablet is offline");
