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 30EB1D8E0 for ; Fri, 29 Jun 2012 21:30:15 +0000 (UTC) Received: (qmail 80439 invoked by uid 500); 29 Jun 2012 21:30:15 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 80411 invoked by uid 500); 29 Jun 2012 21:30:15 -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 80402 invoked by uid 99); 29 Jun 2012 21:30:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Jun 2012 21:30:15 +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; Fri, 29 Jun 2012 21:30:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 319B823888CD for ; Fri, 29 Jun 2012 21:29:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1355566 [1/2] - in /accumulo/branches/ACCUMULO-259: ./ bin/ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/impl/ core/s... Date: Fri, 29 Jun 2012 21:29:32 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120629212942.319B823888CD@eris.apache.org> Author: vines Date: Fri Jun 29 21:29:21 2012 New Revision: 1355566 URL: http://svn.apache.org/viewvc?rev=1355566&view=rev Log: accumulo-259 one more merge due to main branch changes before I start next phase of work Added: accumulo/branches/ACCUMULO-259/fate/ (props changed) - copied from r1355556, accumulo/trunk/fate/ accumulo/branches/ACCUMULO-259/fate/pom.xml - copied unchanged from r1355556, accumulo/trunk/fate/pom.xml accumulo/branches/ACCUMULO-259/fate/src/ - copied from r1355556, accumulo/trunk/fate/src/ accumulo/branches/ACCUMULO-259/fate/src/main/ - copied from r1355556, accumulo/trunk/fate/src/main/ accumulo/branches/ACCUMULO-259/fate/src/main/java/ - copied from r1355556, accumulo/trunk/fate/src/main/java/ accumulo/branches/ACCUMULO-259/fate/src/main/java/org/ - copied from r1355556, accumulo/trunk/fate/src/main/java/org/ accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/ - copied from r1355556, accumulo/trunk/fate/src/main/java/org/apache/ accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/ - copied from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/ accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ - copied from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/Fate.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/Fate.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/Repo.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/Repo.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/StackOverflowException.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/StackOverflowException.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/TStore.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/TStore.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/util/ - copied from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/util/ accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/util/Daemon.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/util/Daemon.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ - copied from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java - copied unchanged from r1355556, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java accumulo/branches/ACCUMULO-259/fate/src/test/ - copied from r1355556, accumulo/trunk/fate/src/test/ accumulo/branches/ACCUMULO-259/fate/src/test/java/ - copied from r1355556, accumulo/trunk/fate/src/test/java/ accumulo/branches/ACCUMULO-259/fate/src/test/java/org/ - copied from r1355556, accumulo/trunk/fate/src/test/java/org/ accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/ - copied from r1355556, accumulo/trunk/fate/src/test/java/org/apache/ accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/ - copied from r1355556, accumulo/trunk/fate/src/test/java/org/apache/accumulo/ accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/fate/ - copied from r1355556, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/ accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ - copied from r1355556, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/zookeeper/ accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java - copied unchanged from r1355556, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java accumulo/branches/ACCUMULO-259/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java - copied unchanged from r1355556, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java Removed: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/IZooReader.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooReader.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Fate.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Print.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Repo.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/StackOverflowException.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/TStore.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/ZooStore.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedReadWriteLock.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/IZooReaderWriter.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReservation.java accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/zookeeper/ Modified: accumulo/branches/ACCUMULO-259/ (props changed) accumulo/branches/ACCUMULO-259/bin/tool.sh accumulo/branches/ACCUMULO-259/core/ (props changed) accumulo/branches/ACCUMULO-259/core/pom.xml accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java 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/zookeeper/ZooUtil.java accumulo/branches/ACCUMULO-259/pom.xml accumulo/branches/ACCUMULO-259/server/ (props changed) accumulo/branches/ACCUMULO-259/server/pom.xml accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Admin.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ChangeTableState.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CloneTable.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CreateTable.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/MasterRepo.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.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/security/ZKAuthenticator.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/Initialize.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/TransactionWatcher.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooCache.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java accumulo/branches/ACCUMULO-259/src/ (props changed) accumulo/branches/ACCUMULO-259/test/system/auto/simple/examples.py accumulo/branches/ACCUMULO-259/test/system/auto/simple/mapreduce.py Propchange: accumulo/branches/ACCUMULO-259/ ------------------------------------------------------------------------------ Merged /accumulo/trunk:r1355160-1355556 Modified: accumulo/branches/ACCUMULO-259/bin/tool.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/bin/tool.sh?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/bin/tool.sh (original) +++ accumulo/branches/ACCUMULO-259/bin/tool.sh Fri Jun 29 21:29:21 2012 @@ -33,6 +33,7 @@ LIB=$ACCUMULO_HOME/lib ZOOKEEPER_CMD='ls -1 $ZOOKEEPER_HOME/zookeeper-[0-9]*[^csn].jar ' CORE_CMD='ls -1 $LIB/accumulo-core-*[^cs].jar' +FATE_CMD='ls -1 $LIB/accumulo-fate-*[^cs].jar' THRIFT_CMD='ls -1 $LIB/libthrift-*[^cs].jar' CLOUDTRACE_CMD='ls -1 $LIB/cloudtrace-*[^cs].jar' @@ -46,6 +47,11 @@ if [ `eval $CORE_CMD | wc -l` != "1" ] ; exit 1 fi +if [ `eval $FATE_CMD | wc -l` != "1" ] ; then + echo "Not exactly one accumulo-fate jar in $LIB" + exit 1 +fi + if [ `eval $THRIFT_CMD | wc -l` != "1" ] ; then echo "Not exactly one thrift jar in $LIB" exit 1 @@ -58,6 +64,7 @@ fi ZOOKEEPER_LIB=`eval $ZOOKEEPER_CMD` CORE_LIB=`eval $CORE_CMD` +FATE_LIB=`eval $FATE_CMD` THRIFT_LIB=`eval $THRIFT_CMD` CLOUDTRACE_LIB=`eval $CLOUDTRACE_CMD` @@ -80,8 +87,8 @@ for arg in "$@"; do fi done -LIB_JARS="$THRIFT_LIB,$CORE_LIB,$ZOOKEEPER_LIB,$CLOUDTRACE_LIB" -H_JARS="$THRIFT_LIB:$CORE_LIB:$ZOOKEEPER_LIB:$CLOUDTRACE_LIB:" +LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$CLOUDTRACE_LIB" +H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$CLOUDTRACE_LIB:" COMMONS_LIBS=`ls -1 $LIB/commons-*.jar` for jar in $USERJARS $COMMONS_LIBS; do Propchange: accumulo/branches/ACCUMULO-259/core/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/core:r1355160-1355556 Modified: accumulo/branches/ACCUMULO-259/core/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/pom.xml?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/pom.xml (original) +++ accumulo/branches/ACCUMULO-259/core/pom.xml Fri Jun 29 21:29:21 2012 @@ -81,6 +81,10 @@ org.apache.accumulo + accumulo-fate + + + org.apache.accumulo cloudtrace Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Fri Jun 29 21:29:21 2012 @@ -33,8 +33,8 @@ import org.apache.accumulo.core.util.Byt import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.OpTimer; import org.apache.accumulo.core.util.TextUtil; -import org.apache.accumulo.core.zookeeper.ZooCache; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java Fri Jun 29 21:29:21 2012 @@ -38,8 +38,8 @@ import org.apache.accumulo.core.tabletse import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.accumulo.core.util.ThriftUtil; -import org.apache.accumulo.core.zookeeper.ZooCache; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooCache; /** * Provides a class for administering the accumulo instance Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java Fri Jun 29 21:29:21 2012 @@ -34,8 +34,8 @@ import org.apache.accumulo.core.util.Ser import org.apache.accumulo.core.util.ServerServices.Service; import org.apache.accumulo.core.util.ThriftUtil; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.core.zookeeper.ZooCache; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.log4j.Logger; import org.apache.thrift.TServiceClient; import org.apache.thrift.transport.TTransport; Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java Fri Jun 29 21:29:21 2012 @@ -26,8 +26,8 @@ import org.apache.accumulo.core.Constant import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.master.state.tables.TableState; -import org.apache.accumulo.core.zookeeper.ZooCache; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooCache; public class Tables { private static SecurityPermission TABLES_PERMISSION = new SecurityPermission("tablesPermission"); Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java Fri Jun 29 21:29:21 2012 @@ -23,8 +23,8 @@ import java.net.UnknownHostException; import org.apache.accumulo.cloudtrace.instrument.Tracer; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Instance; -import org.apache.accumulo.core.zookeeper.ZooReader; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooReader; import org.apache.zookeeper.KeeperException; Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java Fri Jun 29 21:29:21 2012 @@ -23,7 +23,7 @@ import java.util.Map; import java.util.Random; import org.apache.accumulo.cloudtrace.instrument.receivers.SendSpansViaThrift; -import org.apache.accumulo.core.zookeeper.ZooReader; +import org.apache.accumulo.fate.zookeeper.ZooReader; import org.apache.log4j.Logger; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Fri Jun 29 21:29:21 2012 @@ -129,7 +129,7 @@ import org.apache.accumulo.core.util.she import org.apache.accumulo.core.util.shell.commands.UserPermissionsCommand; import org.apache.accumulo.core.util.shell.commands.UsersCommand; import org.apache.accumulo.core.util.shell.commands.WhoAmICommand; -import org.apache.accumulo.core.zookeeper.ZooReader; +import org.apache.accumulo.fate.zookeeper.ZooReader; import org.apache.commons.cli.BasicParser; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; @@ -245,7 +245,8 @@ public class Shell extends ShellOptions byte[] pass; try { if (!cl.hasOption(fakeOption.getLongOpt())) { - DistributedTrace.enable(instance, new ZooReader(instance), "shell", InetAddress.getLocalHost().getHostName()); + DistributedTrace.enable(instance, new ZooReader(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut()), "shell", InetAddress.getLocalHost() + .getHostName()); } Runtime.getRuntime().addShutdownHook(new Thread() { Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java (original) +++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java Fri Jun 29 21:29:21 2012 @@ -16,195 +16,10 @@ */ package org.apache.accumulo.core.zookeeper; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Instance; -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.KeeperException.Code; -import org.apache.zookeeper.KeeperException.NoNodeException; -import org.apache.zookeeper.KeeperException.NodeExistsException; -import org.apache.zookeeper.ZooDefs.Ids; -import org.apache.zookeeper.ZooDefs.Perms; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.data.ACL; -import org.apache.zookeeper.data.Stat; -public class ZooUtil { - public enum NodeExistsPolicy { - SKIP, OVERWRITE, FAIL - } - - public enum NodeMissingPolicy { - SKIP, CREATE, FAIL - } - - public static class LockID { - public long eid; - public String path; - public String node; - - public LockID(String root, String serializedLID) { - String sa[] = serializedLID.split("\\$"); - int lastSlash = sa[0].lastIndexOf('/'); - - if (sa.length != 2 || lastSlash < 0) { - throw new IllegalArgumentException("Malformed serialized lock id " + serializedLID); - } - - if (lastSlash == 0) - path = root; - else - path = root + "/" + sa[0].substring(0, lastSlash); - node = sa[0].substring(lastSlash + 1); - eid = Long.parseLong(sa[1], 16); - } - - public LockID(String path, String node, long eid) { - this.path = path; - this.node = node; - this.eid = eid; - } - - public String serialize(String root) { - - return path.substring(root.length()) + "/" + node + "$" + Long.toHexString(eid); - } - - @Override - public String toString() { - return " path = " + path + " node = " + node + " eid = " + Long.toHexString(eid); - } - } - - public static final List PRIVATE; - public static final List PUBLIC; - static { - PRIVATE = new ArrayList(); - PRIVATE.addAll(Ids.CREATOR_ALL_ACL); - PUBLIC = new ArrayList(); - PUBLIC.addAll(PRIVATE); - PUBLIC.add(new ACL(Perms.READ, Ids.ANYONE_ID_UNSAFE)); - } - - /** - * This method will delete a node and all its children from zookeeper - * - * @param zPath - * the path to delete - */ - public static void recursiveDelete(ZooKeeper zk, String zPath, int version, NodeMissingPolicy policy) throws KeeperException, InterruptedException { - if (policy.equals(NodeMissingPolicy.CREATE)) - throw new IllegalArgumentException(policy.name() + " is invalid for this operation"); - try { - for (String child : zk.getChildren(zPath, false)) - recursiveDelete(zk, zPath + "/" + child, NodeMissingPolicy.SKIP); - - Stat stat; - if ((stat = zk.exists(zPath, null)) != null) - zk.delete(zPath, stat.getVersion()); - } catch (KeeperException e) { - if (policy.equals(NodeMissingPolicy.SKIP) && e.code().equals(KeeperException.Code.NONODE)) - return; - throw e; - } - } - - public static void recursiveDelete(ZooKeeper zk, String zPath, NodeMissingPolicy policy) throws KeeperException, InterruptedException { - recursiveDelete(zk, zPath, -1, policy); - } - - /** - * Create a persistent node with the default ACL - * - * @return true if the node was created or altered; false if it was skipped - */ - public static boolean putPersistentData(ZooKeeper zk, String zPath, byte[] data, NodeExistsPolicy policy) throws KeeperException, InterruptedException { - return putData(zk, zPath, data, CreateMode.PERSISTENT, -1, policy, PUBLIC); - } - - public static boolean putPersistentData(ZooKeeper zk, String zPath, byte[] data, int version, NodeExistsPolicy policy) throws KeeperException, - InterruptedException { - return putData(zk, zPath, data, CreateMode.PERSISTENT, version, policy, PUBLIC); - } - - public static boolean putPersistentData(ZooKeeper zk, String zPath, byte[] data, int version, NodeExistsPolicy policy, List acls) - throws KeeperException, InterruptedException { - return putData(zk, zPath, data, CreateMode.PERSISTENT, version, policy, acls); - } - - private static boolean putData(ZooKeeper zk, String zPath, byte[] data, CreateMode mode, int version, NodeExistsPolicy policy, List acls) - throws KeeperException, InterruptedException { - if (policy == null) - policy = NodeExistsPolicy.FAIL; - - while (true) { - try { - zk.create(zPath, data, acls, mode); - return true; - } catch (NodeExistsException nee) { - switch (policy) { - case SKIP: - return false; - case OVERWRITE: - try { - zk.setData(zPath, data, version); - return true; - } catch (NoNodeException nne) { - // node delete between create call and set data, so try create call again - continue; - } - default: - throw nee; - } - } - } - } - - public static byte[] getData(ZooKeeper zk, String zPath, Stat stat) throws KeeperException, InterruptedException { - return zk.getData(zPath, false, stat); - } - - public static Stat getStatus(ZooKeeper zk, String zPath) throws KeeperException, InterruptedException { - return zk.exists(zPath, false); - } - - public static boolean exists(ZooKeeper zk, String zPath) throws KeeperException, InterruptedException { - return getStatus(zk, zPath) != null; - } - - public static void recursiveCopyPersistent(ZooKeeper zk, String source, String destination, NodeExistsPolicy policy) throws KeeperException, - InterruptedException { - Stat stat = null; - if (!exists(zk, source)) - throw KeeperException.create(Code.NONODE, source); - if (exists(zk, destination)) { - switch (policy) { - case OVERWRITE: - break; - case SKIP: - return; - case FAIL: - default: - throw KeeperException.create(Code.NODEEXISTS, source); - } - } - - stat = new Stat(); - byte[] data = zk.getData(source, false, stat); - if (stat.getEphemeralOwner() == 0) { - if (data == null) - throw KeeperException.create(Code.NONODE, source); - putPersistentData(zk, destination, data, policy); - if (stat.getNumChildren() > 0) - for (String child : zk.getChildren(source, false)) - recursiveCopyPersistent(zk, source + "/" + child, destination + "/" + child, policy); - } - } - +public class ZooUtil extends org.apache.accumulo.fate.zookeeper.ZooUtil { public static String getRoot(Instance instance) { return getRoot(instance.getInstanceID()); } @@ -212,51 +27,4 @@ public class ZooUtil { public static String getRoot(String instanceId) { return Constants.ZROOT + "/" + instanceId; } - - public static boolean putPrivatePersistentData(ZooKeeper zk, String zPath, byte[] data, NodeExistsPolicy policy) throws KeeperException, InterruptedException { - return putData(zk, zPath, data, CreateMode.PERSISTENT, -1, policy, PRIVATE); - } - - public static String putPersistentSequential(ZooKeeper zk, String zPath, byte[] data) throws KeeperException, InterruptedException { - return zk.create(zPath, data, ZooUtil.PUBLIC, CreateMode.PERSISTENT_SEQUENTIAL); - } - - public static String putEphemeralSequential(ZooKeeper zk, String zPath, byte[] data) throws KeeperException, InterruptedException { - return zk.create(zPath, data, ZooUtil.PUBLIC, CreateMode.EPHEMERAL_SEQUENTIAL); - } - - public static byte[] getLockData(ZooCache zc, String path) { - - List children = zc.getChildren(path); - - if (children.size() == 0) { - return null; - } - - children = new ArrayList(children); - Collections.sort(children); - - String lockNode = children.get(0); - - return zc.get(path + "/" + lockNode); - } - - public static boolean isLockHeld(ZooKeeper zk, LockID lid) throws KeeperException, InterruptedException { - - List children = zk.getChildren(lid.path, false); - - if (children.size() == 0) { - return false; - } - - Collections.sort(children); - - String lockNode = children.get(0); - if (!lid.node.equals(lockNode)) - return false; - - Stat stat = zk.exists(lid.path + "/" + lid.node, false); - return stat != null && stat.getEphemeralOwner() == lid.eid; - } - } Propchange: accumulo/branches/ACCUMULO-259/fate/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Jun 29 21:29:21 2012 @@ -0,0 +1,4 @@ +.settings +.classpath +.project +target Modified: accumulo/branches/ACCUMULO-259/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/pom.xml?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/pom.xml (original) +++ accumulo/branches/ACCUMULO-259/pom.xml Fri Jun 29 21:29:21 2012 @@ -48,6 +48,7 @@ trace core + fate server start examples @@ -528,6 +529,11 @@ org.apache.accumulo + accumulo-fate + 1.5.0-SNAPSHOT + + + org.apache.accumulo accumulo-start 1.5.0-SNAPSHOT Propchange: accumulo/branches/ACCUMULO-259/server/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/server:r1355160-1355556 Modified: accumulo/branches/ACCUMULO-259/server/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/pom.xml?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/pom.xml (original) +++ accumulo/branches/ACCUMULO-259/server/pom.xml Fri Jun 29 21:29:21 2012 @@ -56,6 +56,10 @@ org.apache.accumulo + accumulo-fate + + + org.apache.accumulo accumulo-core Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java Fri Jun 29 21:29:21 2012 @@ -35,8 +35,8 @@ import org.apache.accumulo.core.util.Byt import org.apache.accumulo.core.util.OpTimer; import org.apache.accumulo.core.util.StringUtil; import org.apache.accumulo.core.util.TextUtil; -import org.apache.accumulo.core.zookeeper.ZooCache; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.accumulo.server.zookeeper.ZooLock; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java Fri Jun 29 21:29:21 2012 @@ -30,8 +30,8 @@ import org.apache.accumulo.core.client.I import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationObserver; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.zookeeper.ZooCache; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java Fri Jun 29 21:29:21 2012 @@ -29,8 +29,8 @@ import org.apache.accumulo.core.client.I import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.zookeeper.ZooCache; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.client.HdfsZooInstance.AccumuloNotInitializedException; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Admin.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Admin.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Admin.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/fate/Admin.java Fri Jun 29 21:29:21 2012 @@ -16,178 +16,42 @@ */ package org.apache.accumulo.server.fate; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy; +import org.apache.accumulo.fate.AdminUtil; +import org.apache.accumulo.fate.ZooStore; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.fate.TStore.TStatus; import org.apache.accumulo.server.master.Master; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; -import org.apache.accumulo.server.zookeeper.ZooLock; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.zookeeper.KeeperException; /** * A utility to administer FATE operations */ public class Admin { - private static void print(Instance instance, IZooReaderWriter zk, ZooStore zs) throws KeeperException, InterruptedException { - Map> heldLocks = new HashMap>(); - Map> waitingLocks = new HashMap>(); - - List lockedTables = zk.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS); - - for (String tableId : lockedTables) { - try { - List lockNodes = zk.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS + "/" + tableId); - lockNodes = new ArrayList(lockNodes); - Collections.sort(lockNodes); - - int pos = 0; - boolean sawWriteLock = false; - - for (String node : lockNodes) { - try { - byte[] data = zk.getData(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS + "/" + tableId + "/" + node, null); - String lda[] = new String(data).split(":"); - - if (lda[0].charAt(0) == 'W') - sawWriteLock = true; - - Map> locks; - - if (pos == 0) { - locks = heldLocks; - } else { - if (lda[0].charAt(0) == 'R' && !sawWriteLock) { - locks = heldLocks; - } else { - locks = waitingLocks; - } - } - - List tables = locks.get(Long.parseLong(lda[1], 16)); - if (tables == null) { - tables = new ArrayList(); - locks.put(Long.parseLong(lda[1], 16), tables); - } - - tables.add(lda[0].charAt(0) + ":" + tableId); - - } catch (Exception e) { - e.printStackTrace(); - } - pos++; - } - - } catch (Exception e) { - e.printStackTrace(); - System.err.println("Failed to read locks for " + tableId + " continuing"); - } - } - - List transactions = zs.list(); - - for (Long tid : transactions) { - - zs.reserve(tid); - - String debug = (String) zs.getProperty(tid, "debug"); - - List hlocks = heldLocks.remove(tid); - if (hlocks == null) - hlocks = Collections.emptyList(); - - List wlocks = waitingLocks.remove(tid); - if (wlocks == null) - wlocks = Collections.emptyList(); - - String top = null; - Repo repo = zs.top(tid); - if (repo != null) - top = repo.getDescription(); - - TStatus status = null; - status = zs.getStatus(tid); - - zs.unreserve(tid, 0); - - System.out.printf("txid: %016x status: %-18s op: %-15s locked: %-15s locking: %-15s top: %s\n", tid, status, debug, hlocks, wlocks, top); - } - - if (heldLocks.size() != 0 || waitingLocks.size() != 0) { - System.out.println(); - System.out.println("The following locks did not have an associated FATE operation"); - System.out.println(); - for (Entry> entry : heldLocks.entrySet()) - System.out.printf("txid: %016x locked: %s\n", entry.getKey(), entry.getValue()); - - for (Entry> entry : waitingLocks.entrySet()) - System.out.printf("txid: %016x locking: %s\n", entry.getKey(), entry.getValue()); - } - } - - private static void checkMasterLock(Instance instance) { - if (ZooLock.getLockData(ZooUtil.getRoot(instance) + Constants.ZMASTER_LOCK) != null) { - System.err.println("ERROR: Master lock is held, not running"); - System.exit(-1); - } - } - public static void main(String[] args) throws Exception { - + AdminUtil admin = new AdminUtil(); boolean valid = (args.length == 2 && args[0].matches("fail|delete")) || (args.length == 1 && args[0].equals("print")); if (!valid) { System.err.println("Usage : " + Admin.class.getSimpleName() + " fail | delete | print"); System.exit(-1); } - + Instance instance = HdfsZooInstance.getInstance(); String path = ZooUtil.getRoot(instance) + Constants.ZFATE; + String masterPath = ZooUtil.getRoot(instance) + Constants.ZMASTER_LOCK; IZooReaderWriter zk = ZooReaderWriter.getRetryingInstance(); ZooStore zs = new ZooStore(path, zk); - + if (args[0].equals("fail")) { - checkMasterLock(instance); - - long txid = Long.parseLong(args[1], 16); - zs.reserve(txid); - zs.setStatus(txid, TStatus.FAILED_IN_PROGRESS); - zs.unreserve(txid, 0); + admin.prepFail(zs, masterPath, args[1]); } else if (args[0].equals("delete")) { - checkMasterLock(instance); - - long txid = Long.parseLong(args[1], 16); - zs.reserve(txid); - zs.delete(txid); - zs.unreserve(txid, 0); - - // delete any locks assoc w/ fate operation - List lockedTables = zk.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS); - - for (String tableId : lockedTables) { - List lockNodes = zk.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS + "/" + tableId); - for (String node : lockNodes) { - String lockPath = ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS + "/" + tableId + "/" + node; - byte[] data = zk.getData(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS + "/" + tableId + "/" + node, null); - String lda[] = new String(data).split(":"); - if (lda[1].equals(args[1])) - zk.recursiveDelete(lockPath, NodeMissingPolicy.SKIP); - } - } + admin.prepDelete(zs, masterPath, args[1]); + admin.deleteLocks(zs, zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS, args[1]); } else if (args[0].equals("print")) { - print(instance, zk, zs); + admin.print(zs, zk, ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS); } } - - } Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Fri Jun 29 21:29:21 2012 @@ -69,6 +69,8 @@ import org.apache.accumulo.core.util.Ser import org.apache.accumulo.core.util.ServerServices.Service; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason; +import org.apache.accumulo.fate.zookeeper.ZooLock.LockWatcher; import org.apache.accumulo.server.Accumulo; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.client.HdfsZooInstance; @@ -82,8 +84,6 @@ import org.apache.accumulo.server.util.O import org.apache.accumulo.server.util.TServerUtils; import org.apache.accumulo.server.util.TabletIterator; import org.apache.accumulo.server.zookeeper.ZooLock; -import org.apache.accumulo.server.zookeeper.ZooLock.LockLossReason; -import org.apache.accumulo.server.zookeeper.ZooLock.LockWatcher; import org.apache.commons.cli.BasicParser; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java Fri Jun 29 21:29:21 2012 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.master; -import static org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy.SKIP; +import static org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy.SKIP; import java.net.InetSocketAddress; import java.nio.ByteBuffer; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java Fri Jun 29 21:29:21 2012 @@ -87,13 +87,17 @@ import org.apache.accumulo.core.util.Col import org.apache.accumulo.core.util.Daemon; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy; +import org.apache.accumulo.fate.Fate; +import org.apache.accumulo.fate.TStore.TStatus; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason; +import org.apache.accumulo.fate.zookeeper.ZooLock.LockWatcher; +import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.Accumulo; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ServerConfiguration; -import org.apache.accumulo.server.fate.Fate; -import org.apache.accumulo.server.fate.TStore.TStatus; import org.apache.accumulo.server.iterators.MetadataBulkLoadFilter; import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection; import org.apache.accumulo.server.master.balancer.DefaultLoadBalancer; @@ -146,12 +150,8 @@ import org.apache.accumulo.server.util.T import org.apache.accumulo.server.util.TablePropUtil; import org.apache.accumulo.server.util.TabletIterator.TabletDeletedException; import org.apache.accumulo.server.util.time.SimpleTimer; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.zookeeper.ZooLock; -import org.apache.accumulo.server.zookeeper.ZooLock.LockLossReason; -import org.apache.accumulo.server.zookeeper.ZooLock.LockWatcher; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.server.zookeeper.ZooReaderWriter.Mutator; import org.apache.accumulo.start.classloader.AccumuloClassLoader; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -1652,7 +1652,8 @@ public class Master implements LiveTServ } } - if (maxLogicalTime != null) ColumnFQ.put(m, Constants.METADATA_TIME_COLUMN, new Value(maxLogicalTime.getBytes())); + if (maxLogicalTime != null) + ColumnFQ.put(m, Constants.METADATA_TIME_COLUMN, new Value(maxLogicalTime.getBytes())); if (!m.getUpdates().isEmpty()) { bw.addMutation(m); @@ -1684,11 +1685,12 @@ public class Master implements LiveTServ } catch (Exception ex) { throw new AccumuloException(ex); } finally { - if (bw != null) try { - bw.close(); - } catch (Exception ex) { - throw new AccumuloException(ex); - } + if (bw != null) + try { + bw.close(); + } catch (Exception ex) { + throw new AccumuloException(ex); + } } } @@ -2068,7 +2070,7 @@ public class Master implements LiveTServ // TODO: add shutdown for fate object try { - fate = new Fate(this, new org.apache.accumulo.server.fate.ZooStore(ZooUtil.getRoot(instance) + Constants.ZFATE, + fate = new Fate(this, new org.apache.accumulo.fate.ZooStore(ZooUtil.getRoot(instance) + Constants.ZFATE, ZooReaderWriter.getRetryingInstance()), 4); } catch (KeeperException e) { throw new IOException(e); Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java Fri Jun 29 21:29:21 2012 @@ -19,8 +19,8 @@ */ package org.apache.accumulo.server.master; -import org.apache.accumulo.server.zookeeper.ZooLock.AsyncLockWatcher; -import org.apache.accumulo.server.zookeeper.ZooLock.LockLossReason; +import org.apache.accumulo.fate.zookeeper.ZooLock.AsyncLockWatcher; +import org.apache.accumulo.fate.zookeeper.ZooLock.LockLossReason; class TServerLockWatcher implements AsyncLockWatcher { Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java Fri Jun 29 21:29:21 2012 @@ -20,7 +20,7 @@ import java.io.IOException; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.server.fate.Repo; +import org.apache.accumulo.fate.Repo; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.tableOps.MasterRepo; import org.apache.accumulo.server.trace.TraceFileSystem; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java Fri Jun 29 21:29:21 2012 @@ -20,8 +20,8 @@ import java.io.IOException; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.server.fate.Repo; +import org.apache.accumulo.fate.Repo; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.tableOps.MasterRepo; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java Fri Jun 29 21:29:21 2012 @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; import org.apache.accumulo.core.master.thrift.DeadServer; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.log4j.Logger; import org.apache.zookeeper.data.Stat; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java Fri Jun 29 21:29:21 2012 @@ -21,7 +21,7 @@ import org.apache.accumulo.core.file.Fil import org.apache.accumulo.core.master.thrift.MasterGoalState; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.server.Accumulo; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ServerConfiguration; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java Fri Jun 29 21:29:21 2012 @@ -20,10 +20,10 @@ import java.io.IOException; import java.util.List; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.zookeeper.ZooCache; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java Fri Jun 29 21:29:21 2012 @@ -28,14 +28,14 @@ import org.apache.accumulo.core.Constant import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.util.TablePropUtil; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.zookeeper.ZooCache; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.server.zookeeper.ZooReaderWriter.Mutator; import org.apache.log4j.Logger; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java Fri Jun 29 21:29:21 2012 @@ -49,10 +49,10 @@ import org.apache.accumulo.core.util.Cac import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.core.util.SimpleThreadPool; import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.fate.Repo; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ServerConfiguration; -import org.apache.accumulo.server.fate.Repo; import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.state.TServerInstance; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ChangeTableState.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ChangeTableState.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ChangeTableState.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/ChangeTableState.java Fri Jun 29 21:29:21 2012 @@ -18,7 +18,7 @@ package org.apache.accumulo.server.maste import org.apache.accumulo.core.client.impl.thrift.TableOperation; import org.apache.accumulo.core.master.state.tables.TableState; -import org.apache.accumulo.server.fate.Repo; +import org.apache.accumulo.fate.Repo; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.state.tables.TableManager; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CloneTable.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CloneTable.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CloneTable.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CloneTable.java Fri Jun 29 21:29:21 2012 @@ -26,9 +26,9 @@ import org.apache.accumulo.core.client.i import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.security.thrift.ThriftSecurityException; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.Repo; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.fate.Repo; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.state.tables.TableManager; import org.apache.accumulo.server.security.SecurityConstants; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java Fri Jun 29 21:29:21 2012 @@ -41,16 +41,16 @@ import org.apache.accumulo.core.master.s import org.apache.accumulo.core.tabletserver.thrift.IteratorConfig; import org.apache.accumulo.core.tabletserver.thrift.TIteratorSetting; import org.apache.accumulo.core.util.ColumnFQ; +import org.apache.accumulo.fate.Repo; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.fate.Repo; import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.state.TServerInstance; import org.apache.accumulo.server.security.SecurityConstants; import org.apache.accumulo.server.util.MapCounter; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.server.zookeeper.ZooReaderWriter.Mutator; import org.apache.commons.codec.binary.Hex; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CreateTable.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CreateTable.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CreateTable.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/CreateTable.java Fri Jun 29 21:29:21 2012 @@ -31,11 +31,11 @@ import org.apache.accumulo.core.master.s import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.util.CachedConfiguration; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.Repo; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.conf.ServerConfiguration; -import org.apache.accumulo.server.fate.Repo; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.state.tables.TableManager; import org.apache.accumulo.server.security.SecurityConstants; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java Fri Jun 29 21:29:21 2012 @@ -36,9 +36,9 @@ import org.apache.accumulo.core.iterator import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.util.CachedConfiguration; +import org.apache.accumulo.fate.Repo; import org.apache.accumulo.server.ServerConstants; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.fate.Repo; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.state.MetaDataTableScanner; import org.apache.accumulo.server.master.state.TabletLocationState; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/MasterRepo.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/MasterRepo.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/MasterRepo.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/MasterRepo.java Fri Jun 29 21:29:21 2012 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.server.master.tableOps; -import org.apache.accumulo.server.fate.Repo; +import org.apache.accumulo.fate.Repo; import org.apache.accumulo.server.master.Master; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java Fri Jun 29 21:29:21 2012 @@ -23,12 +23,12 @@ import org.apache.accumulo.core.client.i import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.Repo; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.fate.Repo; import org.apache.accumulo.server.master.Master; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.server.zookeeper.ZooReaderWriter.Mutator; import org.apache.log4j.Logger; public class RenameTable extends MasterRepo { Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java Fri Jun 29 21:29:21 2012 @@ -26,7 +26,7 @@ import org.apache.accumulo.core.client.i import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.util.TextUtil; -import org.apache.accumulo.server.fate.Repo; +import org.apache.accumulo.fate.Repo; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.state.MergeInfo; import org.apache.accumulo.server.master.state.MergeInfo.Operation; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java Fri Jun 29 21:29:21 2012 @@ -20,7 +20,7 @@ import org.apache.accumulo.cloudtrace.in import org.apache.accumulo.cloudtrace.instrument.Trace; import org.apache.accumulo.cloudtrace.instrument.Tracer; import org.apache.accumulo.cloudtrace.thrift.TInfo; -import org.apache.accumulo.server.fate.Repo; +import org.apache.accumulo.fate.Repo; /** Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java Fri Jun 29 21:29:21 2012 @@ -27,13 +27,13 @@ import org.apache.accumulo.core.client.i import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType; import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.DistributedReadWriteLock; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooReaderWriter.Mutator; +import org.apache.accumulo.fate.zookeeper.ZooReservation; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.zookeeper.DistributedReadWriteLock; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.zookeeper.ZooQueueLock; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.server.zookeeper.ZooReservation; -import org.apache.accumulo.server.zookeeper.ZooReaderWriter.Mutator; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; import org.apache.zookeeper.KeeperException; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java Fri Jun 29 21:29:21 2012 @@ -20,14 +20,14 @@ import org.apache.accumulo.core.Constant import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.util.AddressUtil; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.server.fate.Repo; +import org.apache.accumulo.fate.Repo; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.server.master.EventCoordinator.Listener; import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection; import org.apache.accumulo.server.master.Master; import org.apache.accumulo.server.master.state.TServerInstance; import org.apache.accumulo.server.master.tableOps.MasterRepo; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.zookeeper.ZooLock; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java Fri Jun 29 21:29:21 2012 @@ -31,8 +31,8 @@ import org.apache.accumulo.core.data.Mut import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.util.Encoding; import org.apache.accumulo.core.zookeeper.ZooUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.security.SecurityConstants; import org.apache.accumulo.server.util.MetadataTable; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java Fri Jun 29 21:29:21 2012 @@ -42,10 +42,10 @@ import org.apache.accumulo.core.iterator import org.apache.accumulo.core.util.LoggingRunnable; import org.apache.accumulo.core.util.NamingThreadFactory; import org.apache.accumulo.core.zookeeper.ZooUtil; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.client.HdfsZooInstance; import org.apache.accumulo.server.security.SecurityConstants; import org.apache.accumulo.server.util.MetadataTable; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.commons.collections.map.LRUMap; import org.apache.hadoop.io.Text; Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java?rev=1355566&r1=1355565&r2=1355566&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java Fri Jun 29 21:29:21 2012 @@ -26,9 +26,9 @@ import org.apache.accumulo.core.client.A import org.apache.accumulo.core.security.thrift.AuthInfo; import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.core.util.ByteBufferUtil; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy; -import org.apache.accumulo.server.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeExistsPolicy; +import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.server.zookeeper.ZooCache; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; import org.apache.log4j.Logger;