accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1342276 [1/2] - in /accumulo/branches/ACCUMULO-578: core/src/main/java/org/apache/accumulo/core/ core/src/main/java/org/apache/accumulo/core/conf/ core/src/main/java/org/apache/accumulo/core/master/thrift/ core/src/main/java/org/apache/acc...
Date Thu, 24 May 2012 14:08:32 GMT
Author: ecn
Date: Thu May 24 14:08:30 2012
New Revision: 1342276

URL: http://svn.apache.org/viewvc?rev=1342276&view=rev
Log:
ACCUMULO-578: rip out the logger

Removed:
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/LoggerStatus.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/LogCopyInfo.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/LogFile.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/LoggerClosedException.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchLogIDException.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/logger/IdentityReducer.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/logger/LogArchiver.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/logger/metrics/
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/LogSort.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/TabletServerLoggers.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/tserverOps/DisconnectLogger.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/tserverOps/FlushTablets.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/tserverOps/StopLogger.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/LoggersServlet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RemoteLogger.java
    accumulo/branches/ACCUMULO-578/server/src/test/java/org/apache/accumulo/server/logger/TestLogWriter.java
    accumulo/branches/ACCUMULO-578/server/src/test/java/org/apache/accumulo/server/master/TestTabletServerLoggers.java
Modified:
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
    accumulo/branches/ACCUMULO-578/core/src/main/thrift/master.thrift
    accumulo/branches/ACCUMULO-578/core/src/main/thrift/tabletserver.thrift
    accumulo/branches/ACCUMULO-578/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaPartitionedIngester.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/OperationServlet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/IRemoteLogger.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/test/functional/RunTests.java

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java Thu May 24 14:08:30 2012
@@ -62,7 +62,6 @@ public class Constants {
   
   public static final String ZDEAD = "/dead";
   public static final String ZDEADTSERVERS = "/dead/tservers";
-  public static final String ZDEADLOGGERS = "/dead/loggers";
   
   public static final String ZLOGGERS = "/loggers";
   

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java Thu May 24 14:08:30 2012
@@ -58,8 +58,6 @@ public enum Property {
   MASTER_CLIENTPORT("master.port.client", "9999", PropertyType.PORT, "The port used for handling client connections on the master"),
   MASTER_TABLET_BALANCER("master.tablet.balancer", "org.apache.accumulo.server.master.balancer.DefaultLoadBalancer", PropertyType.CLASSNAME,
       "The balancer class that accumulo will use to make tablet assignment and migration decisions."),
-  MASTER_LOGGER_BALANCER("master.logger.balancer", "org.apache.accumulo.server.master.balancer.SimpleLoggerBalancer", PropertyType.CLASSNAME,
-      "The balancer class that accumulo will use to make logger assignment decisions."),
   MASTER_RECOVERY_MAXAGE("master.recovery.max.age", "60m", PropertyType.TIMEDURATION, "Recovery files older than this age will be removed."),
   MASTER_RECOVERY_MAXTIME("master.recovery.time.max", "30m", PropertyType.TIMEDURATION, "The maximum time to attempt recovery before giving up"),
   MASTER_BULK_RETRIES("master.bulk.retries", "3", PropertyType.COUNT, "The number of attempts to bulk-load a file before giving up."),
@@ -152,7 +150,6 @@ public enum Property {
       "The size of the HDFS blocks used to write to the Write-Ahead log.  If zero, it will be 110% of tserver.walog.max.size (that is, try to use just one block)"),
   TSERV_WAL_REPLICATION("tserver.wal.replication", "0", PropertyType.COUNT,
       "The replication to use when writing the Write-Ahead log to HDFS. If zero, it will use the HDFS default replication setting."),
-  TSERV_USE_DFS_WAL("tserver.use.dfs.wal", "false", PropertyType.BOOLEAN, "Use the distributed file system for write-ahead loggging."),
   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."),
   

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java Thu May 24 14:08:30 2012
@@ -13819,13 +13819,13 @@ import org.slf4j.LoggerFactory;
           case 4: // ARGUMENTS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list47 = iprot.readListBegin();
-                this.arguments = new ArrayList<ByteBuffer>(_list47.size);
-                for (int _i48 = 0; _i48 < _list47.size; ++_i48)
+                org.apache.thrift.protocol.TList _list39 = iprot.readListBegin();
+                this.arguments = new ArrayList<ByteBuffer>(_list39.size);
+                for (int _i40 = 0; _i40 < _list39.size; ++_i40)
                 {
-                  ByteBuffer _elem49;
-                  _elem49 = iprot.readBinary();
-                  this.arguments.add(_elem49);
+                  ByteBuffer _elem41;
+                  _elem41 = iprot.readBinary();
+                  this.arguments.add(_elem41);
                 }
                 iprot.readListEnd();
               }
@@ -13836,15 +13836,15 @@ import org.slf4j.LoggerFactory;
           case 5: // OPTIONS
             if (field.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin();
-                this.options = new HashMap<String,String>(2*_map50.size);
-                for (int _i51 = 0; _i51 < _map50.size; ++_i51)
+                org.apache.thrift.protocol.TMap _map42 = iprot.readMapBegin();
+                this.options = new HashMap<String,String>(2*_map42.size);
+                for (int _i43 = 0; _i43 < _map42.size; ++_i43)
                 {
-                  String _key52;
-                  String _val53;
-                  _key52 = iprot.readString();
-                  _val53 = iprot.readString();
-                  this.options.put(_key52, _val53);
+                  String _key44;
+                  String _val45;
+                  _key44 = iprot.readString();
+                  _val45 = iprot.readString();
+                  this.options.put(_key44, _val45);
                 }
                 iprot.readMapEnd();
               }
@@ -13892,9 +13892,9 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(ARGUMENTS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.arguments.size()));
-          for (ByteBuffer _iter54 : this.arguments)
+          for (ByteBuffer _iter46 : this.arguments)
           {
-            oprot.writeBinary(_iter54);
+            oprot.writeBinary(_iter46);
           }
           oprot.writeListEnd();
         }
@@ -13904,10 +13904,10 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.options.size()));
-          for (Map.Entry<String, String> _iter55 : this.options.entrySet())
+          for (Map.Entry<String, String> _iter47 : this.options.entrySet())
           {
-            oprot.writeString(_iter55.getKey());
-            oprot.writeString(_iter55.getValue());
+            oprot.writeString(_iter47.getKey());
+            oprot.writeString(_iter47.getValue());
           }
           oprot.writeMapEnd();
         }

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java Thu May 24 14:08:30 2012
@@ -27,19 +27,16 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField T_SERVER_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tServerInfo", org.apache.thrift.protocol.TType.LIST, (short)2);
   private static final org.apache.thrift.protocol.TField BAD_TSERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("badTServers", org.apache.thrift.protocol.TType.MAP, (short)3);
   private static final org.apache.thrift.protocol.TField RECOVERY_FIELD_DESC = new org.apache.thrift.protocol.TField("recovery", org.apache.thrift.protocol.TType.LIST, (short)4);
-  private static final org.apache.thrift.protocol.TField LOGGERS_FIELD_DESC = new org.apache.thrift.protocol.TField("loggers", org.apache.thrift.protocol.TType.LIST, (short)5);
   private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)6);
   private static final org.apache.thrift.protocol.TField GOAL_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("goalState", org.apache.thrift.protocol.TType.I32, (short)8);
   private static final org.apache.thrift.protocol.TField UNASSIGNED_TABLETS_FIELD_DESC = new org.apache.thrift.protocol.TField("unassignedTablets", org.apache.thrift.protocol.TType.I32, (short)7);
   private static final org.apache.thrift.protocol.TField SERVERS_SHUTTING_DOWN_FIELD_DESC = new org.apache.thrift.protocol.TField("serversShuttingDown", org.apache.thrift.protocol.TType.SET, (short)9);
   private static final org.apache.thrift.protocol.TField DEAD_TABLET_SERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("deadTabletServers", org.apache.thrift.protocol.TType.LIST, (short)10);
-  private static final org.apache.thrift.protocol.TField DEAD_LOGGERS_FIELD_DESC = new org.apache.thrift.protocol.TField("deadLoggers", org.apache.thrift.protocol.TType.LIST, (short)11);
 
   public Map<String,TableInfo> tableMap;
   public List<TabletServerStatus> tServerInfo;
   public Map<String,Byte> badTServers;
   public List<RecoveryStatus> recovery;
