accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] accumulo git commit: Merge branch 'ACCUMULO-3681' of https://github.com/EdColeman/accumulo
Date Tue, 07 Apr 2015 20:32:42 GMT
Merge branch 'ACCUMULO-3681' of https://github.com/EdColeman/accumulo

This closes #24


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c138a7f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c138a7f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c138a7f5

Branch: refs/heads/master
Commit: c138a7f5dd85b1a0df1ff347b4f8f559c5462c4a
Parents: 58aad7d 26c0cae
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Apr 7 15:51:03 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Apr 7 15:51:15 2015 -0400

----------------------------------------------------------------------
 .../core/client/impl/ScannerIterator.java       |  6 +--
 .../client/impl/TabletServerBatchWriter.java    |  6 +--
 .../accumulo/core/conf/ConfigurationDocGen.java |  2 +-
 .../org/apache/accumulo/core/conf/Property.java |  4 +-
 .../accumulo/core/file/BloomFilterLayer.java    |  2 +-
 .../CachingHDFSSecretKeyEncryptionStrategy.java | 14 +++----
 .../NonCachingSecretKeyEncryptionStrategy.java  | 14 +++----
 .../accumulo/core/trace/DistributedTrace.java   |  2 +-
 .../org/apache/accumulo/core/util/CleanUp.java  |  2 +-
 .../accumulo/core/util/UtilWaitThread.java      |  2 +-
 .../iterators/aggregation/NumSummationTest.java |  2 +-
 .../iterators/user/VersioningIteratorTest.java  |  8 ++--
 .../simple/filedata/ChunkInputStreamTest.java   |  4 +-
 .../org/apache/accumulo/fate/AdminUtil.java     |  2 +-
 .../accumulo/fate/util/LoggingRunnable.java     |  2 +-
 .../accumulo/fate/util/UtilWaitThread.java      |  2 +-
 .../accumulo/server/client/BulkImporter.java    |  6 +--
 .../server/constraints/MetadataConstraints.java |  8 ++--
 .../iterators/MetadataBulkLoadFilter.java       |  2 +-
 .../accumulo/server/master/LiveTServerSet.java  |  2 +-
 .../server/master/state/DeadServerList.java     |  2 +-
 .../accumulo/server/monitor/LogService.java     |  2 +-
 .../server/problems/ProblemReports.java         |  6 +--
 .../apache/accumulo/server/rpc/RpcWrapper.java  |  4 +-
 .../server/rpc/TNonblockingServerSocket.java    |  2 +-
 .../security/handler/ZKAuthenticator.java       | 20 ++++-----
 .../server/security/handler/ZKAuthorizor.java   | 16 +++----
 .../server/security/handler/ZKPermHandler.java  | 44 ++++++++++----------
 .../server/security/handler/ZKSecurityTool.java |  6 +--
 .../org/apache/accumulo/server/util/Admin.java  |  8 ++--
 .../apache/accumulo/server/util/FileUtil.java   | 14 +++----
 .../accumulo/server/util/ListInstances.java     |  2 +-
 .../server/util/MasterMetadataUtil.java         |  8 ++--
 .../accumulo/server/util/MetadataTableUtil.java | 16 +++----
 .../accumulo/server/util/RandomWriter.java      |  2 +-
 .../accumulo/server/util/RandomizeVolumes.java  |  2 +-
 .../org/apache/accumulo/server/util/ZooZap.java |  2 +-
 .../security/handler/ZKAuthenticatorTest.java   |  2 +-
 .../accumulo/gc/SimpleGarbageCollector.java     | 16 +++----
 .../java/org/apache/accumulo/master/Master.java |  2 +-
 .../master/MasterClientServiceHandler.java      |  6 +--
 .../master/recovery/RecoveryManager.java        |  2 +-
 .../accumulo/master/state/MergeStats.java       |  2 +-
 .../accumulo/master/tableOps/BulkImport.java    |  2 +-
 .../accumulo/master/tableOps/CloneTable.java    |  2 +-
 .../master/tableOps/CreateNamespace.java        |  2 +-
 .../accumulo/master/tableOps/CreateTable.java   |  2 +-
 .../master/tableOps/DeleteNamespace.java        |  2 +-
 .../accumulo/master/tableOps/DeleteTable.java   |  2 +-
 .../accumulo/master/tableOps/ImportTable.java   | 10 ++---
 .../org/apache/accumulo/monitor/Monitor.java    |  4 +-
 .../accumulo/tracer/SendSpansViaThrift.java     |  2 +-
 .../org/apache/accumulo/tracer/TraceServer.java |  2 +-
 .../apache/accumulo/tserver/FileManager.java    |  8 ++--
 .../apache/accumulo/tserver/InMemoryMap.java    |  2 +-
 .../apache/accumulo/tserver/TabletServer.java   | 29 +++++++------
 .../tserver/TabletServerResourceManager.java    |  2 +-
 .../apache/accumulo/tserver/WriteTracker.java   |  2 +-
 .../tserver/constraints/ConstraintChecker.java  |  4 +-
 .../accumulo/tserver/tablet/Compactor.java      | 12 +++---
 .../tserver/tablet/MinorCompactionTask.java     |  2 +-
 .../accumulo/tserver/tablet/MinorCompactor.java |  6 +--
 .../accumulo/tserver/tablet/TabletMemory.java   |  2 +-
 .../ShellPluginConfigurationCommand.java        |  8 ++--
 .../vfs/AccumuloReloadingVFSClassLoader.java    |  4 +-
 .../accumulo/test/ConditionalWriterIT.java      |  2 +-
 .../apache/accumulo/test/MetaGetsReadersIT.java |  2 +-
 .../accumulo/test/MultiTableRecoveryIT.java     |  2 +-
 68 files changed, 199 insertions(+), 196 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
----------------------------------------------------------------------
diff --cc server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
index 7a8dc16,695488a..3cc762e
--- a/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
+++ b/server/tracer/src/main/java/org/apache/accumulo/tracer/SendSpansViaThrift.java
@@@ -63,11 -62,8 +63,11 @@@ public class SendSpansViaThrift extend
        TTransport transport = new TSocket(sock);
        TProtocol prot = new TBinaryProtocol(transport);
        return new Client(prot);
 +    } catch (IOException ex) {
 +      log.trace("{}", ex, ex);
 +      return null;
      } catch (Exception ex) {
-       log.error(ex.getMessage(), ex);
+       log.error("{}", ex.getMessage(), ex);
        return null;
      }
    }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c138a7f5/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
----------------------------------------------------------------------


Mime
View raw message