accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From afu...@apache.org
Subject svn commit: r1357909 [1/3] - in /accumulo/branches/ACCUMULO-652: ./ bin/ core/ core/src/main/java/org/apache/accumulo/core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java...
Date Thu, 05 Jul 2012 21:03:21 GMT
Author: afuchs
Date: Thu Jul  5 21:03:16 2012
New Revision: 1357909

URL: http://svn.apache.org/viewvc?rev=1357909&view=rev
Log:
ACCUMULO-652 merged changes from trunk

Added:
    accumulo/branches/ACCUMULO-652/fate/   (props changed)
      - copied from r1357887, accumulo/trunk/fate/
    accumulo/branches/ACCUMULO-652/fate/pom.xml
      - copied, changed from r1357887, accumulo/trunk/fate/pom.xml
    accumulo/branches/ACCUMULO-652/fate/src/
      - copied from r1357887, accumulo/trunk/fate/src/
    accumulo/branches/ACCUMULO-652/fate/src/main/
      - copied from r1357887, accumulo/trunk/fate/src/main/
    accumulo/branches/ACCUMULO-652/fate/src/main/java/
      - copied from r1357887, accumulo/trunk/fate/src/main/java/
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/
      - copied from r1357887, accumulo/trunk/fate/src/main/java/org/
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/
      - copied from r1357887, accumulo/trunk/fate/src/main/java/org/apache/
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/
      - copied from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/
      - copied from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/AdminUtil.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/Fate.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/Fate.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/Repo.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/Repo.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/StackOverflowException.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/StackOverflowException.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/TStore.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/TStore.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/util/
      - copied from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/util/
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/util/Daemon.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/util/Daemon.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/util/UtilWaitThread.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/
      - copied from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLock.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReader.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/TransactionWatcher.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooQueueLock.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReservation.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
    accumulo/branches/ACCUMULO-652/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
    accumulo/branches/ACCUMULO-652/fate/src/test/
      - copied from r1357887, accumulo/trunk/fate/src/test/
    accumulo/branches/ACCUMULO-652/fate/src/test/java/
      - copied from r1357887, accumulo/trunk/fate/src/test/java/
    accumulo/branches/ACCUMULO-652/fate/src/test/java/org/
      - copied from r1357887, accumulo/trunk/fate/src/test/java/org/
    accumulo/branches/ACCUMULO-652/fate/src/test/java/org/apache/
      - copied from r1357887, accumulo/trunk/fate/src/test/java/org/apache/
    accumulo/branches/ACCUMULO-652/fate/src/test/java/org/apache/accumulo/
      - copied from r1357887, accumulo/trunk/fate/src/test/java/org/apache/accumulo/
    accumulo/branches/ACCUMULO-652/fate/src/test/java/org/apache/accumulo/fate/
      - copied from r1357887, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/
    accumulo/branches/ACCUMULO-652/fate/src/test/java/org/apache/accumulo/fate/zookeeper/
      - copied from r1357887, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/zookeeper/
    accumulo/branches/ACCUMULO-652/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/zookeeper/DistributedReadWriteLockTest.java
    accumulo/branches/ACCUMULO-652/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
      - copied unchanged from r1357887, accumulo/trunk/fate/src/test/java/org/apache/accumulo/fate/zookeeper/TransactionWatcherTest.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/tabletserver/BulkFailedCopyProcessor.java
      - copied unchanged from r1357887, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/BulkFailedCopyProcessor.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
      - copied unchanged from r1357887, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
Removed:
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/zookeeper/IZooReader.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooReader.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/Fate.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/Print.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/Repo.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/StackOverflowException.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/TStore.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/ZooStore.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedReadWriteLock.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/IZooReaderWriter.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReservation.java
    accumulo/branches/ACCUMULO-652/server/src/test/java/org/apache/accumulo/server/zookeeper/
    accumulo/branches/ACCUMULO-652/test/system/auto/stress/logger.py
