Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D6DED85B for ; Mon, 29 Oct 2012 15:23:27 +0000 (UTC) Received: (qmail 27284 invoked by uid 500); 29 Oct 2012 15:23:27 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 27187 invoked by uid 500); 29 Oct 2012 15:23:27 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 27029 invoked by uid 99); 29 Oct 2012 15:23:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2012 15:23:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Oct 2012 15:23:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1BA6723888E4 for ; Mon, 29 Oct 2012 15:22:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1403360 [1/7] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ assemble/platform/debian/ assemble/platform/debian/init.d/ bin/ conf/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ ... Date: Mon, 29 Oct 2012 15:22:31 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121029152237.1BA6723888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vines Date: Mon Oct 29 15:22:24 2012 New Revision: 1403360 URL: http://svn.apache.org/viewvc?rev=1403360&view=rev Log: Merging ACCUMULO-259 up to date Added: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java - copied unchanged from r1403334, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java - copied unchanged from r1403334, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java - copied unchanged from r1403334, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mock/TransformIterator.java - copied unchanged from r1403334, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/TransformIterator.java Removed: accumulo/branches/ACCUMULO-259/README_UBUNTU accumulo/branches/ACCUMULO-259/server/src/main/c++/mlock/ Modified: accumulo/branches/ACCUMULO-259/ (props changed) accumulo/branches/ACCUMULO-259/.gitignore accumulo/branches/ACCUMULO-259/assemble/ (props changed) accumulo/branches/ACCUMULO-259/assemble/build.sh accumulo/branches/ACCUMULO-259/assemble/platform/debian/gc-only-init.sh accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-gc (contents, props changed) accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-master (contents, props changed) accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-monitor (contents, props changed) accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tracer (contents, props changed) accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tserver (contents, props changed) accumulo/branches/ACCUMULO-259/assemble/platform/debian/master-only-init.sh accumulo/branches/ACCUMULO-259/assemble/platform/debian/monitor-only-init.sh accumulo/branches/ACCUMULO-259/assemble/platform/debian/stand-alone-init.sh accumulo/branches/ACCUMULO-259/assemble/platform/debian/tracer-only-init.sh accumulo/branches/ACCUMULO-259/assemble/platform/debian/tserver-only-init.sh accumulo/branches/ACCUMULO-259/bin/start-server.sh accumulo/branches/ACCUMULO-259/conf/accumulo.policy.example (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-env.sh (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/gc (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/masters (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/monitor (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/slaves (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/tracers (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-env.sh (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/gc (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/masters (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/monitor (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/slaves (props changed) accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/tracers (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-env.sh (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/gc (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/masters (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/monitor (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/slaves (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/tracers (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-env.sh (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/gc (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/masters (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/monitor (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/slaves (props changed) accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/tracers (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-env.sh (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/gc (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/masters (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/monitor (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/slaves (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/tracers (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-env.sh (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/gc (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/masters (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/monitor (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/slaves (props changed) accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/tracers (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-env.sh (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/gc (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/masters (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/monitor (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/slaves (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/tracers (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-env.sh (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/gc (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/masters (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/monitor (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/slaves (props changed) accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/tracers (props changed) accumulo/branches/ACCUMULO-259/core/ (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/system/StatsIterator.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TableOperation.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java (contents, props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java (contents, props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/format/HexFormatter.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/DefaultScanInterpreter.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/HexScanInterpreter.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/interpret/ScanInterpreter.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptions.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExportTableCommand.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ImportTableCommand.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InterpreterCommand.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ShellPluginConfigurationCommand.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java (props changed) accumulo/branches/ACCUMULO-259/core/src/main/thrift/client.thrift accumulo/branches/ACCUMULO-259/core/src/main/thrift/thrift.sh accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/file/rfile/RelativeKeyTest.java (props changed) accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java (contents, props changed) accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java (props changed) accumulo/branches/ACCUMULO-259/docs/README_UBUNTU (props changed) accumulo/branches/ACCUMULO-259/docs/examples/README.export (props changed) accumulo/branches/ACCUMULO-259/docs/examples/README.maxmutation (props changed) accumulo/branches/ACCUMULO-259/docs/src/developer_manual/build.sh (props changed) accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java (props changed) accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/branches/ACCUMULO-259/pom.xml accumulo/branches/ACCUMULO-259/server/ (props changed) accumulo/branches/ACCUMULO-259/server/src/main/c++/Makefile accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/data/ServerMutation.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/LogFileInputFormat.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/LogFileOutputFormat.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/package-info.java (contents, props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/BulkFailedCopyProcessor.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletMutations.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/GenSplits.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/BadIteratorMincTest.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/FateStarvationTest.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/SlowConstraint.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/SparseColumnFamilyTest.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/TimeoutTest.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/performance/metadata/MetadataBatchScanTest.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StartAll.java (contents, props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/StopTabletServer.java (contents, props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/CompactFilter.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/DeleteSomeDocs.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ExportIndex.java (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java (props changed) accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/data/ServerMutationTest.java accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java accumulo/branches/ACCUMULO-259/src/ (props changed) accumulo/branches/ACCUMULO-259/test/compat/japi-compliance/README (props changed) accumulo/branches/ACCUMULO-259/test/compat/japi-compliance/japi-accumulo-1.4.xml (props changed) accumulo/branches/ACCUMULO-259/test/compat/japi-compliance/japi-accumulo-1.5.xml (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/config.py (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/simple/baditerminc.py (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/simple/combiner.py (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/simple/examples.py (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/simple/fateStartvation.py (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/simple/sparseColumnFamily.py (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/simple/timeout.py (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/stress/migrations.py (props changed) accumulo/branches/ACCUMULO-259/test/system/continuous/agitator.pl accumulo/branches/ACCUMULO-259/test/system/randomwalk/bin/reset-cluster.sh (props changed) accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java Propchange: accumulo/branches/ACCUMULO-259/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.4.2/src:r1399210,1402681 Merged /accumulo/branches/1.4/src:r1399211,1400976,1402571,1402682 Merged /accumulo/branches/1.4.2:r1399210,1402681 Merged /accumulo/trunk:r1398540-1403334 Merged /accumulo/branches/1.4:r1398514,1398801,1399211,1399717,1400976,1402571,1402682 Modified: accumulo/branches/ACCUMULO-259/.gitignore URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/.gitignore?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/.gitignore (original) +++ accumulo/branches/ACCUMULO-259/.gitignore Mon Oct 29 15:22:24 2012 @@ -70,82 +70,59 @@ /lib/native /lib/*.jar -# /src/assemble/ -/src/assemble/target -/src/assemble/.settings -/src/assemble/.project - -# /src/core/ -/src/core/target -/src/core/.settings -/src/core/.project -/src/core/.classpath - -# /src/examples/ -/src/examples/target -/src/examples/.settings -/src/examples/.classpath -/src/examples/.project - -# /src/examples/simple/ -/src/examples/simple/target -/src/examples/simple/.classpath -/src/examples/simple/.project -/src/examples/simple/.settings/ - - -# /src/examples/wikisearch/ -/src/examples/wikisearch/target -/src/examples/wikisearch/.project -/src/examples/wikisearch/.settings/ - -# /src/examples/wikisearch/ingest/ -/src/examples/wikisearch/ingest/target -/src/examples/wikisearch/ingest/lib -/src/examples/wikisearch/ingest/.classpath -/src/examples/wikisearch/ingest/.project -/src/examples/wikisearch/ingest/.settings/ - - -# /src/examples/wikisearch/query/ -/src/examples/wikisearch/query/lib -/src/examples/wikisearch/query/target -/src/examples/wikisearch/query/.classpath -/src/examples/wikisearch/query/.project -/src/examples/wikisearch/query/.settings/ - - -# /src/examples/wikisearch/query-war/ -/src/examples/wikisearch/query-war/target -/src/examples/wikisearch/query-war/.classpath -/src/examples/wikisearch/query-war/.project -/src/examples/wikisearch/query-war/.settings/ - - -# /src/server/ -/src/server/target -/src/server/.project -/src/server/.settings -/src/server/.classpath - -# /src/server/src/main/c++/mlock/ -/src/server/src/main/c++/mlock/*.jnilib -/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h - -# /src/server/src/main/c++/nativeMap/ -/src/server/src/main/c++/nativeMap/*.jnilib - -# /src/start/ -/src/start/target -/src/start/.classpath -/src/start/.project -/src/start/.settings - -# /src/trace/ -/src/trace/target -/src/trace/.classpath -/src/trace/.project -/src/trace/.settings +# /assemble/ +/assemble/target +/assemble/.settings +/assemble/.project + +# /core/ +/core/target +/core/.settings +/core/.project +/core/.classpath + +# /examples/ +/examples/target +/examples/.settings +/examples/.classpath +/examples/.project + +# /examples/simple/ +/examples/simple/target +/examples/simple/.classpath +/examples/simple/.project +/examples/simple/.settings/ + +# /fate/ +/fate/target +/fate/.settings +/fate/.classpath +/fate/.project + +# /server/ +/server/target +/server/.project +/server/.settings +/server/.classpath + +# /server/src/main/c++/mlock/ +/server/src/main/c++/mlock/*.jnilib +/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h + +# /server/src/main/c++/nativeMap/ +/server/src/main/c++/nativeMap/*.jnilib + +# /start/ +/start/target +/start/.classpath +/start/.project +/start/.settings + +# /trace/ +/trace/target +/trace/.classpath +/trace/.project +/trace/.settings # /test/system/auto/ /test/system/auto/*.pyc Propchange: accumulo/branches/ACCUMULO-259/assemble/ ------------------------------------------------------------------------------ Reverse-merged /incubator/accumulo/trunk/src/assemble:r1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495 Merged /accumulo/branches/1.4/src/assemble:r1399211,1400976,1402571,1402682 Merged /accumulo/trunk/assemble:r1398540-1403334 Merged /accumulo/branches/1.4/assemble:r1398801,1399211,1399717,1400976,1402571,1402682 Modified: accumulo/branches/ACCUMULO-259/assemble/build.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/build.sh?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/build.sh (original) +++ accumulo/branches/ACCUMULO-259/assemble/build.sh Mon Oct 29 15:22:24 2012 @@ -41,7 +41,7 @@ runAt() { run mvn -U clean mvn rat:check COUNT=`grep '!????' target/rat.txt | wc -l` -EXPECTED=55 +EXPECTED=53 if [ "$COUNT" -ne $EXPECTED ] then fail expected $EXPECTED files missing licenses, but saw "$COUNT" Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/gc-only-init.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/gc-only-init.sh?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/gc-only-init.sh (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/gc-only-init.sh Mon Oct 29 15:22:24 2012 @@ -1,4 +1,19 @@ #! /bin/sh +# 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. + if [ $(id -ur) -ne 0 ]; then echo "This script must be run as root" 1>&2 exit 1 Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-gc URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-gc?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-gc (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-gc Mon Oct 29 15:22:24 2012 @@ -9,7 +9,20 @@ # Description: The accumulo garbage collector handles cleanup of old walogs and files in hdfs ### END INIT INFO -# Author: John Vines +# 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. # Do NOT "set -e" install -d -m 0775 -o root -g accumulo /var/run/accumulo Propchange: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-gc ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-master URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-master?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-master (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-master Mon Oct 29 15:22:24 2012 @@ -9,7 +9,20 @@ # Description: The accumulo master manages tablet assignment and balance to accumulo ### END INIT INFO -# Author: John Vines +# 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. # Do NOT "set -e" install -d -m 0775 -o root -g accumulo /var/run/accumulo Propchange: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-master ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-monitor URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-monitor?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-monitor (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-monitor Mon Oct 29 15:22:24 2012 @@ -9,7 +9,20 @@ # Description: The accumulo monitor provides a convenient mechanism for monitoring accumulo ### END INIT INFO -# Author: John Vines +# 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. # Do NOT "set -e" install -d -m 0775 -o root -g accumulo /var/run/accumulo Propchange: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-monitor ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tracer URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tracer?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tracer (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tracer Mon Oct 29 15:22:24 2012 @@ -9,7 +9,20 @@ # Description: The accumulo tracer provides a mechanism for tracing accumulo calls ### END INIT INFO -# Author: John Vines +# 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. # Do NOT "set -e" install -d -m 0775 -o root -g accumulo /var/run/accumulo Propchange: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tracer ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tserver URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tserver?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tserver (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tserver Mon Oct 29 15:22:24 2012 @@ -9,7 +9,20 @@ # Description: The accumulo tserver process ### END INIT INFO -# Author: John Vines +# 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. # Do NOT "set -e" install -d -m 0775 -o root -g accumulo /var/run/accumulo Propchange: accumulo/branches/ACCUMULO-259/assemble/platform/debian/init.d/accumulo-tserver ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/master-only-init.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/master-only-init.sh?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/master-only-init.sh (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/master-only-init.sh Mon Oct 29 15:22:24 2012 @@ -1,4 +1,19 @@ #! /bin/sh +# 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. + if [ $(id -ur) -ne 0 ]; then echo "This script must be run as root" 1>&2 exit 1 Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/monitor-only-init.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/monitor-only-init.sh?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/monitor-only-init.sh (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/monitor-only-init.sh Mon Oct 29 15:22:24 2012 @@ -1,4 +1,19 @@ #! /bin/sh +# 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. + if [ $(id -ur) -ne 0 ]; then echo "This script must be run as root" 1>&2 exit 1 Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/stand-alone-init.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/stand-alone-init.sh?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/stand-alone-init.sh (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/stand-alone-init.sh Mon Oct 29 15:22:24 2012 @@ -1,4 +1,19 @@ #! /bin/sh +# 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. + if [ $(id -ur) -ne 0 ]; then echo "This script must be run as root" 1>&2 exit 1 Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/tracer-only-init.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/tracer-only-init.sh?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/tracer-only-init.sh (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/tracer-only-init.sh Mon Oct 29 15:22:24 2012 @@ -1,4 +1,19 @@ #! /bin/sh +# 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. + if [ $(id -ur) -ne 0 ]; then echo "This script must be run as root" 1>&2 exit 1 Modified: accumulo/branches/ACCUMULO-259/assemble/platform/debian/tserver-only-init.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/assemble/platform/debian/tserver-only-init.sh?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/assemble/platform/debian/tserver-only-init.sh (original) +++ accumulo/branches/ACCUMULO-259/assemble/platform/debian/tserver-only-init.sh Mon Oct 29 15:22:24 2012 @@ -1,4 +1,20 @@ #! /bin/sh + +# 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. + if [ $(id -ur) -ne 0 ]; then echo "This script must be run as root" 1>&2 exit 1 Modified: accumulo/branches/ACCUMULO-259/bin/start-server.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/bin/start-server.sh?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/bin/start-server.sh (original) +++ accumulo/branches/ACCUMULO-259/bin/start-server.sh Mon Oct 29 15:22:24 2012 @@ -37,7 +37,18 @@ then fi SLAVES=`wc -l < ${ACCUMULO_HOME}/conf/slaves` -if [ $HOST == localhost -o $HOST == "`hostname`" ] +IFCONFIG=/sbin/ifconfig +if [ ! -x $IFCONFIG ] +then + IFCONFIG='/bin/netstat -ie' +fi +ip=`$IFCONFIG 2>/dev/null| grep inet[^6] | awk '{print $2}' | sed 's/addr://' | grep -v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1` +if [ $? != 0 ] +then + ip=`python -c 'import socket as s; print s.gethostbyname(s.getfqdn())'` +fi + +if [ $HOST == localhost -o $HOST == "`hostname`" -o $HOST == "$ip" ] then PID=`ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1` else @@ -45,21 +56,21 @@ else fi if [ -z $PID ]; then - echo "Starting $LONGNAME on $HOST" - if [ $HOST == localhost -o $HOST == "`hostname`" ] - then - ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out 2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err & - MAX_FILES_OPEN=`bash -c 'ulimit -n'` - else - $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out 2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &" - MAX_FILES_OPEN=`$SSH $HOST "bash -c 'ulimit -n'"` - fi + echo "Starting $LONGNAME on $HOST" + if [ $HOST == localhost -o $HOST == "`hostname`" -o $HOST == "$ip" ] + then + ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out 2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err & + MAX_FILES_OPEN=`bash -c 'ulimit -n'` + else + $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out 2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &" + MAX_FILES_OPEN=`$SSH $HOST "bash -c 'ulimit -n'"` + fi - if [ -n "$MAX_FILES_OPEN" ] && [ -n "$SLAVES" ] ; then - if [ "$SLAVES" -gt 10 ] && [ "$MAX_FILES_OPEN" -lt 65536 ]; then - echo "WARN : Max files open on $HOST is $MAX_FILES_OPEN, recommend 65536" - fi + if [ -n "$MAX_FILES_OPEN" ] && [ -n "$SLAVES" ] ; then + if [ "$SLAVES" -gt 10 ] && [ "$MAX_FILES_OPEN" -lt 65536 ]; then + echo "WARN : Max files open on $HOST is $MAX_FILES_OPEN, recommend 65536" fi + fi else - echo "$HOST : $LONGNAME already running (${PID})" + echo "$HOST : $LONGNAME already running (${PID})" fi Propchange: accumulo/branches/ACCUMULO-259/conf/accumulo.policy.example ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-env.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/gc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/masters ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/monitor ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/slaves ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/tracers ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-env.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/gc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/masters ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/monitor ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/slaves ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/tracers ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-env.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/gc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/masters ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/monitor ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/slaves ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/tracers ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-env.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/gc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/masters ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/monitor ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/slaves ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/tracers ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-env.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/gc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/masters ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/monitor ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/slaves ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/tracers ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-env.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/gc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/masters ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/monitor ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/slaves ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/tracers ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-env.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/gc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/masters ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/monitor ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/slaves ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/tracers ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-env.sh ------------------------------------------------------------------------------ svn:executable = * Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/gc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/masters ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/monitor ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/slaves ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/tracers ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/core/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/core:r1398540-1403334 Merged /accumulo/branches/1.4/core:r1398514,1398801,1399211,1399717,1400976,1402571,1402682 Merged /accumulo/branches/1.4/src/core:r1399211,1400976,1402571,1402682 Merged /accumulo/branches/1.4.2/src/core:r1399210,1402681 Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/TimedOutException.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/BatchWriterImpl.java Mon Oct 29 15:22:24 2012 @@ -30,7 +30,7 @@ public class BatchWriterImpl implements private TabletServerBatchWriter bw; public BatchWriterImpl(Instance instance, AuthInfo credentials, String table, BatchWriterConfig config) { - ArgumentChecker.notNull(instance, credentials, table); + ArgumentChecker.notNull(instance, credentials, table, config); this.table = table; this.bw = new TabletServerBatchWriter(instance, credentials, config); } Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java Mon Oct 29 15:22:24 2012 @@ -706,12 +706,12 @@ public class TabletServerBatchReaderIter } catch (TApplicationException e) { log.debug("Server : " + server + " msg : " + e.getMessage(), e); throw new AccumuloServerException(server, e); - } catch (TException e) { + } catch (NoSuchScanIDException e) { log.debug("Server : " + server + " msg : " + e.getMessage(), e); - timeoutTracker.errorOccured(e); throw new IOException(e); - } catch (NoSuchScanIDException e) { + } catch (TException e) { log.debug("Server : " + server + " msg : " + e.getMessage(), e); + timeoutTracker.errorOccured(e); throw new IOException(e); } finally { ThriftTransportPool.getInstance().returnTransport(transport); Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java Mon Oct 29 15:22:24 2012 @@ -909,10 +909,10 @@ public class TabletServerBatchWriter { } catch (ThriftSecurityException e) { updateAuthorizationFailures(tabMuts.keySet()); throw new AccumuloSecurityException(e.user, e.code, e); - } catch (TException e) { - throw new IOException(e); } catch (NoSuchScanIDException e) { throw new IOException(e); + } catch (TException e) { + throw new IOException(e); } finally { ThriftTransportPool.getInstance().returnTransport(transport); } Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java Mon Oct 29 15:22:24 2012 @@ -149,12 +149,12 @@ public class ThriftScanner { throw new AccumuloServerException(server, tae); } catch (TooManyFilesException e) { log.debug("Tablet (" + extent + ") has too many files " + server + " : " + e); - } catch (TException e) { - log.debug("Error getting transport to " + server + " : " + e); } catch (ThriftSecurityException e) { log.warn("Security Violation in scan request to " + server + ": " + e); throw new AccumuloSecurityException(e.user, e.code, e); - } + } catch (TException e) { + log.debug("Error getting transport to " + server + " : " + e); + } throw new AccumuloException("getBatchFromServer: failed"); } @@ -321,24 +321,6 @@ public class ThriftScanner { throw new IsolationException(); UtilWaitThread.sleep(100); - } catch (TException e) { - TabletLocator.getInstance(instance, credentials, scanState.tableName).invalidateCache(loc.tablet_location); - error = "Scan failed, thrift error " + e.getClass().getName() + " " + e.getMessage() + " " + loc; - if (!error.equals(lastError)) - log.debug(error); - else if (log.isTraceEnabled()) - log.trace(error); - lastError = error; - loc = null; - - // do not want to continue using the same scan id, if a timeout occurred could cause a batch to be skipped - // because a thread on the server side may still be processing the timed out continue scan - scanState.scanID = null; - - if (scanState.isolated) - throw new IsolationException(); - - UtilWaitThread.sleep(100); } catch (NoSuchScanIDException e) { error = "Scan failed, no such scan id " + scanState.scanID + " " + loc; if (!error.equals(lastError)) @@ -374,6 +356,24 @@ public class ThriftScanner { throw new IsolationException(); UtilWaitThread.sleep(100); + } catch (TException e) { + TabletLocator.getInstance(instance, credentials, scanState.tableName).invalidateCache(loc.tablet_location); + error = "Scan failed, thrift error " + e.getClass().getName() + " " + e.getMessage() + " " + loc; + if (!error.equals(lastError)) + log.debug(error); + else if (log.isTraceEnabled()) + log.trace(error); + lastError = error; + loc = null; + + // do not want to continue using the same scan id, if a timeout occurred could cause a batch to be skipped + // because a thread on the server side may still be processing the timed out continue scan + scanState.scanID = null; + + if (scanState.isolated) + throw new IsolationException(); + + UtilWaitThread.sleep(100); } finally { scanLocation.stop(); } Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java?rev=1403360&r1=1403359&r2=1403360&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java Mon Oct 29 15:22:24 2012 @@ -95,13 +95,13 @@ public class Writer { try { updateServer(m, tabLoc.tablet_extent, tabLoc.tablet_location, credentials, instance.getConfiguration()); return; - } catch (TException e) { - log.trace("server = " + tabLoc.tablet_location, e); - TabletLocator.getInstance(instance, credentials, table).invalidateCache(tabLoc.tablet_extent); } catch (NotServingTabletException e) { log.trace("Not serving tablet, server = " + tabLoc.tablet_location); TabletLocator.getInstance(instance, credentials, table).invalidateCache(tabLoc.tablet_extent); - } + } catch (TException e) { + log.trace("server = " + tabLoc.tablet_location, e); + TabletLocator.getInstance(instance, credentials, table).invalidateCache(tabLoc.tablet_extent); + } UtilWaitThread.sleep(500); }