-  public List<LoggerStatus> loggers;
   /**
    * 
    * @see MasterState
@@ -53,7 +50,6 @@ import org.slf4j.LoggerFactory;
   public int unassignedTablets;
   public Set<String> serversShuttingDown;
   public List<DeadServer> deadTabletServers;
-  public List<DeadServer> deadLoggers;
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,7 +57,6 @@ import org.slf4j.LoggerFactory;
     T_SERVER_INFO((short)2, "tServerInfo"),
     BAD_TSERVERS((short)3, "badTServers"),
     RECOVERY((short)4, "recovery"),
-    LOGGERS((short)5, "loggers"),
     /**
      * 
      * @see MasterState
@@ -74,8 +69,7 @@ import org.slf4j.LoggerFactory;
     GOAL_STATE((short)8, "goalState"),
     UNASSIGNED_TABLETS((short)7, "unassignedTablets"),
     SERVERS_SHUTTING_DOWN((short)9, "serversShuttingDown"),
-    DEAD_TABLET_SERVERS((short)10, "deadTabletServers"),
-    DEAD_LOGGERS((short)11, "deadLoggers");
+    DEAD_TABLET_SERVERS((short)10, "deadTabletServers");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -98,8 +92,6 @@ import org.slf4j.LoggerFactory;
           return BAD_TSERVERS;
         case 4: // RECOVERY
           return RECOVERY;
-        case 5: // LOGGERS
-          return LOGGERS;
         case 6: // STATE
           return STATE;
         case 8: // GOAL_STATE
@@ -110,8 +102,6 @@ import org.slf4j.LoggerFactory;
           return SERVERS_SHUTTING_DOWN;
         case 10: // DEAD_TABLET_SERVERS
           return DEAD_TABLET_SERVERS;
-        case 11: // DEAD_LOGGERS
-          return DEAD_LOGGERS;
         default:
           return null;
       }
@@ -172,9 +162,6 @@ import org.slf4j.LoggerFactory;
     tmpMap.put(_Fields.RECOVERY, new org.apache.thrift.meta_data.FieldMetaData("recovery", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RecoveryStatus.class))));
-    tmpMap.put(_Fields.LOGGERS, new org.apache.thrift.meta_data.FieldMetaData("loggers", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LoggerStatus.class))));
     tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, MasterState.class)));
     tmpMap.put(_Fields.GOAL_STATE, new org.apache.thrift.meta_data.FieldMetaData("goalState", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -187,9 +174,6 @@ import org.slf4j.LoggerFactory;
     tmpMap.put(_Fields.DEAD_TABLET_SERVERS, new org.apache.thrift.meta_data.FieldMetaData("deadTabletServers", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DeadServer.class))));
-    tmpMap.put(_Fields.DEAD_LOGGERS, new org.apache.thrift.meta_data.FieldMetaData("deadLoggers", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DeadServer.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MasterMonitorInfo.class, metaDataMap);
   }
@@ -202,27 +186,23 @@ import org.slf4j.LoggerFactory;
     List<TabletServerStatus> tServerInfo,
     Map<String,Byte> badTServers,
     List<RecoveryStatus> recovery,
-    List<LoggerStatus> loggers,
     MasterState state,
     MasterGoalState goalState,
     int unassignedTablets,
     Set<String> serversShuttingDown,
-    List<DeadServer> deadTabletServers,
-    List<DeadServer> deadLoggers)
+    List<DeadServer> deadTabletServers)
   {
     this();
     this.tableMap = tableMap;
     this.tServerInfo = tServerInfo;
     this.badTServers = badTServers;
     this.recovery = recovery;
-    this.loggers = loggers;
     this.state = state;
     this.goalState = goalState;
     this.unassignedTablets = unassignedTablets;
     setUnassignedTabletsIsSet(true);
     this.serversShuttingDown = serversShuttingDown;
     this.deadTabletServers = deadTabletServers;
-    this.deadLoggers = deadLoggers;
   }
 
   /**
@@ -275,13 +255,6 @@ import org.slf4j.LoggerFactory;
       }
       this.recovery = __this__recovery;
     }
-    if (other.isSetLoggers()) {
-      List<LoggerStatus> __this__loggers = new ArrayList<LoggerStatus>();
-      for (LoggerStatus other_element : other.loggers) {
-        __this__loggers.add(new LoggerStatus(other_element));
-      }
-      this.loggers = __this__loggers;
-    }
     if (other.isSetState()) {
       this.state = other.state;
     }
@@ -303,13 +276,6 @@ import org.slf4j.LoggerFactory;
       }
       this.deadTabletServers = __this__deadTabletServers;
     }
-    if (other.isSetDeadLoggers()) {
-      List<DeadServer> __this__deadLoggers = new ArrayList<DeadServer>();
-      for (DeadServer other_element : other.deadLoggers) {
-        __this__deadLoggers.add(new DeadServer(other_element));
-      }
-      this.deadLoggers = __this__deadLoggers;
-    }
   }
 
   public MasterMonitorInfo deepCopy() {
@@ -322,14 +288,12 @@ import org.slf4j.LoggerFactory;
     this.tServerInfo = null;
     this.badTServers = null;
     this.recovery = null;
-    this.loggers = null;
     this.state = null;
     this.goalState = null;
     setUnassignedTabletsIsSet(false);
     this.unassignedTablets = 0;
     this.serversShuttingDown = null;
     this.deadTabletServers = null;
-    this.deadLoggers = null;
   }
 
   public int getTableMapSize() {
@@ -480,45 +444,6 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public int getLoggersSize() {
-    return (this.loggers == null) ? 0 : this.loggers.size();
-  }
-
-  public java.util.Iterator<LoggerStatus> getLoggersIterator() {
-    return (this.loggers == null) ? null : this.loggers.iterator();
-  }
-
-  public void addToLoggers(LoggerStatus elem) {
-    if (this.loggers == null) {
-      this.loggers = new ArrayList<LoggerStatus>();
-    }
-    this.loggers.add(elem);
-  }
-
-  public List<LoggerStatus> getLoggers() {
-    return this.loggers;
-  }
-
-  public MasterMonitorInfo setLoggers(List<LoggerStatus> loggers) {
-    this.loggers = loggers;
-    return this;
-  }
-
-  public void unsetLoggers() {
-    this.loggers = null;
-  }
-
-  /** Returns true if field loggers is set (has been assigned a value) and false otherwise */
-  public boolean isSetLoggers() {
-    return this.loggers != null;
-  }
-
-  public void setLoggersIsSet(boolean value) {
-    if (!value) {
-      this.loggers = null;
-    }
-  }
-
   /**
    * 
    * @see MasterState
@@ -684,45 +609,6 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public int getDeadLoggersSize() {
-    return (this.deadLoggers == null) ? 0 : this.deadLoggers.size();
-  }
-
-  public java.util.Iterator<DeadServer> getDeadLoggersIterator() {
-    return (this.deadLoggers == null) ? null : this.deadLoggers.iterator();
-  }
-
-  public void addToDeadLoggers(DeadServer elem) {
-    if (this.deadLoggers == null) {
-      this.deadLoggers = new ArrayList<DeadServer>();
-    }
-    this.deadLoggers.add(elem);
-  }
-
-  public List<DeadServer> getDeadLoggers() {
-    return this.deadLoggers;
-  }
-
-  public MasterMonitorInfo setDeadLoggers(List<DeadServer> deadLoggers) {
-    this.deadLoggers = deadLoggers;
-    return this;
-  }
-
-  public void unsetDeadLoggers() {
-    this.deadLoggers = null;
-  }
-
-  /** Returns true if field deadLoggers is set (has been assigned a value) and false otherwise */
-  public boolean isSetDeadLoggers() {
-    return this.deadLoggers != null;
-  }
-
-  public void setDeadLoggersIsSet(boolean value) {
-    if (!value) {
-      this.deadLoggers = null;
-    }
-  }
-
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TABLE_MAP:
@@ -757,14 +643,6 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case LOGGERS:
-      if (value == null) {
-        unsetLoggers();
-      } else {
-        setLoggers((List<LoggerStatus>)value);
-      }
-      break;
-
     case STATE:
       if (value == null) {
         unsetState();
@@ -805,14 +683,6 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case DEAD_LOGGERS:
-      if (value == null) {
-        unsetDeadLoggers();
-      } else {
-        setDeadLoggers((List<DeadServer>)value);
-      }
-      break;
-
     }
   }
 
@@ -830,9 +700,6 @@ import org.slf4j.LoggerFactory;
     case RECOVERY:
       return getRecovery();
 
