Repository: accumulo Updated Branches: refs/heads/master 9e59c073c -> d71dbe640
ACCUMULO-3731 Remove redundant LoggingRunnable Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d71dbe64 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d71dbe64 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d71dbe64 Branch: refs/heads/master Commit: d71dbe64043fda9c7192b4d125203bea60e56947 Parents: 9e59c07 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Apr 15 18:00:29 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Apr 15 18:00:29 2015 -0400 ---------------------------------------------------------------------- .../core/client/impl/ConditionalWriterImpl.java | 2 +- .../accumulo/core/file/BloomFilterLayer.java | 2 +- .../accumulo/core/util/LoggingRunnable.java | 50 -------------------- .../accumulo/core/util/NamingThreadFactory.java | 1 + .../accumulo/server/client/BulkImporter.java | 2 +- .../server/problems/ProblemReports.java | 2 +- .../accumulo/server/rpc/TServerUtils.java | 2 +- .../org/apache/accumulo/monitor/Monitor.java | 2 +- .../apache/accumulo/tserver/TabletServer.java | 4 +- .../tserver/TabletServerResourceManager.java | 5 +- .../apache/accumulo/tserver/log/DfsLogger.java | 2 +- 11 files changed, 11 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java index 6200791..0aef3b8 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java @@ -74,9 +74,9 @@ import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.trace.thrift.TInfo; import org.apache.accumulo.core.util.BadArgumentException; import org.apache.accumulo.core.util.ByteBufferUtil; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.fate.zookeeper.ZooCacheFactory; import org.apache.accumulo.fate.zookeeper.ZooLock; import org.apache.accumulo.fate.zookeeper.ZooUtil.LockID; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java index b828890..765aa0c 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java +++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java @@ -51,8 +51,8 @@ import org.apache.accumulo.core.file.rfile.RFile; import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.util.CachedConfiguration; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.NamingThreadFactory; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/core/src/main/java/org/apache/accumulo/core/util/LoggingRunnable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/LoggingRunnable.java b/core/src/main/java/org/apache/accumulo/core/util/LoggingRunnable.java deleted file mode 100644 index 081a433..0000000 --- a/core/src/main/java/org/apache/accumulo/core/util/LoggingRunnable.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.core.util; - -import java.util.Date; - -import org.slf4j.Logger; - -public class LoggingRunnable implements Runnable { - private Runnable runnable; - private Logger log; - - public LoggingRunnable(Logger log, Runnable r) { - this.runnable = r; - this.log = log; - } - - @Override - public void run() { - try { - runnable.run(); - } catch (Throwable t) { - try { - log.error("Thread \"{}\" died {}", Thread.currentThread().getName(), t.getMessage(), t); - } catch (Throwable t2) { - // maybe the logging system is screwed up OR there is a bug in the exception, like t.getMessage() throws a NPE - System.err.println("ERROR " + new Date() + " Failed to log message about thread death " + t2.getMessage()); - t2.printStackTrace(); - - // try to print original exception - System.err.println("ERROR " + new Date() + " Exception that failed to log : " + t.getMessage()); - t.printStackTrace(); - } - } - } -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java b/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java index 3af0513..d8b307c 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java +++ b/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java @@ -19,6 +19,7 @@ package org.apache.accumulo.core.util; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java index 8e70d9b..33fbe82 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java +++ b/server/base/src/main/java/org/apache/accumulo/server/client/BulkImporter.java @@ -56,10 +56,10 @@ import org.apache.accumulo.core.rpc.ThriftUtil; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.CachedConfiguration; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.NamingThreadFactory; import org.apache.accumulo.core.util.StopWatch; import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.fs.VolumeManagerImpl; import org.apache.accumulo.server.util.FileUtil; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java index 9c877a1..960f9b3 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java +++ b/server/base/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java @@ -42,9 +42,9 @@ import org.apache.accumulo.core.iterators.SortedKeyIterator; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.NamingThreadFactory; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.AccumuloServerContext; import org.apache.accumulo.server.client.HdfsZooInstance; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java index 93835be..aaccc34 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java +++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java @@ -38,9 +38,9 @@ import org.apache.accumulo.core.rpc.SslConnectionParams; import org.apache.accumulo.core.rpc.ThriftUtil; import org.apache.accumulo.core.rpc.UGIAssumingTransportFactory; import org.apache.accumulo.core.util.Daemon; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.SimpleThreadPool; import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.server.AccumuloServerContext; import org.apache.accumulo.server.util.Halt; import org.apache.accumulo.server.util.time.SimpleTimer; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/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 5eac8bb..49d2780 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 @@ -48,12 +48,12 @@ import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client; import org.apache.accumulo.core.trace.DistributedTrace; import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.Daemon; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.core.util.ServerServices; import org.apache.accumulo.core.util.ServerServices.Service; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason; import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/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 ec51ac4..46b26b5 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 @@ -132,7 +132,6 @@ import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.ColumnFQ; import org.apache.accumulo.core.util.Daemon; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.MapCounter; import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.core.util.ServerServices; @@ -140,6 +139,7 @@ import org.apache.accumulo.core.util.ServerServices.Service; import org.apache.accumulo.core.util.SimpleThreadPool; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason; import org.apache.accumulo.fate.zookeeper.ZooLock.LockWatcher; @@ -378,7 +378,7 @@ public class TabletServer extends AccumuloServerContext implements Runnable { private static long jitter(long ms) { Random r = new Random(); // add a random 10% wait - return (long)((1. + (r.nextDouble() / 10)) * ms); + return (long) ((1. + (r.nextDouble() / 10)) * ms); } private final SessionManager sessionManager; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java index cb8d01f..cd01e60 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java @@ -41,9 +41,9 @@ import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.file.blockfile.cache.LruBlockCache; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.util.Daemon; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.NamingThreadFactory; import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.server.conf.ServerConfigurationFactory; import org.apache.accumulo.server.fs.FileRef; import org.apache.accumulo.server.fs.VolumeManager; @@ -65,9 +65,6 @@ import org.slf4j.LoggerFactory; /** * ResourceManager is responsible for managing the resources of all tablets within a tablet server. - * - * - * */ public class TabletServerResourceManager { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d71dbe64/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java index 5acf5eb..e065617 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java @@ -53,8 +53,8 @@ import org.apache.accumulo.core.security.crypto.CryptoModuleParameters; import org.apache.accumulo.core.security.crypto.DefaultCryptoModule; import org.apache.accumulo.core.security.crypto.NoFlushOutputStream; import org.apache.accumulo.core.util.Daemon; -import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.Pair; +import org.apache.accumulo.fate.util.LoggingRunnable; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.fs.VolumeManager; import org.apache.accumulo.server.master.state.TServerInstance;