Modified:
    accumulo/branches/ACCUMULO-652/   (props changed)
    accumulo/branches/ACCUMULO-652/bin/tool.sh
    accumulo/branches/ACCUMULO-652/core/   (props changed)
    accumulo/branches/ACCUMULO-652/core/pom.xml
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/Constants.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/Property.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/Merge.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
    accumulo/branches/ACCUMULO-652/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
    accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
    accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
    accumulo/branches/ACCUMULO-652/pom.xml
    accumulo/branches/ACCUMULO-652/server/   (props changed)
    accumulo/branches/ACCUMULO-652/server/pom.xml
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/Admin.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/ZooStore.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/tables/TableManager.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/ChangeTableState.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/CloneTable.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/CreateTable.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/MasterRepo.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/RenameTable.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tableOps/Utils.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/problems/ProblemReport.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/security/ZKAuthenticator.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestClean.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestReader.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/functional/CacheTestWriter.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/functional/SplitRecoveryTest.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/randomwalk/Framework.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/test/scalability/Run.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/CleanZookeeper.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/ListInstances.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/TransactionWatcher.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooCache.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooQueueLock.java
    accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
    accumulo/branches/ACCUMULO-652/src/   (props changed)
    accumulo/branches/ACCUMULO-652/test/system/auto/simple/examples.py
    accumulo/branches/ACCUMULO-652/test/system/auto/simple/mapreduce.py
    accumulo/branches/ACCUMULO-652/test/system/test4/bulk_import_test.sh

Propchange: accumulo/branches/ACCUMULO-652/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1339309-1342420,1343897-1343898,1343943-1349971,1349973-1351424,1351426-1356900
  Merged /accumulo/branches/1.3/src:r1354669
  Merged /accumulo/trunk:r1354154-1357887
  Merged /accumulo/branches/1.4:r1343943-1349971,1349973-1351424,1351426-1356923
  Merged /accumulo/trunk/src:r1341000,1342373,1351691,1356400
  Merged /accumulo/branches/1.3:r1354669

Modified: accumulo/branches/ACCUMULO-652/bin/tool.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/bin/tool.sh?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/bin/tool.sh (original)
+++ accumulo/branches/ACCUMULO-652/bin/tool.sh Thu Jul  5 21:03:16 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-652/core/
------------------------------------------------------------------------------
  Reverse-merged /incubator/accumulo/trunk/src/core:r1178656-1201898
  Merged /accumulo/branches/1.4/core:r1343943-1349971,1349973-1351424,1351426-1356923
  Merged /accumulo/branches/1.4/src/core:r1339309-1342420,1343897-1343898,1343943-1349971,1349973-1351424,1351426-1356900
  Merged /accumulo/trunk/src/core:r1341000,1342373,1351691,1356400
  Merged /accumulo/branches/1.4:r1354671
  Merged /accumulo/trunk/core:r1354154-1357887
  Merged /accumulo/branches/1.3/src/core:r1354669

Modified: accumulo/branches/ACCUMULO-652/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/pom.xml?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/pom.xml (original)
+++ accumulo/branches/ACCUMULO-652/core/pom.xml Thu Jul  5 21:03:16 2012
@@ -81,6 +81,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-fate</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
       <artifactId>cloudtrace</artifactId>
     </dependency>
     <dependency>

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/Constants.java Thu Jul  5 21:03:16 2012
@@ -74,6 +74,8 @@ public class Constants {
   
   public static final String ZNEXT_FILE = "/next_file";
   
+  public static final String ZBULK_FAILED_COPYQ = "/bulk_failed_copyq";
+
   public static final String ZHDFS_RESERVATIONS = "/hdfs_reservations";
   public static final String ZRECOVERY = "/recovery";
   

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Thu Jul  5 21:03:16 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-652/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java Thu Jul  5 21:03:16 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-652/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java Thu Jul  5 21:03:16 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-652/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java Thu Jul  5 21:03:16 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-652/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java Thu Jul  5 21:03:16 2012
@@ -31,6 +31,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.SortedMapIterator;
 import org.apache.accumulo.core.security.Authorizations;
+import org.apache.commons.collections.iterators.IteratorChain;
 
 public class MockBatchScanner extends MockScannerBase implements BatchScanner {
   
@@ -67,20 +68,25 @@ public class MockBatchScanner extends Mo
     }
   }
   