-    case LOGGERS:
-      return getLoggers();
-
     case STATE:
       return getState();
 
@@ -848,9 +715,6 @@ import org.slf4j.LoggerFactory;
     case DEAD_TABLET_SERVERS:
       return getDeadTabletServers();
 
-    case DEAD_LOGGERS:
-      return getDeadLoggers();
-
     }
     throw new IllegalStateException();
   }
@@ -870,8 +734,6 @@ import org.slf4j.LoggerFactory;
       return isSetBadTServers();
     case RECOVERY:
       return isSetRecovery();
-    case LOGGERS:
-      return isSetLoggers();
     case STATE:
       return isSetState();
     case GOAL_STATE:
@@ -882,8 +744,6 @@ import org.slf4j.LoggerFactory;
       return isSetServersShuttingDown();
     case DEAD_TABLET_SERVERS:
       return isSetDeadTabletServers();
-    case DEAD_LOGGERS:
-      return isSetDeadLoggers();
     }
     throw new IllegalStateException();
   }
@@ -937,15 +797,6 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_loggers = true && this.isSetLoggers();
-    boolean that_present_loggers = true && that.isSetLoggers();
-    if (this_present_loggers || that_present_loggers) {
-      if (!(this_present_loggers && that_present_loggers))
-        return false;
-      if (!this.loggers.equals(that.loggers))
-        return false;
-    }
-
     boolean this_present_state = true && this.isSetState();
     boolean that_present_state = true && that.isSetState();
     if (this_present_state || that_present_state) {
@@ -991,15 +842,6 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_deadLoggers = true && this.isSetDeadLoggers();
-    boolean that_present_deadLoggers = true && that.isSetDeadLoggers();
-    if (this_present_deadLoggers || that_present_deadLoggers) {
-      if (!(this_present_deadLoggers && that_present_deadLoggers))
-        return false;
-      if (!this.deadLoggers.equals(that.deadLoggers))
-        return false;
-    }
-
     return true;
   }
 
@@ -1056,16 +898,6 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLoggers()).compareTo(typedOther.isSetLoggers());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetLoggers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loggers, typedOther.loggers);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetState()).compareTo(typedOther.isSetState());
     if (lastComparison != 0) {
       return lastComparison;
@@ -1116,16 +948,6 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDeadLoggers()).compareTo(typedOther.isSetDeadLoggers());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDeadLoggers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deadLoggers, typedOther.deadLoggers);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     return 0;
   }
 
@@ -1218,24 +1040,6 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 5: // LOGGERS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
-              this.loggers = new ArrayList<LoggerStatus>(_list23.size);
-              for (int _i24 = 0; _i24 < _list23.size; ++_i24)
-              {
-                LoggerStatus _elem25;
-                _elem25 = new LoggerStatus();
-                _elem25.read(iprot);
-                this.loggers.add(_elem25);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 6: // STATE
           if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.state = MasterState.findByValue(iprot.readI32());
@@ -1261,13 +1065,13 @@ import org.slf4j.LoggerFactory;
         case 9: // SERVERS_SHUTTING_DOWN
           if (field.type == org.apache.thrift.protocol.TType.SET) {
             {
-              org.apache.thrift.protocol.TSet _set26 = iprot.readSetBegin();
-              this.serversShuttingDown = new HashSet<String>(2*_set26.size);
-              for (int _i27 = 0; _i27 < _set26.size; ++_i27)
+              org.apache.thrift.protocol.TSet _set23 = iprot.readSetBegin();
+              this.serversShuttingDown = new HashSet<String>(2*_set23.size);
+              for (int _i24 = 0; _i24 < _set23.size; ++_i24)
               {
-                String _elem28;
-                _elem28 = iprot.readString();
-                this.serversShuttingDown.add(_elem28);
+                String _elem25;
+                _elem25 = iprot.readString();
+                this.serversShuttingDown.add(_elem25);
               }
               iprot.readSetEnd();
             }
@@ -1278,32 +1082,14 @@ import org.slf4j.LoggerFactory;
         case 10: // DEAD_TABLET_SERVERS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list29 = iprot.readListBegin();
-              this.deadTabletServers = new ArrayList<DeadServer>(_list29.size);
-              for (int _i30 = 0; _i30 < _list29.size; ++_i30)
-              {
-                DeadServer _elem31;
-                _elem31 = new DeadServer();
-                _elem31.read(iprot);
-                this.deadTabletServers.add(_elem31);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 11: // DEAD_LOGGERS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
-              this.deadLoggers = new ArrayList<DeadServer>(_list32.size);
-              for (int _i33 = 0; _i33 < _list32.size; ++_i33)
+              org.apache.thrift.protocol.TList _list26 = iprot.readListBegin();
+              this.deadTabletServers = new ArrayList<DeadServer>(_list26.size);
+              for (int _i27 = 0; _i27 < _list26.size; ++_i27)
               {
-                DeadServer _elem34;
-                _elem34 = new DeadServer();
-                _elem34.read(iprot);
-                this.deadLoggers.add(_elem34);
+                DeadServer _elem28;
+                _elem28 = new DeadServer();
+                _elem28.read(iprot);
+                this.deadTabletServers.add(_elem28);
               }
               iprot.readListEnd();
             }
@@ -1330,10 +1116,10 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC);
       {
         oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.tableMap.size()));
-        for (Map.Entry<String, TableInfo> _iter35 : this.tableMap.entrySet())
+        for (Map.Entry<String, TableInfo> _iter29 : this.tableMap.entrySet())
         {
-          oprot.writeString(_iter35.getKey());
-          _iter35.getValue().write(oprot);
+          oprot.writeString(_iter29.getKey());
+          _iter29.getValue().write(oprot);
         }
         oprot.writeMapEnd();
       }
@@ -1343,9 +1129,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(T_SERVER_INFO_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.tServerInfo.size()));
-        for (TabletServerStatus _iter36 : this.tServerInfo)
+        for (TabletServerStatus _iter30 : this.tServerInfo)
         {
-          _iter36.write(oprot);
+          _iter30.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1355,10 +1141,10 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(BAD_TSERVERS_FIELD_DESC);
       {
         oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE, this.badTServers.size()));
-        for (Map.Entry<String, Byte> _iter37 : this.badTServers.entrySet())
+        for (Map.Entry<String, Byte> _iter31 : this.badTServers.entrySet())
         {
-          oprot.writeString(_iter37.getKey());
-          oprot.writeByte(_iter37.getValue());
+          oprot.writeString(_iter31.getKey());
+          oprot.writeByte(_iter31.getValue());
         }
         oprot.writeMapEnd();
       }
@@ -1368,21 +1154,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(RECOVERY_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.recovery.size()));
-        for (RecoveryStatus _iter38 : this.recovery)
-        {
-          _iter38.write(oprot);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.loggers != null) {
-      oprot.writeFieldBegin(LOGGERS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.loggers.size()));
-        for (LoggerStatus _iter39 : this.loggers)
+        for (RecoveryStatus _iter32 : this.recovery)
         {
-          _iter39.write(oprot);
+          _iter32.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1405,9 +1179,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(SERVERS_SHUTTING_DOWN_FIELD_DESC);
       {
         oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, this.serversShuttingDown.size()));
-        for (String _iter40 : this.serversShuttingDown)
+        for (String _iter33 : this.serversShuttingDown)
         {
-          oprot.writeString(_iter40);
+          oprot.writeString(_iter33);
         }
         oprot.writeSetEnd();
       }
@@ -1417,21 +1191,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(DEAD_TABLET_SERVERS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.deadTabletServers.size()));
-        for (DeadServer _iter41 : this.deadTabletServers)
+        for (DeadServer _iter34 : this.deadTabletServers)
         {
-          _iter41.write(oprot);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.deadLoggers != null) {
-      oprot.writeFieldBegin(DEAD_LOGGERS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.deadLoggers.size()));
-        for (DeadServer _iter42 : this.deadLoggers)
-        {
-          _iter42.write(oprot);
+          _iter34.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1478,14 +1240,6 @@ import org.slf4j.LoggerFactory;
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("loggers:");
-    if (this.loggers == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.loggers);
-    }
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("state:");
     if (this.state == null) {
       sb.append("null");
@@ -1521,14 +1275,6 @@ import org.slf4j.LoggerFactory;
       sb.append(this.deadTabletServers);
     }
     first = false;
