accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [19/34] accumulo git commit: ACCUMULO-3423 merge apache master
Date Fri, 24 Apr 2015 23:21:05 GMT
ACCUMULO-3423 merge apache master


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

Branch: refs/heads/master
Commit: 8f5e0021a11d507fa00853ce62bc36b4d6654a53
Parents: 9c2ca7a 85d254e
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Apr 14 15:14:08 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Apr 14 15:14:08 2015 -0400

----------------------------------------------------------------------
 assemble/bin/accumulo_watcher.sh                | 133 +++++++
 assemble/bin/start-server.sh                    |   9 +-
 assemble/conf/templates/accumulo-env.sh         |  14 +
 assemble/pom.xml                                |  32 ++
 assemble/src/main/assemblies/component.xml      |  11 +
 .../main/scripts/generate-versions-listing.sh   |  27 ++
 core/src/main/findbugs/exclude-filter.xml       |   5 +
 .../accumulo/core/bloomfilter/Filter.java       |   2 +
 .../apache/accumulo/core/cli/ClientOpts.java    |  45 +--
 .../accumulo/core/client/BatchDeleter.java      |   4 +-
 .../accumulo/core/client/BatchScanner.java      |  16 +-
 .../accumulo/core/client/IteratorSetting.java   |   8 +-
 .../accumulo/core/client/ScannerBase.java       |  30 +-
 .../core/client/admin/TableOperations.java      |   2 +-
 .../core/client/impl/ClientContext.java         |  10 +-
 .../client/impl/MultiTableBatchWriterImpl.java  |   4 +-
 .../accumulo/core/client/impl/ScannerImpl.java  |   7 +-
 .../core/client/impl/ScannerIterator.java       |   6 +-
 .../core/client/impl/ScannerOptions.java        |  22 +-
 .../core/client/impl/TableOperationsImpl.java   | 218 ----------
 .../client/impl/TabletServerBatchReader.java    |   4 +-
 .../client/impl/TabletServerBatchWriter.java    |   6 +-
 .../core/client/impl/TimeoutTabletLocator.java  |   4 -
 .../core/client/lexicoder/AbstractEncoder.java  |  24 +-
 .../core/client/lexicoder/BytesLexicoder.java   |   7 +-
 .../core/client/lexicoder/ListLexicoder.java    |  12 +-
 .../core/client/lexicoder/UUIDLexicoder.java    |  10 +-
 .../core/client/mapred/AbstractInputFormat.java |  11 +-
 .../client/mapred/AccumuloOutputFormat.java     |  32 +-
 .../client/mapreduce/AbstractInputFormat.java   |  12 +-
 .../client/mapreduce/AccumuloOutputFormat.java  |  32 +-
 .../core/client/mapreduce/InputFormatBase.java  |   9 -
 .../core/client/mapreduce/InputTableConfig.java |  12 -
 .../core/client/mapreduce/RangeInputSplit.java  |  10 +-
 .../mapreduce/lib/impl/InputConfigurator.java   |   3 +-
 .../core/client/mock/MockConfiguration.java     |  23 +-
 .../client/security/tokens/DelegationToken.java |   4 +-
 .../client/security/tokens/KerberosToken.java   |  13 +-
 .../client/security/tokens/PasswordToken.java   |   6 +-
 .../core/conf/AccumuloConfiguration.java        |  56 ++-
 .../accumulo/core/conf/ConfigurationCopy.java   |   6 +-
 .../accumulo/core/conf/ConfigurationDocGen.java |   2 +-
 .../core/conf/DefaultConfiguration.java         |   6 +-
 .../org/apache/accumulo/core/conf/Property.java |  14 +-
 .../accumulo/core/conf/SiteConfiguration.java   |   7 +-
 .../accumulo/core/data/ArrayByteSequence.java   |   1 +
 .../apache/accumulo/core/data/ByteSequence.java |   9 +-
 .../org/apache/accumulo/core/data/Column.java   |   7 +-
 .../accumulo/core/data/ComparableBytes.java     |   1 +
 .../java/org/apache/accumulo/core/data/Key.java |  13 -
 .../apache/accumulo/core/data/KeyExtent.java    |  12 -
 .../org/apache/accumulo/core/data/Mutation.java |  43 +-
 .../org/apache/accumulo/core/data/Value.java    |   2 +
 .../accumulo/core/file/BloomFilterLayer.java    |   2 +-
 .../file/blockfile/cache/CachedBlockQueue.java  |   1 +
 .../file/blockfile/cache/LruBlockCache.java     |  30 +-
 .../file/blockfile/impl/CachableBlockFile.java  |   9 +-
 .../core/file/rfile/bcfile/CompareUtils.java    |   1 +
 .../core/file/rfile/bcfile/Compression.java     |   1 +
 .../accumulo/core/file/rfile/bcfile/Utils.java  |   6 -
 .../accumulo/core/iterators/DebugIterator.java  |   1 +
 .../core/iterators/SortedKeyValueIterator.java  |   3 +-
 .../core/iterators/TypedValueCombiner.java      |   2 +-
 .../iterators/aggregation/LongSummation.java    |   4 +-
 .../aggregation/NumArraySummation.java          |   3 +
 .../iterators/aggregation/NumSummation.java     |   3 +
 .../core/iterators/aggregation/StringMax.java   |   3 +
 .../core/iterators/aggregation/StringMin.java   |   3 +
 .../iterators/aggregation/StringSummation.java  |   3 +
 .../core/iterators/conf/ColumnUtil.java         |   4 +
 .../iterators/system/ColumnQualifierFilter.java |   1 +
 .../core/iterators/system/CountingIterator.java |   1 +
 .../core/iterators/system/DeletingIterator.java |   1 +
 .../core/iterators/system/MultiIterator.java    |   1 +
 .../iterators/system/SequenceFileIterator.java  |   6 +
 .../system/SourceSwitchingIterator.java         |   2 +-
 .../iterators/user/RowEncodingIterator.java     |   3 -
 .../core/metadata/MetadataLocationObtainer.java |   4 +-
 .../security/crypto/BlockedInputStream.java     |   2 +
 .../CachingHDFSSecretKeyEncryptionStrategy.java |  14 +-
 .../crypto/DiscardCloseOutputStream.java        |   1 +
 .../NonCachingSecretKeyEncryptionStrategy.java  |  14 +-
 .../thrift/TDelegationTokenOptions.java         | 399 -------------------
 .../accumulo/core/trace/CountSampler.java       |   3 +
 .../accumulo/core/trace/DistributedTrace.java   |   3 +-
 .../accumulo/core/trace/ProbabilitySampler.java |  30 ++
 .../org/apache/accumulo/core/util/CleanUp.java  |   2 +-
 .../accumulo/core/util/NamingThreadFactory.java |   1 +
 .../org/apache/accumulo/core/util/Stat.java     |   1 +
 .../accumulo/core/util/UtilWaitThread.java      |   2 +-
 .../core/util/format/BinaryFormatter.java       |   1 +
 .../accumulo/core/client/TestThrift1474.java    |   1 +
 .../core/client/impl/ClientContextTest.java     |   7 +-
 .../core/client/impl/ScannerOptionsTest.java    |  24 ++
 .../client/lexicoder/ListLexicoderTest.java     |  10 +-
 .../mapred/AccumuloFileOutputFormatTest.java    |   6 +-
 .../client/mapred/AccumuloInputFormatTest.java  |   5 +-
 .../AccumuloMultiTableInputFormatTest.java      |   7 +-
 .../client/mapred/AccumuloOutputFormatTest.java |   7 +-
 .../mapred/AccumuloRowInputFormatTest.java      |   7 +-
 .../core/client/mapred/TokenFileTest.java       |   1 +
 .../mapreduce/AccumuloFileOutputFormatTest.java |   6 +-
 .../mapreduce/AccumuloInputFormatTest.java      |   6 +-
 .../AccumuloMultiTableInputFormatTest.java      |   7 +-
 .../mapreduce/AccumuloOutputFormatTest.java     |   7 +-
 .../mapreduce/AccumuloRowInputFormatTest.java   |   7 +-
 .../core/client/mapreduce/TokenFileTest.java    |   1 +
 .../core/conf/AccumuloConfigurationTest.java    |  17 +
 .../core/conf/DefaultConfigurationTest.java     |   7 +-
 .../core/conf/ObservableConfigurationTest.java  |   4 +-
 .../core/conf/SiteConfigurationTest.java        |   7 +-
 .../apache/accumulo/core/data/MutationTest.java |  28 ++
 .../apache/accumulo/core/data/ValueTest.java    |   1 +
 .../core/iterators/IteratorUtilTest.java        |   9 +
 .../iterators/aggregation/NumSummationTest.java |   2 +-
 .../core/iterators/user/FilterTest.java         |   2 +
 .../iterators/user/VersioningIteratorTest.java  |   8 +-
 .../main/asciidoc/chapters/administration.txt   | 245 +++++++++++-
 docs/src/main/asciidoc/chapters/design.txt      |  25 +-
 docs/src/main/asciidoc/chapters/replication.txt |  10 +
 .../asciidoc/chapters/table_configuration.txt   |   8 +-
 .../constraints/AlphaNumKeyConstraint.java      |  26 +-
 .../constraints/NumericValueConstraint.java     |  24 +-
 .../simple/filedata/ChunkInputStream.java       |   2 +-
 .../examples/simple/shell/DebugCommand.java     |   3 +
 .../simple/shell/ExampleShellExtension.java     |  37 ++
 .../simple/shell/MyAppShellExtension.java       |  33 --
 ...ache.accumulo.core.util.shell.ShellExtension |   1 -
 .../constraints/AlphaNumKeyConstraintTest.java  |  53 +++
 .../constraints/NumericValueConstraintTest.java |  51 +++
 .../simple/filedata/ChunkInputFormatTest.java   |   5 +-
 .../simple/filedata/ChunkInputStreamTest.java   |   4 +-
 .../org/apache/accumulo/fate/AdminUtil.java     |   2 +-
 .../java/org/apache/accumulo/fate/TStore.java   |   7 -
 .../java/org/apache/accumulo/fate/ZooStore.java |   1 +
 .../accumulo/fate/util/LoggingRunnable.java     |   4 +-
 .../accumulo/fate/util/UtilWaitThread.java      |   2 +-
 .../fate/zookeeper/IZooReaderWriter.java        |   1 +
 .../apache/accumulo/fate/zookeeper/ZooLock.java |   1 +
 .../fate/zookeeper/ZooReaderWriter.java         |   5 -
 .../apache/accumulo/fate/AgeOffStoreTest.java   |   1 +
 .../maven/plugin/AbstractAccumuloMojo.java      |  10 +
 .../apache/accumulo/maven/plugin/StartMojo.java |  16 +-
 .../apache/accumulo/maven/plugin/StopMojo.java  |   6 +-
 .../apache/accumulo/cluster/ClusterUser.java    |   4 +-
 .../accumulo/cluster/RemoteShellOptions.java    |   2 +-
 .../impl/MiniAccumuloClusterImpl.java           |  10 +-
 pom.xml                                         |  24 +-
 .../accumulo/server/AccumuloServerContext.java  |   2 +-
 .../accumulo/server/client/BulkImporter.java    |   6 +-
 .../server/conf/NamespaceConfiguration.java     |  19 +-
 .../server/conf/TableConfiguration.java         |   7 +-
 .../server/conf/ZooCachePropertyAccessor.java   |   7 +-
 .../accumulo/server/conf/ZooConfiguration.java  |  12 +-
 .../server/constraints/MetadataConstraints.java |   8 +-
 .../server/data/ServerColumnUpdate.java         |   1 +
 .../org/apache/accumulo/server/fs/FileRef.java  |   1 +
 .../server/fs/PreferredVolumeChooser.java       |   7 +-
 .../iterators/MetadataBulkLoadFilter.java       |   2 +-
 .../accumulo/server/master/LiveTServerSet.java  |   2 +-
 .../master/balancer/ChaoticLoadBalancer.java    |   6 +-
 .../server/master/state/DeadServerList.java     |   2 +-
 .../server/master/state/TabletMigration.java    |   1 +
 .../accumulo/server/monitor/LogService.java     |   2 +-
 .../server/problems/ProblemReports.java         |   6 +-
 .../replication/ReplicaSystemFactory.java       |  43 +-
 .../server/replication/ReplicaSystemHelper.java |  18 +-
 .../server/replication/ReplicationUtil.java     |  18 +-
 .../server/replication/StatusCombiner.java      |   3 -
 .../apache/accumulo/server/rpc/RpcWrapper.java  |   4 +-
 .../server/rpc/TNonblockingServerSocket.java    |   7 +-
 .../server/security/SecurityOperation.java      |   5 +-
 .../server/security/handler/Authenticator.java  |   6 +
 .../security/handler/ZKAuthenticator.java       |  26 +-
 .../server/security/handler/ZKAuthorizor.java   |  16 +-
 .../server/security/handler/ZKPermHandler.java  |  44 +-
 .../server/security/handler/ZKSecurityTool.java |   6 +-
 .../server/tablets/UniqueNameAllocator.java     |   1 +
 .../org/apache/accumulo/server/util/Admin.java  |   8 +-
 .../accumulo/server/util/ChangeSecret.java      |   2 +
 .../accumulo/server/util/FileSystemMonitor.java |   1 +
 .../apache/accumulo/server/util/FileUtil.java   |  14 +-
 .../org/apache/accumulo/server/util/Halt.java   |   5 +-
 .../accumulo/server/util/ListInstances.java     |   2 +-
 .../server/util/MasterMetadataUtil.java         |   8 +-
 .../accumulo/server/util/MetadataTableUtil.java |   8 +-
 .../accumulo/server/util/RandomWriter.java      |   2 +-
 .../accumulo/server/util/RandomizeVolumes.java  |   2 +-
 .../org/apache/accumulo/server/util/ZooZap.java |   2 +-
 .../accumulo/server/util/time/SimpleTimer.java  |   1 +
 .../base/src/main/scripts/generate-protobuf.sh  |   4 +-
 .../server/conf/NamespaceConfigurationTest.java |  11 +-
 .../server/conf/TableConfigurationTest.java     |  11 +-
 .../conf/ZooCachePropertyAccessorTest.java      |  24 +-
 .../server/master/state/MergeInfoTest.java      |  50 +++
 .../server/replication/ReplicationUtilTest.java | 113 ++++++
 .../security/handler/ZKAuthenticatorTest.java   |   2 +-
 .../accumulo/server/util/FileUtilTest.java      |   4 +-
 .../server/util/time/BaseRelativeTimeTest.java  |   1 +
 .../server/util/time/SimpleTimerTest.java       |   2 +
 .../accumulo/gc/SimpleGarbageCollector.java     |  20 +-
 .../java/org/apache/accumulo/master/Master.java |   2 +-
 .../master/MasterClientServiceHandler.java      |   6 +-
 .../master/recovery/RecoveryManager.java        |   2 +-
 .../master/replication/ReplicationDriver.java   |   4 +-
 .../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 +-
 .../accumulo/master/state/MergeInfoTest.java    |  76 ----
 .../org/apache/accumulo/monitor/Monitor.java    |   7 +-
 .../monitor/servlets/trace/ListType.java        |   1 +
 .../monitor/servlets/trace/NullScanner.java     |   4 +
 .../monitor/servlets/trace/ShowTrace.java       |  97 ++---
 .../monitor/servlets/trace/Summary.java         |   1 +
 .../accumulo/tracer/AsyncSpanReceiver.java      |  15 +-
 .../accumulo/tracer/SendSpansViaThrift.java     |   2 +-
 .../org/apache/accumulo/tracer/TraceDump.java   |  19 +-
 .../org/apache/accumulo/tracer/TraceServer.java |   2 +-
 .../apache/accumulo/tracer/TraceTableStats.java | 157 ++++++++
 .../org/apache/accumulo/tracer/TracerTest.java  |   1 +
 .../tserver/ConditionalMutationSet.java         |   1 +
 .../apache/accumulo/tserver/FileManager.java    |   8 +-
 .../apache/accumulo/tserver/InMemoryMap.java    |   2 +-
 .../org/apache/accumulo/tserver/MemKey.java     |   1 +
 .../apache/accumulo/tserver/TabletServer.java   |  46 ++-
 .../tserver/TabletServerResourceManager.java    |   2 +-
 .../apache/accumulo/tserver/WriteTracker.java   |   2 +-
 .../ConfigurableCompactionStrategy.java         |   1 +
 .../tserver/constraints/ConstraintChecker.java  |   4 +-
 .../constraints/UnsatisfiableConstraint.java    |   2 +
 .../mastermessage/SplitReportMessage.java       |   1 +
 .../mastermessage/TabletStatusMessage.java      |   1 +
 .../replication/AccumuloReplicaSystem.java      | 171 +++++++-
 .../replication/ReplicationProcessor.java       |  22 +-
 .../tserver/replication/ReplicationWorker.java  |  11 +-
 .../accumulo/tserver/tablet/Compactor.java      |  12 +-
 .../tserver/tablet/MinorCompactionTask.java     |  10 +-
 .../accumulo/tserver/tablet/MinorCompactor.java |   6 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  |  17 +-
 .../tserver/tablet/TabletCommitter.java         |   5 +
 .../accumulo/tserver/tablet/TabletMemory.java   |   2 +-
 .../replication/AccumuloReplicaSystemTest.java  |  31 ++
 .../replication/ReplicationProcessorTest.java   |   8 +-
 .../accumulo/shell/ShellCommandException.java   |   2 +
 .../java/org/apache/accumulo/shell/Token.java   |   1 +
 .../shell/commands/AddSplitsCommand.java        |   1 +
 .../shell/commands/CloneTableCommand.java       |   1 +
 .../accumulo/shell/commands/CompactCommand.java |   1 +
 .../accumulo/shell/commands/DebugCommand.java   |   1 +
 .../shell/commands/DeleteManyCommand.java       |   1 +
 .../shell/commands/ExportTableCommand.java      |   1 +
 .../accumulo/shell/commands/FlushCommand.java   |   1 +
 .../shell/commands/FormatterCommand.java        |   2 +
 .../accumulo/shell/commands/HelpCommand.java    |   3 +
 .../shell/commands/ListShellIterCommand.java    |   1 +
 .../accumulo/shell/commands/MaxRowCommand.java  |   1 +
 .../accumulo/shell/commands/MergeCommand.java   |   1 +
 .../accumulo/shell/commands/OfflineCommand.java |   1 +
 .../accumulo/shell/commands/ScriptCommand.java  |   3 +
 .../ShellPluginConfigurationCommand.java        |   8 +-
 .../accumulo/shell/commands/TraceCommand.java   |   1 +
 .../apache/accumulo/shell/mock/MockShell.java   |   1 +
 .../vfs/AccumuloReloadingVFSClassLoader.java    |   4 +-
 .../vfs/providers/HdfsFileObject.java           |  61 ---
 .../vfs/providers/HdfsFileProvider.java         |  10 -
 .../vfs/providers/HdfsFileSystem.java           |  12 -
 .../vfs/providers/HdfsRandomAccessContent.java  | 102 -----
 .../vfs/providers/VfsClassLoaderTest.java       |   3 +
 .../accumulo/test/EstimateInMemMapOverhead.java |  24 ++
 .../accumulo/test/FaultyConditionalWriter.java  |   2 +
 .../accumulo/test/functional/DropModIter.java   |   1 +
 .../accumulo/test/randomwalk/Environment.java   |  36 +-
 .../test/randomwalk/concurrent/Config.java      |   5 +-
 .../test/randomwalk/conditional/Transfer.java   |   1 +
 .../randomwalk/security/SecurityFixture.java    |   8 +
 .../randomwalk/sequential/MapRedVerify.java     |   3 +
 .../randomwalk/sequential/MapRedVerifyTool.java |  56 ++-
 .../test/stress/random/RandomByteArrays.java    |   1 +
 .../accumulo/test/stress/random/Scan.java       |   2 +
 .../accumulo/harness/AccumuloClusterIT.java     |   2 +-
 .../accumulo/harness/SharedMiniClusterIT.java   |   7 +-
 .../conf/AccumuloMiniClusterConfiguration.java  |   2 +-
 .../StandaloneAccumuloClusterConfiguration.java |   2 +-
 .../accumulo/test/ConditionalWriterIT.java      |   2 +-
 .../apache/accumulo/test/MetaGetsReadersIT.java |   3 +-
 .../accumulo/test/MultiTableRecoveryIT.java     |   2 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  69 ++++
 .../accumulo/test/TabletServerGivesUpIT.java    |   1 +
 .../test/replication/KerberosReplicationIT.java | 232 +++++++++++
 .../test/security/KerberosClientOptsTest.java   |  89 +++++
 .../apache/accumulo/test/util/CertUtils.java    |   5 +-
 .../apache/accumulo/trace/instrument/Span.java  |   7 +
 297 files changed, 2840 insertions(+), 1723 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 943bf19,08ba3a2..7f8726f
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -342,8 -346,9 +346,9 @@@ public enum Property 
        + "no longer in use are removed from the filesystem."),
    GC_PORT("gc.port.client", "50091", PropertyType.PORT, "The listening port for the garbage
collector's monitor service"),
    GC_DELETE_THREADS("gc.threads.delete", "16", PropertyType.COUNT, "The number of threads
used to delete files"),
 -  GC_TRASH_IGNORE("gc.trash.ignore", "false", PropertyType.BOOLEAN, "Do not use the Trash,
even if it is configured"),
 -  GC_FILE_ARCHIVE("gc.file.archive", "false", PropertyType.BOOLEAN, "Archive any files/directories
instead of moving to the HDFS trash or deleting"),
 +  GC_TRASH_IGNORE("gc.trash.ignore", "false", PropertyType.BOOLEAN, "Do not use the Trash,
even if it is configured."),
 +  GC_FILE_ARCHIVE("gc.file.archive", "false", PropertyType.BOOLEAN, "Archive any files/directories
instead of moving to the HDFS trash or deleting."),
+   GC_TRACE_PERCENT("gc.trace.percent", "0.01", PropertyType.FRACTION, "Percent of gc cycles
to trace"),
  
    // properties that are specific to the monitor server behavior
    MONITOR_PREFIX("monitor.", null, PropertyType.PREFIX, "Properties in this category affect
the behavior of the monitor web server."),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/server/master/src/main/java/org/apache/accumulo/master/Master.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/server/master/src/main/java/org/apache/accumulo/master/state/MergeStats.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index fb0adb8,2342789..febd4f7
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@@ -2440,9 -2440,9 +2439,9 @@@ public class Tablet implements TabletCo
      return currentLogs.size();
    }
  
-   /* don't release the lock if this method returns true for success; instead, the caller
should clean up by calling finishUpdatingLogsUsed() */
+   // don't release the lock if this method returns true for success; instead, the caller
should clean up by calling finishUpdatingLogsUsed()
    @Override
 -  public boolean beginUpdatingLogsUsed(InMemoryMap memTable, Collection<DfsLogger>
more, boolean mincFinish) {
 +  public boolean beginUpdatingLogsUsed(InMemoryMap memTable, DfsLogger more, boolean mincFinish)
{
  
      boolean releaseLock = true;
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f5e0021/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------


Mime
View raw message