+  @SuppressWarnings("unchecked")
   @Override
   public Iterator<Entry<Key,Value>> iterator() {
     if (ranges == null) {
       throw new IllegalStateException("ranges not set");
     }
 
-    SortedKeyValueIterator<Key,Value> i = new SortedMapIterator(table.table);
-    try {
-      i = new RangesFilter(createFilter(i), ranges);
-      i.seek(new Range(), createColumnBSS(fetchedColumns), !fetchedColumns.isEmpty());
-      return new IteratorAdapter(i);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    IteratorChain chain = new IteratorChain();
+    for (Range range : ranges) {
+      SortedKeyValueIterator<Key,Value> i = new SortedMapIterator(table.table);
+      try {
+        i = new RangesFilter(createFilter(i), ranges);
+        i.seek(range, createColumnBSS(fetchedColumns), !fetchedColumns.isEmpty());
+        chain.addIterator(new IteratorAdapter(i));
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
     }
+    return chain;
   }
   
   @Override

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Thu Jul  5 21:03:16 2012
@@ -24,8 +24,11 @@ import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
+import org.apache.log4j.Logger;
+
 public class DefaultConfiguration extends AccumuloConfiguration {
   private static DefaultConfiguration instance = null;
+  private static Logger log = Logger.getLogger(DefaultConfiguration.class);
   
   public static DefaultConfiguration getInstance() {
     if (instance == null) {
@@ -62,6 +65,12 @@ public class DefaultConfiguration extend
       } catch (IOException e) {
         e.printStackTrace();
         return;
+      } finally {
+    	  try { 
+    		  data.close();
+    	  } catch (IOException ex) {
+    		  log .error(ex, ex);
+    	  }
       }
     }
     doc.println();

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/conf/Property.java Thu Jul  5 21:03:16 2012
@@ -151,7 +151,9 @@ public enum Property {
   TSERV_RECOVERY_MAX_CONCURRENT("tserver.recovery.concurrent.max", "2", PropertyType.COUNT, "The maximum number of threads to use to sort logs during recovery"),
   TSERV_SORT_BUFFER_SIZE("tserver.sort.buffer.size", "200M", PropertyType.MEMORY, "The amount of memory to use when sorting logs during recovery."),
   TSERV_ARCHIVE_WALOGS("tserver.archive.walogs", "false", PropertyType.BOOLEAN, "Keep copies of the WALOGs for debugging purposes"),
-  
+  TSERV_WORKQ_THREADS("tserver.workq.threads", "2", PropertyType.COUNT,
+      "The number of threads for the distributed workq.  These threads are used for copying failed bulk files."),
+
   // properties that are specific to logger server behavior
   LOGGER_PREFIX("logger.", null, PropertyType.PREFIX, "Properties in this category affect the behavior of the write-ahead logger servers"),
   LOGGER_DIR("logger.dir.walog", "walogs", PropertyType.PATH,

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java Thu Jul  5 21:03:16 2012
@@ -16,8 +16,12 @@
  */
 package org.apache.accumulo.core.data;
 
-public class ArrayByteSequence extends ByteSequence {
+import java.io.Serializable;
+
+public class ArrayByteSequence extends ByteSequence implements Serializable {
   
+  private static final long serialVersionUID = 1L;
+
   protected byte data[];
   protected int offset;
   protected int length;

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java Thu Jul  5 21:03:16 2012
@@ -632,6 +632,7 @@ public final class BCFile {
         }
         
         dataIndex = new DataIndex(cachedDataIndex);
+        cachedDataIndex.close();
         
       } else {
         // Logger.getLogger(Reader.class).debug("Read bcfile !METADATA from cache");
@@ -639,7 +640,6 @@ public final class BCFile {
         metaIndex = new MetaIndex(cachedMetaIndex);
         dataIndex = new DataIndex(cachedDataIndex);
       }
-      
     }
     
     /**

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java Thu Jul  5 21:03:16 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-652/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java Thu Jul  5 21:03:16 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-652/core/src/main/java/org/apache/accumulo/core/util/Merge.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/Merge.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/Merge.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/Merge.java Thu Jul  5 21:03:16 2012
@@ -62,7 +62,7 @@ public class Merge {
     String table = null;
     long goalSize = -1;
     String user = "root";
-    String password = "secret";
+    byte[] password = "secret".getBytes();
     boolean force = false;
     Text begin = null;
     Text end = null;
@@ -90,6 +90,12 @@ public class Merge {
     if (commandLine.hasOption("s")) {
       goalSize = AccumuloConfiguration.getMemoryInBytes(commandLine.getOptionValue("s"));
     }
+    if (commandLine.hasOption("u")) {
+    	table = commandLine.getOptionValue("u");
+    }
+    if (commandLine.hasOption("p")) {
+        password = commandLine.getOptionValue("p").getBytes();
+    }
     if (commandLine.hasOption("f")) {
       force = true;
     }
@@ -97,7 +103,7 @@ public class Merge {
       begin = new Text(commandLine.getOptionValue("b"));
     }
     if (commandLine.hasOption("e")) {
-      end = new Text(commandLine.getOptionValue("e"));
+    	end = new Text(commandLine.getOptionValue("e"));
     }
     if (table == null) {
       System.err.println("Specify the table to merge");

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/SimpleThreadPool.java Thu Jul  5 21:03:16 2012
@@ -22,12 +22,13 @@ import java.util.concurrent.TimeUnit;
 
 
 /**
- * 
+ * Create a simple thread pool using common parameters.
  */
 public class SimpleThreadPool extends ThreadPoolExecutor {
   
   public SimpleThreadPool(int max, final String name) {
-    super(0, Integer.MAX_VALUE, 1l, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new NamingThreadFactory(name));
+    super(max, max, 1l, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new NamingThreadFactory(name));
+    allowCoreThreadTimeOut(true);
   }
   
 }

Modified: accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Thu Jul  5 21:03:16 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-652/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java Thu Jul  5 21:03:16 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<ACL> PRIVATE;
-  public static final List<ACL> PUBLIC;
-  static {
-    PRIVATE = new ArrayList<ACL>();
-    PRIVATE.addAll(Ids.CREATOR_ALL_ACL);
-    PUBLIC = new ArrayList<ACL>();
-    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<ACL> 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<ACL> 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<String> children = zc.getChildren(path);
-    
-    if (children.size() == 0) {
-      return null;
-    }
-    
-    children = new ArrayList<String>(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<String> 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;
-  }
-  
 }

Modified: accumulo/branches/ACCUMULO-652/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java (original)
+++ accumulo/branches/ACCUMULO-652/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowTest.java Thu Jul  5 21:03:16 2012
@@ -124,3 +124,4 @@ public class FirstEntryInRowTest {
     assertFalse(fei.hasTop());
   }
 }
+

Modified: accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java (original)
+++ accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java Thu Jul  5 21:03:16 2012
@@ -17,9 +17,11 @@
 package org.apache.accumulo.examples.wikisearch.iterator;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
@@ -86,7 +88,8 @@ public class AndIterator implements Sort
   }
   
   /*
-   * | Row | Column Family | Column Qualifier | Value | {RowID} | {dataLocation} | {term}\0{dataType}\0{UID} | Empty
+   * | Row     | Column Family  | Column Qualifier          | Value 
+   * | {RowID} | {dataLocation} | {term}\0{dataType}\0{UID} | Empty
    */
   protected Text getPartition(Key key) {
     return key.getRow();
@@ -778,21 +781,24 @@ public class AndIterator implements Sort
     // seek each of the sources to the right column family within the row given by key
     for (int i = 0; i < sourcesCount; i++) {
       Key sourceKey;
+      Text dataLocation = (sources[i].dataLocation == null) ? nullText : sources[i].dataLocation;
+      Collection<ByteSequence> columnFamilies = new ArrayList<ByteSequence>();
+      columnFamilies.add(new ArrayByteSequence(dataLocation.getBytes(), 0, dataLocation.getLength()));
       if (range.getStartKey() != null) {
         // Build a key with the DocID if one is given
-        if (range.getStartKey().getColumnFamily() != null) {
-          sourceKey = buildKey(getPartition(range.getStartKey()), (sources[i].dataLocation == null) ? nullText : sources[i].dataLocation,
+		if (range.getStartKey().getColumnFamily() != null) {
+          sourceKey = buildKey(getPartition(range.getStartKey()), dataLocation,
               (sources[i].term == null) ? nullText : new Text(sources[i].term + "\0" + range.getStartKey().getColumnFamily()));
         } // Build a key with just the term.
         else {
-          sourceKey = buildKey(getPartition(range.getStartKey()), (sources[i].dataLocation == null) ? nullText : sources[i].dataLocation,
+          sourceKey = buildKey(getPartition(range.getStartKey()), dataLocation,
               (sources[i].term == null) ? nullText : sources[i].term);
         }
         if (!range.isStartKeyInclusive())
           sourceKey = sourceKey.followingKey(PartialKey.ROW_COLFAM_COLQUAL);
-        sources[i].iter.seek(new Range(sourceKey, true, null, false), seekColumnFamilies, inclusive);
+        sources[i].iter.seek(new Range(sourceKey, true, null, false), columnFamilies, inclusive);
       } else {
-        sources[i].iter.seek(range, seekColumnFamilies, inclusive);
+    	sources[i].iter.seek(range, columnFamilies, inclusive);
       }
     }
     

Modified: accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java (original)
+++ accumulo/branches/ACCUMULO-652/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java Thu Jul  5 21:03:16 2012
@@ -175,11 +175,10 @@ public class Query implements IQuery {
     Connector connector = null;
     if (null == instanceName || null == zooKeepers || null == username || null == password)
       throw new EJBException("Required parameters not set. [instanceName = " + this.instanceName + ", zookeepers = " + this.zooKeepers + ", username = "
-          + this.username + ", password = " + this.password + "]. Check values in ejb-jar.xml");
+          + this.username + ", password = [hidden]. Check values in ejb-jar.xml");
     Instance instance = new ZooKeeperInstance(this.instanceName, this.zooKeepers);
     try {
-      log.info("Connecting to [instanceName = " + this.instanceName + ", zookeepers = " + this.zooKeepers + ", username = " + this.username + ", password = "
-          + this.password + "].");
+      log.info("Connecting to [instanceName = " + this.instanceName + ", zookeepers = " + this.zooKeepers + ", username = " + this.username + "].");
       connector = instance.getConnector(this.username, this.password.getBytes());
     } catch (Exception e) {
       throw new EJBException("Error getting connector from instance", e);

Propchange: accumulo/branches/ACCUMULO-652/fate/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul  5 21:03:16 2012
@@ -0,0 +1,4 @@
+.settings
+.classpath
+.project
+target

Copied: accumulo/branches/ACCUMULO-652/fate/pom.xml (from r1357887, accumulo/trunk/fate/pom.xml)
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/fate/pom.xml?p2=accumulo/branches/ACCUMULO-652/fate/pom.xml&p1=accumulo/trunk/fate/pom.xml&r1=1357887&r2=1357909&rev=1357909&view=diff
==============================================================================
--- accumulo/trunk/fate/pom.xml (original)
+++ accumulo/branches/ACCUMULO-652/fate/pom.xml Thu Jul  5 21:03:16 2012
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>ACCUMULO-652-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: accumulo/branches/ACCUMULO-652/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/pom.xml?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/pom.xml (original)
+++ accumulo/branches/ACCUMULO-652/pom.xml Thu Jul  5 21:03:16 2012
@@ -48,6 +48,7 @@
   <modules>
     <module>trace</module>
     <module>core</module>
+    <module>fate</module>
     <module>server</module>
     <module>start</module>
     <module>examples</module>
@@ -528,6 +529,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.accumulo</groupId>
+        <artifactId>accumulo-fate</artifactId>
+        <version>ACCUMULO-652-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.accumulo</groupId>
         <artifactId>accumulo-start</artifactId>
         <version>ACCUMULO-652-SNAPSHOT</version>
       </dependency>

Propchange: accumulo/branches/ACCUMULO-652/server/
------------------------------------------------------------------------------
  Reverse-merged /incubator/accumulo/trunk/src/server:r1178656-1201898
  Merged /accumulo/branches/1.3/src/server:r1354669
  Merged /accumulo/branches/1.4/server:r1343943-1349971,1349973-1351424,1351426-1356923
  Merged /accumulo/branches/1.4/src/server:r1339309-1342420,1343897-1343898,1343943-1349971,1349973-1351424,1351426-1356900
  Merged /accumulo/trunk/src/server:r1341000,1342373,1351691,1356400
  Merged /accumulo/trunk/server:r1354154-1357887

Modified: accumulo/branches/ACCUMULO-652/server/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/pom.xml?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/pom.xml (original)
+++ accumulo/branches/ACCUMULO-652/server/pom.xml Thu Jul  5 21:03:16 2012
@@ -56,6 +56,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.accumulo</groupId>
+      <artifactId>accumulo-fate</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-core</artifactId>
     </dependency>
     <dependency>

Modified: accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java Thu Jul  5 21:03:16 2012
@@ -64,8 +64,6 @@ import org.apache.accumulo.core.util.Uti
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.SequenceFile;
-import org.apache.hadoop.io.SequenceFile.Writer;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TServiceClient;
@@ -299,48 +297,16 @@ public class BulkImporter {
     if (completeFailures.size() == 0)
       return Collections.emptySet();
     
-    log.error("The following map files failed completely, saving this info to : " + new Path(failureDir, "failures.seq"));
+    log.debug("The following map files failed ");
     
     for (Entry<Path,List<KeyExtent>> entry : es) {
       List<KeyExtent> extents = entry.getValue();
       
       for (KeyExtent keyExtent : extents)
-        log.error("\t" + entry.getKey() + " -> " + keyExtent);
+        log.debug("\t" + entry.getKey() + " -> " + keyExtent);
     }
-    
-    try {
-      
-      Writer outSeq = SequenceFile.createWriter(fs, conf, new Path(failureDir, "failures.seq"), Text.class, KeyExtent.class);
-      
-      for (Entry<Path,List<KeyExtent>> entry : es) {
-        List<KeyExtent> extents = entry.getValue();
-        
-        for (KeyExtent keyExtent : extents)
-          outSeq.append(new Text(entry.getKey().toString()), keyExtent);
-      }
-      
-      outSeq.close();
-    } catch (IOException ioe) {
-      log.error("Failed to create " + new Path(failureDir, "failures.seq") + " : " + ioe.getMessage());
-    }
-    
-    // we should make copying multi-threaded
-    Set<Path> failedCopies = new HashSet<Path>();
-    
-    for (Entry<Path,List<KeyExtent>> entry : es) {
-      Path dest = new Path(failureDir, entry.getKey().getName());
-      
-      log.debug("Copying " + entry.getKey() + " to " + dest);
-      
-      try {
-        org.apache.hadoop.fs.FileUtil.copy(fs, entry.getKey(), fs, dest, false, conf);
-      } catch (IOException ioe) {
-        log.error("Failed to copy " + entry.getKey() + " : " + ioe.getMessage());
-        failedCopies.add(entry.getKey());
-      }
-    }
-    
-    return failedCopies;
+
+    return Collections.emptySet();
   }
   
   private class AssignmentInfo {

Modified: accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java Thu Jul  5 21:03:16 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-652/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java Thu Jul  5 21:03:16 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-652/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/conf/ZooConfiguration.java Thu Jul  5 21:03:16 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-652/server/src/main/java/org/apache/accumulo/server/fate/Admin.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/Admin.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/Admin.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/fate/Admin.java Thu Jul  5 21:03:16 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<Master> zs) throws KeeperException, InterruptedException {
-    Map<Long,List<String>> heldLocks = new HashMap<Long,List<String>>();
-    Map<Long,List<String>> waitingLocks = new HashMap<Long,List<String>>();
-    
-    List<String> lockedTables = zk.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS);
-    
-    for (String tableId : lockedTables) {
-      try {
-        List<String> lockNodes = zk.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS + "/" + tableId);
-        lockNodes = new ArrayList<String>(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<Long,List<String>> locks;
-            
-            if (pos == 0) {
-              locks = heldLocks;
-            } else {
-              if (lda[0].charAt(0) == 'R' && !sawWriteLock) {
-                locks = heldLocks;
-              } else {
-                locks = waitingLocks;
-              }
-            }
-            
-            List<String> tables = locks.get(Long.parseLong(lda[1], 16));
-            if (tables == null) {
-              tables = new ArrayList<String>();
-              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<Long> transactions = zs.list();
-    
-    for (Long tid : transactions) {
-      
-      zs.reserve(tid);
-      
-      String debug = (String) zs.getProperty(tid, "debug");
-      
-      List<String> hlocks = heldLocks.remove(tid);
-      if (hlocks == null)
-        hlocks = Collections.emptyList();
-      
-      List<String> wlocks = waitingLocks.remove(tid);
-      if (wlocks == null)
-        wlocks = Collections.emptyList();
-      
-      String top = null;
-      Repo<Master> 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<Long,List<String>> entry : heldLocks.entrySet())
-        System.out.printf("txid: %016x  locked: %s\n", entry.getKey(), entry.getValue());
-      
-      for (Entry<Long,List<String>> 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<Master> admin = new AdminUtil<Master>();
     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 <txid> | delete <txid> | 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<Master> zs = new ZooStore<Master>(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<String> lockedTables = zk.getChildren(ZooUtil.getRoot(instance) + Constants.ZTABLE_LOCKS);
-      
-      for (String tableId : lockedTables) {
-        List<String> 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-652/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Thu Jul  5 21:03:16 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-652/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java Thu Jul  5 21:03:16 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-652/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/Master.java Thu Jul  5 21:03:16 2012
@@ -89,13 +89,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;
@@ -148,12 +152,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;
@@ -1677,7 +1677,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);
@@ -1709,11 +1710,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);
+          }
       }
     }
 
@@ -2093,7 +2095,7 @@ public class Master implements LiveTServ
     
     // TODO: add shutdown for fate object
     try {
-      fate = new Fate<Master>(this, new org.apache.accumulo.server.fate.ZooStore<Master>(ZooUtil.getRoot(instance) + Constants.ZFATE,
+      fate = new Fate<Master>(this, new org.apache.accumulo.fate.ZooStore<Master>(ZooUtil.getRoot(instance) + Constants.ZFATE,
           ZooReaderWriter.getRetryingInstance()), 4);
     } catch (KeeperException e) {
       throw new IOException(e);

Modified: accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/TServerLockWatcher.java Thu Jul  5 21:03:16 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-652/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java Thu Jul  5 21:03:16 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-652/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java Thu Jul  5 21:03:16 2012
@@ -20,10 +20,10 @@ 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.server.master.Master;
 import org.apache.accumulo.server.master.tableOps.MasterRepo;
+import org.apache.accumulo.server.zookeeper.DistributedWorkQueue;
 import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
@@ -48,18 +48,19 @@ public class SubmitFileForRecovery exten
   public Repo<Master> call(long tid, final Master master) throws Exception {
     master.updateRecoveryInProgress(file);
     String source = RecoverLease.getSource(master, server, file).toString();
+    new DistributedWorkQueue(ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY).addWork(file, source.getBytes());
+    
     ZooReaderWriter zoo = ZooReaderWriter.getInstance();
     final String path = ZooUtil.getRoot(master.getInstance()) + Constants.ZRECOVERY + "/" + file;
-    zoo.putPersistentData(path, source.getBytes(), NodeExistsPolicy.SKIP);
     log.info("Created zookeeper entry " + path + " with data " + source);
     zoo.exists(path, new Watcher() {
       @Override
       public void process(WatchedEvent event) {
         switch (event.getType()) {
-          case NodeDataChanged:
+          case NodeDeleted:
             log.info("noticed recovery entry for " + file + " was removed");
             FileSystem fs = master.getFileSystem();
-            Path finished = new Path(Constants.getRecoveryDir(master.getSystemConfiguration()), "finished");
+            Path finished = new Path(Constants.getRecoveryDir(master.getSystemConfiguration()) + "/" + file, "finished");
             try {
               if (fs.exists(finished))
                 log.info("log recovery for " + file + " successful");

Modified: accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/DeadServerList.java Thu Jul  5 21:03:16 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-652/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java?rev=1357909&r1=1357908&r2=1357909&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java (original)
+++ accumulo/branches/ACCUMULO-652/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java Thu Jul  5 21:03:16 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;



Mime
View raw message