-    if (!first) sb.append(", ");
-    sb.append("deadLoggers:");
-    if (this.deadLoggers == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.deadLoggers);
-    }
-    first = false;
     sb.append(")");
     return sb.toString();
   }

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java Thu May 24 14:08:30 2012
@@ -348,14 +348,14 @@ import org.slf4j.LoggerFactory;
         case 2: // NEW_TABLETS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list43 = iprot.readListBegin();
-              this.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list43.size);
-              for (int _i44 = 0; _i44 < _list43.size; ++_i44)
+              org.apache.thrift.protocol.TList _list35 = iprot.readListBegin();
+              this.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list35.size);
+              for (int _i36 = 0; _i36 < _list35.size; ++_i36)
               {
-                org.apache.accumulo.core.data.thrift.TKeyExtent _elem45;
-                _elem45 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-                _elem45.read(iprot);
-                this.newTablets.add(_elem45);
+                org.apache.accumulo.core.data.thrift.TKeyExtent _elem37;
+                _elem37 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
+                _elem37.read(iprot);
+                this.newTablets.add(_elem37);
               }
               iprot.readListEnd();
             }
@@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(NEW_TABLETS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.newTablets.size()));
-        for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter46 : this.newTablets)
+        for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter38 : this.newTablets)
         {
-          _iter46.write(oprot);
+          _iter38.write(oprot);
         }
         oprot.writeListEnd();
       }

Modified: accumulo/branches/ACCUMULO-578/core/src/main/thrift/master.thrift
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/thrift/master.thrift?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/thrift/master.thrift (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/thrift/master.thrift Thu May 24 14:08:30 2012
@@ -50,10 +50,6 @@ struct RecoveryStatus {
     6:double copyProgress
 }
 
-struct LoggerStatus {
-    1:string logger
-}
-
 struct TabletServerStatus {
     1:map<string, TableInfo> tableMap
     2:i64 lastContact
@@ -95,13 +91,11 @@ struct MasterMonitorInfo {
     2:list<TabletServerStatus> tServerInfo
     3:map<string, byte> badTServers
     4:list<RecoveryStatus> recovery
-    5:list<LoggerStatus> loggers
     6:MasterState state
     8:MasterGoalState goalState
     7:i32 unassignedTablets
     9:set<string> serversShuttingDown
     10:list<DeadServer> deadTabletServers
-    11:list<DeadServer> deadLoggers
 }
 
 struct TabletSplit {

Modified: accumulo/branches/ACCUMULO-578/core/src/main/thrift/tabletserver.thrift
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/thrift/tabletserver.thrift?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/thrift/tabletserver.thrift (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/thrift/tabletserver.thrift Thu May 24 14:08:30 2012
@@ -149,55 +149,10 @@ service TabletClientService extends clie
   double sortLog(1:cloudtrace.TInfo tinfo, 2:security.AuthInfo credentials, 3:string lock, 4:string path) throws (1:security.ThriftSecurityException sec);
 }
 
-// LogID should be cryptographically unguessable
-typedef i64 LogID
 typedef i32 TabletID
 
-exception NoSuchLogIDException {
-}
-
-exception LoggerClosedException {
-}
-
-struct LogFile {
-        1:string name,
-        2:LogID  id,
-}
-
 struct TabletMutations {
 	1:TabletID tabletID,
 	2:i64 seq,
 	3:list<data.TMutation> mutations
 }
-
-struct LogCopyInfo {
-	1:i64 fileSize,
-	2:string loggerZNode
-}
-
-service MutationLogger {
-    LogFile create(3:cloudtrace.TInfo tinfo, 1:security.AuthInfo credentials, 2:string tserverSession) throws (1:security.ThriftSecurityException sec, 2:LoggerClosedException lce),
-
-    // Note that these methods correspond to org.apache.accumulo.server.tabletserver.log.TabletLog
-    void defineTablet(5:cloudtrace.TInfo tinfo, 1:LogID id, 2:i64 seq, 3:TabletID tid, 4:data.TKeyExtent tablet) throws (1:NoSuchLogIDException nsli, 2:LoggerClosedException lce),
-    void log(5:cloudtrace.TInfo tinfo, 1:LogID id, 2:i64 seq, 3:TabletID tid, 4:data.TMutation mutation) throws (1:NoSuchLogIDException nsli, 2:LoggerClosedException lce),
-    void logManyTablets(3:cloudtrace.TInfo tinfo, 1:LogID id, 2:list<TabletMutations> mutations) throws (1:NoSuchLogIDException nsli, 2:LoggerClosedException lce),
-    void minorCompactionStarted(5:cloudtrace.TInfo tinfo, 1:LogID id, 2:i64 seq, 3:TabletID tid, 4:string fqfn) throws (1:NoSuchLogIDException nsli, 2:LoggerClosedException lce),
-    void minorCompactionFinished(5:cloudtrace.TInfo tinfo, 1:LogID id, 2:i64 seq, 3:TabletID tid, 4:string fqfn) throws (1:NoSuchLogIDException nsli, 2:LoggerClosedException lce),
-    void close(2:cloudtrace.TInfo tinfo, 1:LogID id) throws (1:NoSuchLogIDException nsli, 2:LoggerClosedException lce),
-
-    // close a log file and initiate the push to HDFS
-    LogCopyInfo startCopy(4:cloudtrace.TInfo tinfo,
-                  1:security.AuthInfo credentials,
-                  2:string name, 
-                  3:string fullyQualifiedFileName,
-                  5:bool sort) throws (1:security.ThriftSecurityException sec),
-
-    // Support log garbage collection              
-    list<string> getClosedLogs(2:cloudtrace.TInfo tinfo, 1:security.AuthInfo credentials) throws (1:security.ThriftSecurityException sec),
-    oneway void remove(3:cloudtrace.TInfo tinfo, 1:security.AuthInfo credentials, 2:list<string> files),
-    
-    // Shutdown
-    void beginShutdown(1:cloudtrace.TInfo tinfo, 2:security.AuthInfo credentials) throws (1:security.ThriftSecurityException sec);
-    oneway void halt(1:cloudtrace.TInfo tinfo, 2:security.AuthInfo credentials);
-}

Modified: accumulo/branches/ACCUMULO-578/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaPartitionedIngester.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaPartitionedIngester.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaPartitionedIngester.java (original)
+++ accumulo/branches/ACCUMULO-578/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaPartitionedIngester.java Thu May 24 14:08:30 2012
@@ -39,7 +39,6 @@ import org.apache.accumulo.core.client.m
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.user.SummingCombiner;
-import org.apache.accumulo.core.tabletserver.thrift.MutationLogger.log_args;
 import org.apache.accumulo.examples.wikisearch.ingest.ArticleExtractor.Article;
 import org.apache.accumulo.examples.wikisearch.iterator.GlobalIndexUidCombiner;
 import org.apache.accumulo.examples.wikisearch.iterator.TextIndexCombiner;

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java Thu May 24 14:08:30 2012
@@ -18,40 +18,21 @@ package org.apache.accumulo.server.gc;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.accumulo.cloudtrace.instrument.Span;
 import org.apache.accumulo.cloudtrace.instrument.Trace;
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.gc.thrift.GCStatus;
 import org.apache.accumulo.core.gc.thrift.GcCycleStats;
-import org.apache.accumulo.core.tabletserver.thrift.MutationLogger;
-import org.apache.accumulo.core.tabletserver.thrift.MutationLogger.Iface;
-import org.apache.accumulo.core.util.ThriftUtil;
-import org.apache.accumulo.core.zookeeper.ZooUtil;
-import org.apache.accumulo.server.ServerConstants;
-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.util.MetadataTable.LogEntry;
-import org.apache.accumulo.server.zookeeper.IZooReaderWriter;
-import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
 import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.apache.thrift.transport.TTransportException;
 import org.apache.zookeeper.KeeperException;
 
 
@@ -112,58 +93,7 @@ public class GarbageCollectWriteAheadLog
   }
   
   private int removeFiles(Map<String,ArrayList<String>> serverToFileMap, final GCStatus status) {
-    final AtomicInteger count = new AtomicInteger();
-    ExecutorService threadPool = java.util.concurrent.Executors.newCachedThreadPool();
-    
-    for (final Entry<String,ArrayList<String>> serverFiles : serverToFileMap.entrySet()) {
-      final String server = serverFiles.getKey();
-      final List<String> files = serverFiles.getValue();
-      threadPool.submit(new Runnable() {
-        @Override
-        public void run() {
-          try {
-            Iface logger = ThriftUtil.getClient(new MutationLogger.Client.Factory(), server, Property.LOGGER_PORT, Property.TSERV_LOGGER_TIMEOUT, conf);
-            try {
-              count.addAndGet(files.size());
-              log.debug(String.format("removing %d files from %s", files.size(), server));
-              if (files.size() > 0) {
-                log.debug("deleting files on logger " + server);
-                for (String file : files) {
-                  log.debug("Deleting " + file);
-                }
-                logger.remove(null, SecurityConstants.getSystemCredentials(), files);
-                synchronized (status.currentLog) {
-                  status.currentLog.deleted += files.size();
-                }
-              }
-            } finally {
-              ThriftUtil.returnClient(logger);
-            }
-            log.info(String.format("Removed %d files from %s", files.size(), server));
-            for (String file : files) {
-              try {
-                for (FileStatus match : fs.globStatus(new Path(ServerConstants.getRecoveryDir(), file + "*"))) {
-                  fs.delete(match.getPath(), true);
-                }
-              } catch (IOException ex) {
-                log.warn("Error deleting recovery data: ", ex);
-              }
-            }
-          } catch (TTransportException err) {
-            log.info("Ignoring communication error talking to logger " + serverFiles.getKey() + " (probably a timeout)");
-          } catch (TException err) {
-            log.info("Ignoring exception talking to logger " + serverFiles.getKey() + "(" + err + ")");
-          }
-        }
-      });
-      
-    }
-    threadPool.shutdown();
-    while (!threadPool.isShutdown())
-      try {
-        threadPool.awaitTermination(1, TimeUnit.SECONDS);
-      } catch (InterruptedException e) {}
-    return count.get();
+    return 0;
   }
   
   private static Map<String,ArrayList<String>> mapServersToFiles(Map<String,String> fileToServerMap) {
@@ -195,29 +125,6 @@ public class GarbageCollectWriteAheadLog
   
   private int scanServers(Map<String,String> fileToServerMap) throws Exception {
     int count = 0;
-    IZooReaderWriter zk = ZooReaderWriter.getInstance();
-    String loggersDir = ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZLOGGERS;
-    List<String> servers = zk.getChildren(loggersDir, null);
-    Collections.shuffle(servers);
-    for (String server : servers) {
-      String address = "no-data";
-      count++;
-      try {
-        byte[] data = zk.getData(loggersDir + "/" + server, null);
-        address = new String(data);
-        Iface logger = ThriftUtil.getClient(new MutationLogger.Client.Factory(), address, Property.LOGGER_PORT, Property.TSERV_LOGGER_TIMEOUT, conf);
-        for (String log : logger.getClosedLogs(null, SecurityConstants.getSystemCredentials())) {
-          fileToServerMap.put(log, address);
-        }
-        ThriftUtil.returnClient(logger);
-      } catch (TException err) {
-        log.warn("Ignoring exception talking to logger " + address);
-      }
-      if (SimpleGarbageCollector.almostOutOfMemory()) {
-        log.warn("Running out of memory collecting write-ahead log file names from loggers, continuing with a partial list");
-        break;
-      }
-    }
     return count;
   }
   

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java Thu May 24 14:08:30 2012
@@ -29,13 +29,10 @@ import org.apache.accumulo.core.conf.Acc
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.core.master.thrift.RecoveryStatus;
-import org.apache.accumulo.core.tabletserver.thrift.LogCopyInfo;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.server.ServerConstants;
 import org.apache.accumulo.server.tabletserver.log.DfsLogger;
 import org.apache.accumulo.server.tabletserver.log.IRemoteLogger;
-import org.apache.accumulo.server.tabletserver.log.RemoteLogger;
-import org.apache.accumulo.server.zookeeper.ZooCache;
 import org.apache.hadoop.fs.ContentSummary;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
@@ -50,8 +47,6 @@ public class CoordinateRecoveryTask impl
   
   private boolean stop = false;
   
-  private ZooCache zcache;
-  
   private static String fullName(String name) {
     return ServerConstants.getRecoveryDir() + "/" + name;
   }
@@ -103,10 +98,9 @@ public class CoordinateRecoveryTask impl
   private class RecoveryJob {
     final LogFile logFile;
     final long copyStartTime;
-    long copySize = 0;
+    double copySize = 0;
     JobComplete notify = null;
     final AccumuloConfiguration config;
-    String loggerZNode;
     
     RecoveryJob(LogFile entry, JobComplete callback, AccumuloConfiguration conf) throws Exception {
       logFile = entry;
@@ -119,17 +113,10 @@ public class CoordinateRecoveryTask impl
       log.debug("Starting log recovery: " + logFile);
       try {
         // Ask the logging server to put the file in HDFS
-        IRemoteLogger logger;
-        if (logFile.server.length() > 0)
-          logger = new RemoteLogger(logFile.server, config);
-        else
-          logger = new DfsLogger(conf);
-        String base = logFile.unsortedFileName();
+        IRemoteLogger logger = new DfsLogger(conf);
         String source = Constants.getWalDirectory(config) + "/" + logFile.file;
         String dest = Constants.getRecoveryDir(config) + "/" + logFile.file;
-        LogCopyInfo lci = logger.startCopy(source, dest);
-        copySize = lci.fileSize;
-        loggerZNode = lci.loggerZNode;
+        copySize = logger.startCopy(source, dest);
       } catch (Throwable t) {
         log.warn("Unable to recover " + logFile + "(" + t + ")", t);
         fail();
@@ -145,11 +132,6 @@ public class CoordinateRecoveryTask impl
         return true;
       }
       
-      if (loggerZNode != null && loggerZNode.length() > 0 && zcache.get(loggerZNode) == null) {
-        log.debug("zknode " + loggerZNode + " is gone, copy " + logFile.file + " from " + logFile.server + " assumed dead");
-        return true;
-      }
-
       if (elapsedMillis() > config.getTimeInMillis(Property.MASTER_RECOVERY_MAXTIME)) {
         log.warn("Recovery taking too long, giving up");
         return true;
@@ -210,7 +192,6 @@ public class CoordinateRecoveryTask impl
   public CoordinateRecoveryTask(FileSystem fs, AccumuloConfiguration conf) {
     this.fs = fs;
     this.config = conf;
-    zcache = new ZooCache();
   }
   
   public boolean recover(DfsLogger.ServerConfig server, KeyExtent extent, Collection<Collection<String>> entries, JobComplete notify) {

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/Master.java Thu May 24 14:08:30 2012
@@ -67,7 +67,6 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.data.thrift.TKeyExtent;
 import org.apache.accumulo.core.file.FileUtil;
 import org.apache.accumulo.core.master.state.tables.TableState;
-import org.apache.accumulo.core.master.thrift.LoggerStatus;
 import org.apache.accumulo.core.master.thrift.MasterClientService;
 import org.apache.accumulo.core.master.thrift.MasterClientService.Processor;
 import org.apache.accumulo.core.master.thrift.MasterGoalState;
@@ -92,7 +91,6 @@ import org.apache.accumulo.core.zookeepe
 import org.apache.accumulo.core.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.core.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.accumulo.server.Accumulo;
-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.Fate;
@@ -101,12 +99,7 @@ import org.apache.accumulo.server.iterat
 import org.apache.accumulo.server.master.CoordinateRecoveryTask.JobComplete;
 import org.apache.accumulo.server.master.CoordinateRecoveryTask.LogFile;
 import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection;
-import org.apache.accumulo.server.master.TabletServerLoggers.LoggerWatcher;
 import org.apache.accumulo.server.master.balancer.DefaultLoadBalancer;
-import org.apache.accumulo.server.master.balancer.LoggerBalancer;
-import org.apache.accumulo.server.master.balancer.LoggerUser;
-import org.apache.accumulo.server.master.balancer.SimpleLoggerBalancer;
-import org.apache.accumulo.server.master.balancer.TServerUsesLoggers;
 import org.apache.accumulo.server.master.balancer.TabletBalancer;
 import org.apache.accumulo.server.master.state.Assignment;
 import org.apache.accumulo.server.master.state.CurrentState;
@@ -146,8 +139,6 @@ import org.apache.accumulo.server.securi
 import org.apache.accumulo.server.security.ZKAuthenticator;
 import org.apache.accumulo.server.tabletserver.TabletTime;
 import org.apache.accumulo.server.tabletserver.log.DfsLogger.ServerConfig;
-import org.apache.accumulo.server.tabletserver.log.IRemoteLogger;
-import org.apache.accumulo.server.tabletserver.log.RemoteLogger;
 import org.apache.accumulo.server.trace.TraceFileSystem;
 import org.apache.accumulo.server.util.AddressUtil;
 import org.apache.accumulo.server.util.DefaultMap;
@@ -187,7 +178,7 @@ import org.apache.zookeeper.data.Stat;
  * 
  * The master will also coordinate log recoveries and reports general status.
  */
-public class Master implements LiveTServerSet.Listener, LoggerWatcher, TableObserver, CurrentState, JobComplete {
+public class Master implements LiveTServerSet.Listener, TableObserver, CurrentState, JobComplete {
   
   final private static Logger log = Logger.getLogger(Master.class);
   
@@ -216,7 +207,6 @@ public class Master implements LiveTServ
   
   private ZooLock masterLock = null;
   private TServer clientService = null;
-  private TabletServerLoggers loggers = null;
   private CoordinateRecoveryTask recovery = null;
   private TabletBalancer tabletBalancer;
   
@@ -227,8 +217,6 @@ public class Master implements LiveTServ
   volatile private SortedMap<TServerInstance,TabletServerStatus> tserverStatus = Collections
       .unmodifiableSortedMap(new TreeMap<TServerInstance,TabletServerStatus>());
   
-  private LoggerBalancer loggerBalancer;
-  
   synchronized private MasterState getMasterState() {
     return state;
   }
@@ -549,7 +537,6 @@ public class Master implements LiveTServ
     tserverSet = new LiveTServerSet(instance, config.getConfiguration(), this);
     this.tabletBalancer = createInstanceFromPropertyName(aconf, Property.MASTER_TABLET_BALANCER, TabletBalancer.class, new DefaultLoadBalancer());
     this.tabletBalancer.init(serverConfig);
-    this.loggerBalancer = createInstanceFromPropertyName(aconf, Property.MASTER_LOGGER_BALANCER, LoggerBalancer.class, new SimpleLoggerBalancer());
   }
   
   public TServerConnection getConnection(TServerInstance server) {
@@ -709,10 +696,6 @@ public class Master implements LiveTServ
     @Override
     public MasterMonitorInfo getMasterStats(TInfo info, AuthInfo credentials) throws ThriftSecurityException, TException {
       final MasterMonitorInfo result = new MasterMonitorInfo();
-      result.loggers = new ArrayList<LoggerStatus>();
-      for (String logger : loggers.getLoggersFromZooKeeper().values()) {
-        result.loggers.add(new LoggerStatus(logger));
-      }
       result.recovery = recovery.status();
       
       result.tServerInfo = new ArrayList<TabletServerStatus>();
@@ -742,8 +725,6 @@ public class Master implements LiveTServ
       }
       DeadServerList obit = new DeadServerList(ZooUtil.getRoot(instance) + Constants.ZDEADTSERVERS);
       result.deadTabletServers = obit.getList();
-      obit = new DeadServerList(ZooUtil.getRoot(instance) + Constants.ZDEADLOGGERS);
-      result.deadLoggers = obit.getList();
       return result;
     }
     
@@ -858,10 +839,6 @@ public class Master implements LiveTServ
         balancer.init(serverConfig);
         tabletBalancer = balancer;
         log.info("tablet balancer changed to " + tabletBalancer.getClass().getName());
-      } else if (property.equals(Property.MASTER_LOGGER_BALANCER.getKey())) {
-        loggerBalancer = createInstanceFromPropertyName(instance.getConfiguration(), Property.MASTER_LOGGER_BALANCER, LoggerBalancer.class,
-            new SimpleLoggerBalancer());
-        log.info("log balancer changed to " + loggerBalancer.getClass().getName());
       }
     }
 
@@ -1980,7 +1957,6 @@ public class Master implements LiveTServ
       } else if (getMasterGoalState() == MasterGoalState.CLEAN_STOP) {
         log.debug("not balancing because the master is attempting to stop cleanly");
       } else {
-        balanceLoggers();
         return balanceTablets();
       }
       return DEFAULT_WAIT_FOR_WATCHER;
@@ -2013,28 +1989,6 @@ public class Master implements LiveTServ
       }
     }
     
-    private void balanceLoggers() {
-      List<LoggerUser> logUsers = new ArrayList<LoggerUser>();
-      for (Entry<TServerInstance,TabletServerStatus> entry : tserverStatus.entrySet()) {
-        logUsers.add(new TServerUsesLoggers(entry.getKey(), entry.getValue()));
-      }
-      List<String> logNames = new ArrayList<String>(loggers.getLoggersFromZooKeeper().values());
-      Map<LoggerUser,List<String>> assignmentsOut = new HashMap<LoggerUser,List<String>>();
-      int loggersPerServer = getSystemConfiguration().getCount(Property.TSERV_LOGGER_COUNT);
-      loggerBalancer.balance(logUsers, logNames, assignmentsOut, loggersPerServer);
-      for (Entry<LoggerUser,List<String>> entry : assignmentsOut.entrySet()) {
-        TServerUsesLoggers tserver = (TServerUsesLoggers) entry.getKey();
-        try {
-          log.debug("Telling " + tserver.getInstance() + " to use loggers " + entry.getValue());
-          TServerConnection connection = tserverSet.getConnection(tserver.getInstance());
-          if (connection != null)
-            connection.useLoggers(new HashSet<String>(entry.getValue()));
-        } catch (Exception ex) {
-          log.warn("Unable to talk to " + tserver.getInstance(), ex);
-        }
-      }
-    }
-    
     private long balanceTablets() {
       List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
       Set<KeyExtent> migrationsCopy = new HashSet<KeyExtent>();
@@ -2105,9 +2059,6 @@ public class Master implements LiveTServ
     Thread recoveryThread = new Daemon(new LoggingRunnable(log, recovery), "Recovery Status");
     recoveryThread.start();
     
-    loggers = new TabletServerLoggers(this, getSystemConfiguration());
-    loggers.scanZooKeeperForUpdates();
-    
     StatusThread statusThread = new StatusThread();
     statusThread.start();
     
@@ -2219,42 +2170,9 @@ public class Master implements LiveTServ
     }
   }
   
-  @Override
-  public void newLogger(String address) {
-    try {
-      IRemoteLogger remote = new RemoteLogger(address, getSystemConfiguration());
-      for (String onDisk : remote.getClosedLogs()) {
-        Path path = new Path(ServerConstants.getRecoveryDir(), onDisk + "/failed");
-        if (fs.exists(path)) {
-          fs.delete(path.getParent(), true);
-        }
-      }
-    } catch (Exception ex) {
-      log.warn("Unexpected error clearing failed recovery markers for new logger", ex);
-    }
-    DeadServerList obit = new DeadServerList(ZooUtil.getRoot(instance) + Constants.ZDEADLOGGERS);
-    obit.delete(address);
-    nextEvent.event("Added logger %s", address);
-  }
-  
   static final String I_DONT_KNOW_WHY = "unexpected failure";
   
   @Override
-  public void deadLogger(String address) {
-    DeadServerList obit = new DeadServerList(ZooUtil.getRoot(instance) + Constants.ZDEADLOGGERS);
-    InetSocketAddress parseAddress = AddressUtil.parseAddress(address, Property.LOGGER_PORT);
-    String cause = I_DONT_KNOW_WHY;
-    for (TServerInstance server : serversToShutdown) {
-      if (server.getLocation().getHostName().equals(parseAddress.getHostName())) {
-        cause = "clean shutdown";
-        break;
-      }
-    }
-    obit.post(address, cause);
-    log.info("Noticed logger went away: " + address);
-  }
-  
-  @Override
   public void update(LiveTServerSet current, Set<TServerInstance> deleted, Set<TServerInstance> added) {
     DeadServerList obit = new DeadServerList(ZooUtil.getRoot(instance) + Constants.ZDEADTSERVERS);
     if (added.size() > 0) {
@@ -2329,10 +2247,6 @@ public class Master implements LiveTServ
     return tserverSet.getCurrentServers();
   }
   
-  public Map<String,String> getLoggers() {
-    return loggers.getLoggersFromZooKeeper();
-  }
-  
   @Override
   public Collection<MergeInfo> merges() {
     List<MergeInfo> result = new ArrayList<MergeInfo>();

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/tserverOps/ShutdownTServer.java Thu May 24 14:08:30 2012
@@ -22,9 +22,9 @@ import org.apache.accumulo.core.util.Add
 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.server.master.Master;
 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;
@@ -60,7 +60,7 @@ public class ShutdownTServer extends Mas
       path = ZooUtil.getRoot(m.getInstance()) + Constants.ZDEADTSERVERS + "/" + tserver;
       IZooReaderWriter zoo = ZooReaderWriter.getInstance();
       zoo.putPersistentData(path, "forced down".getBytes(), NodeExistsPolicy.OVERWRITE);
-      return new DisconnectLogger(server.getLocation().getAddress().getHostAddress());
+      return null;
     }
     
     // TODO move this to isReady() and drop while loop?
@@ -86,7 +86,7 @@ public class ShutdownTServer extends Mas
       listener.waitForEvents(1000);
     }
     
-    return new DisconnectLogger(server.getLocation().getAddress().getHostAddress());
+    return null;
   }
   
   @Override

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java Thu May 24 14:08:30 2012
@@ -56,7 +56,6 @@ import org.apache.accumulo.server.monito
 import org.apache.accumulo.server.monitor.servlets.GcStatusServlet;
 import org.apache.accumulo.server.monitor.servlets.JSONServlet;
 import org.apache.accumulo.server.monitor.servlets.LogServlet;
-import org.apache.accumulo.server.monitor.servlets.LoggersServlet;
 import org.apache.accumulo.server.monitor.servlets.MasterServlet;
 import org.apache.accumulo.server.monitor.servlets.OperationServlet;
 import org.apache.accumulo.server.monitor.servlets.ProblemServlet;
@@ -476,7 +475,6 @@ public class Monitor {
     server.addServlet(MasterServlet.class, "/master");
     server.addServlet(TablesServlet.class, "/tables");
     server.addServlet(TServersServlet.class, "/tservers");
-    server.addServlet(LoggersServlet.class, "/loggers");
     server.addServlet(ProblemServlet.class, "/problems");
     server.addServlet(GcStatusServlet.class, "/gc");
     server.addServlet(LogServlet.class, "/log");

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java Thu May 24 14:08:30 2012
@@ -137,8 +137,6 @@ public class MasterServlet extends Basic
       masterStatus.addSortableColumn("#&nbsp;Online<br />Tablet&nbsp;Servers", new NumberType<Integer>((int) (slaves.size() * 0.8 + 1.0), slaves.size(),
           (int) (slaves.size() * 0.6 + 1.0), slaves.size()), "Number of tablet servers currently available");
       masterStatus.addSortableColumn("#&nbsp;Total<br />Tablet&nbsp;Servers", new NumberType<Integer>(), "The total number of tablet servers configured");
-      masterStatus.addSortableColumn("Loggers", new NumberType<Integer>((int) (slaves.size() * .8), Integer.MAX_VALUE, 1, Integer.MAX_VALUE),
-          "The number of write-ahead loggers.  This should be approximately the same as the number of tablet servers (and greater than zero).");
       masterStatus.addSortableColumn("Last&nbsp;GC", null, "The last time files were cleaned-up from HDFS.");
       masterStatus.addSortableColumn("#&nbsp;Tablets", new NumberType<Integer>(0, Integer.MAX_VALUE, 2, Integer.MAX_VALUE), null);
       masterStatus.addSortableColumn("#&nbsp;Unassigned<br />Tablets", new NumberType<Integer>(0, 0), null);
@@ -156,7 +154,6 @@ public class MasterServlet extends Basic
       row.add(masters.size() == 0 ? "<div class='error'>Down</div>" : AddressUtil.parseAddress(masters.get(0), 0).getHostName());
       row.add(Monitor.getMmi().tServerInfo.size());
       row.add(slaves.size());
-      row.add(Monitor.getMmi().loggers.size());
       row.add("<a href='/gc'>" + gcStatus + "</a>");
       row.add(Monitor.getTotalTabletCount());
       row.add(Monitor.getMmi().unassignedTablets);

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/OperationServlet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/OperationServlet.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/OperationServlet.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/OperationServlet.java Thu May 24 14:08:30 2012
@@ -167,8 +167,6 @@ public class OperationServlet extends Ba
       // a dead server should have a uniq address: a logger or tserver
       DeadServerList obit = new DeadServerList(ZooUtil.getRoot(inst) + Constants.ZDEADTSERVERS);
       obit.delete(server);
-      obit = new DeadServerList(ZooUtil.getRoot(inst) + Constants.ZDEADLOGGERS);
-      obit.delete(server);
     }
   }
 }

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java Thu May 24 14:08:30 2012
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.client.I
 import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.master.thrift.Compacting;
 import org.apache.accumulo.core.master.thrift.DeadServer;
-import org.apache.accumulo.core.master.thrift.LoggerStatus;
 import org.apache.accumulo.core.master.thrift.TableInfo;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 import org.apache.accumulo.server.client.HdfsZooInstance;
@@ -110,12 +109,6 @@ public class XMLServlet extends BasicSer
     }
     sb.append("\n</badTabletServers>\n");
     
-    sb.append("\n<loggers>\n");
-    for (LoggerStatus entry : Monitor.getMmi().loggers) {
-      sb.append(String.format("<logger id='%s'/>\n", entry.logger));
-    }
-    sb.append("\n</loggers>\n");
-    
     sb.append("\n<tabletServersShuttingDown>\n");
     for (String server : Monitor.getMmi().serversShuttingDown) {
       sb.append(String.format("<server id='%s'/>\n", server));

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java Thu May 24 14:08:30 2012
@@ -112,7 +112,6 @@ import org.apache.accumulo.server.tablet
 import org.apache.accumulo.server.tabletserver.TabletStatsKeeper.Operation;
 import org.apache.accumulo.server.tabletserver.log.IRemoteLogger;
 import org.apache.accumulo.server.tabletserver.log.MutationReceiver;
-import org.apache.accumulo.server.tabletserver.log.RemoteLogger;
 import org.apache.accumulo.server.tabletserver.mastermessage.TabletStatusMessage;
 import org.apache.accumulo.server.tabletserver.metrics.TabletServerMinCMetrics;
 import org.apache.accumulo.server.trace.TraceFileSystem;
@@ -1224,17 +1223,6 @@ public class Tablet {
     return datafiles;
   }
   
-  private static Set<IRemoteLogger> getCurrentLoggers(List<LogEntry> entries) {
-    Set<IRemoteLogger> result = new HashSet<IRemoteLogger>();
-    for (LogEntry logEntry : entries) {
-      for (String log : logEntry.logSet) {
-        String[] parts = log.split("/", 2);
-        result.add(new RemoteLogger(parts[0], parts[1]));
-      }
-    }
-    return result;
-  }
-  
   private static List<LogEntry> lookupLogEntries(KeyExtent ke, SortedMap<Key,Value> tabletsKeyValues) {
     List<LogEntry> logEntries = new ArrayList<LogEntry>();
     
@@ -1468,7 +1456,6 @@ public class Tablet {
           throw new RuntimeException(t);
         }
       }
-      currentLogs = getCurrentLoggers(logEntries);
       log.info("Write-Ahead Log recovery complete for " + this.extent + " (" + count[0] + " mutations applied, " + tabletMemory.getNumEntries()
           + " entries created)");
     }

Modified: accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java?rev=1342276&r1=1342275&r2=1342276&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java (original)
+++ accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java Thu May 24 14:08:30 2012
@@ -37,10 +37,6 @@ import org.apache.accumulo.core.conf.Acc
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
-import org.apache.accumulo.core.tabletserver.thrift.LogCopyInfo;
-import org.apache.accumulo.core.tabletserver.thrift.LoggerClosedException;
-import org.apache.accumulo.core.tabletserver.thrift.NoSuchLogIDException;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
 import org.apache.accumulo.core.tabletserver.thrift.TabletMutations;
 import org.apache.accumulo.core.util.Daemon;
@@ -49,13 +45,10 @@ import org.apache.accumulo.server.logger
 import org.apache.accumulo.server.logger.LogFileValue;
 import org.apache.accumulo.server.master.state.TServerInstance;
 import org.apache.accumulo.server.security.SecurityConstants;
-import org.apache.accumulo.server.tabletserver.log.RemoteLogger.LogWork;
-import org.apache.accumulo.server.tabletserver.log.RemoteLogger.LoggerOperation;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
 
 /**
  * Wrap a connection to a logger.
@@ -72,11 +65,11 @@ public class DfsLogger implements IRemot
     Set<TServerInstance> getCurrentTServers();
   }
 
-  private LinkedBlockingQueue<LogWork> workQueue = new LinkedBlockingQueue<LogWork>();
+  private LinkedBlockingQueue<DfsLogger.LogWork> workQueue = new LinkedBlockingQueue<DfsLogger.LogWork>();
   
   private String closeLock = new String("foo");
   
-  private static final LogWork CLOSED_MARKER = new LogWork(null, null);
+  private static final DfsLogger.LogWork CLOSED_MARKER = new DfsLogger.LogWork(null, null);
   
   private static final LogFileValue EMPTY = new LogFileValue();
   
@@ -86,7 +79,7 @@ public class DfsLogger implements IRemot
 
     @Override
     public void run() {
-      ArrayList<LogWork> work = new ArrayList<LogWork>();
+      ArrayList<DfsLogger.LogWork> work = new ArrayList<DfsLogger.LogWork>();
       while (true) {
         work.clear();
         
@@ -104,19 +97,19 @@ public class DfsLogger implements IRemot
               logFile.sync();
             } catch (IOException ex) {
               log.warn("Exception syncing " + ex);
-              for (LogWork logWork : work) {
+              for (DfsLogger.LogWork logWork : work) {
                 logWork.exception = ex;
               }
             }
           } else {
-            for (LogWork logWork : work) {
-              logWork.exception = new LoggerClosedException();
+            for (DfsLogger.LogWork logWork : work) {
+              logWork.exception = new IOException("logger closed");
             }
           }
         }
         
         boolean sawClosedMarker = false;
-        for (LogWork logWork : work)
+        for (DfsLogger.LogWork logWork : work)
           if (logWork == CLOSED_MARKER)
             sawClosedMarker = true;
           else
@@ -132,6 +125,42 @@ public class DfsLogger implements IRemot
     }
   }
 
+  static class LogWork {
+    List<TabletMutations> mutations;
+    CountDownLatch latch;
+    volatile Exception exception;
+    
+    public LogWork(List<TabletMutations> mutations, CountDownLatch latch) {
+      this.mutations = mutations;
+      this.latch = latch;
+    }
+  }
+
+  public static class LoggerOperation {
+    private LogWork work;
+    
+    public LoggerOperation(LogWork work) {
+      this.work = work;
+    }
+    
+    public void await() throws IOException {
+      try {
+        work.latch.await();
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
+      }
+      
+      if (work.exception != null) {
+        if (work.exception instanceof IOException)
+          throw (IOException) work.exception;
+        else if (work.exception instanceof RuntimeException)
+          throw (RuntimeException) work.exception;
+        else
+          throw new RuntimeException(work.exception);
+      }
+    }
+  }
+
   /* (non-Javadoc)
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#equals(java.lang.Object)
    */
@@ -229,7 +258,7 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#close()
    */
   @Override
-  public void close() throws NoSuchLogIDException, LoggerClosedException, TException {
+  public void close() throws IOException {
     
     synchronized (closeLock) {
       if (closed)
@@ -254,7 +283,7 @@ public class DfsLogger implements IRemot
         logFile.close();
       } catch (IOException ex) {
         log.error(ex);
-        throw new LoggerClosedException();
+        throw new IOException("Log file closed");
       }
   }
   
@@ -262,7 +291,7 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#defineTablet(int, int, org.apache.accumulo.core.data.KeyExtent)
    */
   @Override
-  public synchronized void defineTablet(int seq, int tid, KeyExtent tablet) throws NoSuchLogIDException, LoggerClosedException, TException {
+  public synchronized void defineTablet(int seq, int tid, KeyExtent tablet) throws IOException {
     // write this log to the METADATA table
     final LogFileKey key = new LogFileKey();
     key.event = DEFINE_TABLET;
@@ -275,7 +304,7 @@ public class DfsLogger implements IRemot
       logFile.sync();
     } catch (IOException ex) {
       log.error(ex);
-      throw new LoggerClosedException();
+      throw ex;
     }
   }
   
@@ -293,7 +322,7 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#log(int, int, org.apache.accumulo.core.data.Mutation)
    */
   @Override
-  public LoggerOperation log(int seq, int tid, Mutation mutation) throws NoSuchLogIDException, LoggerClosedException, TException {
+  public LoggerOperation log(int seq, int tid, Mutation mutation) throws IOException {
     return logManyTablets(Collections.singletonList(new TabletMutations(tid, seq, Collections.singletonList(mutation.toThrift()))));
   }
   
@@ -301,8 +330,8 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#logManyTablets(java.util.List)
    */
   @Override
-  public LoggerOperation logManyTablets(List<TabletMutations> mutations) throws NoSuchLogIDException, LoggerClosedException, TException {
-    LogWork work = new LogWork(mutations, new CountDownLatch(1));
+  public LoggerOperation logManyTablets(List<TabletMutations> mutations) throws IOException {
+    DfsLogger.LogWork work = new DfsLogger.LogWork(mutations, new CountDownLatch(1));
     
     synchronized (DfsLogger.this) {
       try {
@@ -329,7 +358,7 @@ public class DfsLogger implements IRemot
       // to wait on walog I/O operations
 
       if (closed)
-        throw new LoggerClosedException();
+        throw new IOException("logger closed");
       workQueue.add(work);
     }
 
@@ -340,7 +369,7 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#minorCompactionFinished(int, int, java.lang.String)
    */
   @Override
-  public synchronized void minorCompactionFinished(int seq, int tid, String fqfn) throws NoSuchLogIDException, LoggerClosedException, TException {
+  public synchronized void minorCompactionFinished(int seq, int tid, String fqfn) throws IOException {
     LogFileKey key = new LogFileKey();
     key.event = COMPACTION_FINISH;
     key.seq = seq;
@@ -349,7 +378,7 @@ public class DfsLogger implements IRemot
       write(key, EMPTY);
     } catch (IOException ex) {
       log.error(ex);
-      throw new LoggerClosedException();
+      throw ex;
     }
   }
   
@@ -357,7 +386,7 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#minorCompactionStarted(int, int, java.lang.String)
    */
   @Override
-  public synchronized void minorCompactionStarted(int seq, int tid, String fqfn) throws NoSuchLogIDException, LoggerClosedException, TException {
+  public synchronized void minorCompactionStarted(int seq, int tid, String fqfn) throws IOException {
     LogFileKey key = new LogFileKey();
     key.event = COMPACTION_START;
     key.seq = seq;
@@ -367,7 +396,7 @@ public class DfsLogger implements IRemot
       write(key, EMPTY);
     } catch (IOException ex) {
       log.error(ex);
-      throw new LoggerClosedException();
+      throw ex;
     }
   }
   
@@ -375,7 +404,7 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#startCopy(java.lang.String, java.lang.String)
    */
   @Override
-  public synchronized LogCopyInfo startCopy(String source, String dest) throws ThriftSecurityException, TException {
+  public synchronized double startCopy(String source, String dest) throws IOException {
     Iface client = null;
     try {
       Set<TServerInstance> current = conf.getCurrentTServers();
@@ -384,12 +413,13 @@ public class DfsLogger implements IRemot
       Random random = new Random();
       int choice = random.nextInt(current.size());
       TServerInstance instance = current.toArray(new TServerInstance[] {})[choice];
-      client = ThriftUtil.getTServerClient(instance.hostPort(), conf.getConfiguration());
-      log.info("Asking " + instance.hostPort() + " to copy/sort from " + source + " to " + dest);
-      LogCopyInfo result = new LogCopyInfo();
-      client.sortLog(null, SecurityConstants.getSystemCredentials(), source, dest);
-      result.fileSize = conf.getConfiguration().getMemoryInBytes(Property.TSERV_WALOG_MAX_SIZE);
-      return result;
+      try {
+        client = ThriftUtil.getTServerClient(instance.hostPort(), conf.getConfiguration());
+        log.info("Asking " + instance.hostPort() + " to copy/sort from " + source + " to " + dest);
+        return client.sortLog(null, SecurityConstants.getSystemCredentials(), source, dest);
+      } catch (Exception ex) {
+        throw new IOException(ex);
+      }
     } finally {
       if (client != null)
         ThriftUtil.returnClient(client);
@@ -400,7 +430,7 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#getClosedLogs()
    */
   @Override
-  public synchronized List<String> getClosedLogs() throws ThriftSecurityException, TException {
+  public synchronized List<String> getClosedLogs() throws IOException {
     return Collections.emptyList();
   }
   
@@ -408,7 +438,7 @@ public class DfsLogger implements IRemot
    * @see org.apache.accumulo.server.tabletserver.log.IRemoteLogger#removeFile(java.util.List)
    */
   @Override
-  public synchronized void removeFile(List<String> files) throws ThriftSecurityException, TException {
+  public synchronized void removeFile(List<String> files) throws IOException {
   }
   
 }



Mime
View raw message