accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1344396 [1/3] - in /accumulo/branches/ACCUMULO-578: core/src/main/java/org/apache/accumulo/core/ core/src/main/java/org/apache/accumulo/core/master/thrift/ core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ core/src/main/java...
Date Wed, 30 May 2012 18:34:44 GMT
Author: ecn
Date: Wed May 30 18:34:43 2012
New Revision: 1344396

URL: http://svn.apache.org/viewvc?rev=1344396&view=rev
Log:
ACCUMULO-578 move the steps of recovery into FATE, implement a greedy pull via zookeeper to distribute logsorts

Added:
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/recovery/
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java   (with props)
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java   (with props)
Removed:
    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/tabletserver/log/IRemoteLogger.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/master/thrift/MasterMonitorInfo.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.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/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.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/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/tabletserver/Tablet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.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/LogSorter.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/GetMasterStats.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.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=1344396&r1=1344395&r2=1344396&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 Wed May 30 18:34:43 2012
@@ -75,6 +75,7 @@ public class Constants {
   public static final String ZNEXT_FILE = "/next_file";
   
   public static final String ZHDFS_RESERVATIONS = "/hdfs_reservations";
+  public static final String ZRECOVERY = "/recovery";
   
   public static final String METADATA_TABLE_ID = "!0";
   public static final String METADATA_TABLE_NAME = "!METADATA";

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=1344396&r1=1344395&r2=1344396&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 Wed May 30 18:34:43 2012
@@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("tableMap", org.apache.thrift.protocol.TType.MAP, (short)1);
   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 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);
@@ -36,7 +35,6 @@ import org.slf4j.LoggerFactory;
   public Map<String,TableInfo> tableMap;
   public List<TabletServerStatus> tServerInfo;
   public Map<String,Byte> badTServers;
-  public List<RecoveryStatus> recovery;
   /**
    * 
    * @see MasterState
@@ -56,7 +54,6 @@ import org.slf4j.LoggerFactory;
     TABLE_MAP((short)1, "tableMap"),
     T_SERVER_INFO((short)2, "tServerInfo"),
     BAD_TSERVERS((short)3, "badTServers"),
-    RECOVERY((short)4, "recovery"),
     /**
      * 
      * @see MasterState
@@ -90,8 +87,6 @@ import org.slf4j.LoggerFactory;
           return T_SERVER_INFO;
         case 3: // BAD_TSERVERS
           return BAD_TSERVERS;
-        case 4: // RECOVERY
-          return RECOVERY;
         case 6: // STATE
           return STATE;
         case 8: // GOAL_STATE
@@ -159,9 +154,6 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE))));
-    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.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, 
@@ -185,7 +177,6 @@ import org.slf4j.LoggerFactory;
     Map<String,TableInfo> tableMap,
     List<TabletServerStatus> tServerInfo,
     Map<String,Byte> badTServers,
-    List<RecoveryStatus> recovery,
     MasterState state,
     MasterGoalState goalState,
     int unassignedTablets,
@@ -196,7 +187,6 @@ import org.slf4j.LoggerFactory;
     this.tableMap = tableMap;
     this.tServerInfo = tServerInfo;
     this.badTServers = badTServers;
-    this.recovery = recovery;
     this.state = state;
     this.goalState = goalState;
     this.unassignedTablets = unassignedTablets;
@@ -248,13 +238,6 @@ import org.slf4j.LoggerFactory;
       }
       this.badTServers = __this__badTServers;
     }
-    if (other.isSetRecovery()) {
-      List<RecoveryStatus> __this__recovery = new ArrayList<RecoveryStatus>();
-      for (RecoveryStatus other_element : other.recovery) {
-        __this__recovery.add(new RecoveryStatus(other_element));
-      }
-      this.recovery = __this__recovery;
-    }
     if (other.isSetState()) {
       this.state = other.state;
     }
@@ -287,7 +270,6 @@ import org.slf4j.LoggerFactory;
     this.tableMap = null;
     this.tServerInfo = null;
     this.badTServers = null;
-    this.recovery = null;
     this.state = null;
     this.goalState = null;
     setUnassignedTabletsIsSet(false);
@@ -405,45 +387,6 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public int getRecoverySize() {
-    return (this.recovery == null) ? 0 : this.recovery.size();
-  }
-
-  public java.util.Iterator<RecoveryStatus> getRecoveryIterator() {
-    return (this.recovery == null) ? null : this.recovery.iterator();
-  }
-
-  public void addToRecovery(RecoveryStatus elem) {
-    if (this.recovery == null) {
-      this.recovery = new ArrayList<RecoveryStatus>();
-    }
-    this.recovery.add(elem);
-  }
-
-  public List<RecoveryStatus> getRecovery() {
-    return this.recovery;
-  }
-
-  public MasterMonitorInfo setRecovery(List<RecoveryStatus> recovery) {
-    this.recovery = recovery;
-    return this;
-  }
-
-  public void unsetRecovery() {
-    this.recovery = null;
-  }
-
-  /** Returns true if field recovery is set (has been assigned a value) and false otherwise */
-  public boolean isSetRecovery() {
-    return this.recovery != null;
-  }
-
-  public void setRecoveryIsSet(boolean value) {
-    if (!value) {
-      this.recovery = null;
-    }
-  }
-
   /**
    * 
    * @see MasterState
@@ -635,14 +578,6 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case RECOVERY:
-      if (value == null) {
-        unsetRecovery();
-      } else {
-        setRecovery((List<RecoveryStatus>)value);
-      }
-      break;
-
     case STATE:
       if (value == null) {
         unsetState();
@@ -697,9 +632,6 @@ import org.slf4j.LoggerFactory;
     case BAD_TSERVERS:
       return getBadTServers();
 
-    case RECOVERY:
-      return getRecovery();
-
     case STATE:
       return getState();
 
@@ -732,8 +664,6 @@ import org.slf4j.LoggerFactory;
       return isSetTServerInfo();
     case BAD_TSERVERS:
       return isSetBadTServers();
-    case RECOVERY:
-      return isSetRecovery();
     case STATE:
       return isSetState();
     case GOAL_STATE:
@@ -788,15 +718,6 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_recovery = true && this.isSetRecovery();
-    boolean that_present_recovery = true && that.isSetRecovery();
-    if (this_present_recovery || that_present_recovery) {
-      if (!(this_present_recovery && that_present_recovery))
-        return false;
-      if (!this.recovery.equals(that.recovery))
-        return false;
-    }
-
     boolean this_present_state = true && this.isSetState();
     boolean that_present_state = true && that.isSetState();
     if (this_present_state || that_present_state) {
@@ -888,16 +809,6 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRecovery()).compareTo(typedOther.isSetRecovery());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRecovery()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.recovery, typedOther.recovery);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetState()).compareTo(typedOther.isSetState());
     if (lastComparison != 0) {
       return lastComparison;
@@ -968,16 +879,16 @@ import org.slf4j.LoggerFactory;
         case 1: // TABLE_MAP
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map5 = iprot.readMapBegin();
-              this.tableMap = new HashMap<String,TableInfo>(2*_map5.size);
-              for (int _i6 = 0; _i6 < _map5.size; ++_i6)
+              org.apache.thrift.protocol.TMap _map9 = iprot.readMapBegin();
+              this.tableMap = new HashMap<String,TableInfo>(2*_map9.size);
+              for (int _i10 = 0; _i10 < _map9.size; ++_i10)
               {
-                String _key7;
-                TableInfo _val8;
-                _key7 = iprot.readString();
-                _val8 = new TableInfo();
-                _val8.read(iprot);
-                this.tableMap.put(_key7, _val8);
+                String _key11;
+                TableInfo _val12;
+                _key11 = iprot.readString();
+                _val12 = new TableInfo();
+                _val12.read(iprot);
+                this.tableMap.put(_key11, _val12);
               }
               iprot.readMapEnd();
             }
@@ -988,14 +899,14 @@ import org.slf4j.LoggerFactory;
         case 2: // T_SERVER_INFO
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list9 = iprot.readListBegin();
-              this.tServerInfo = new ArrayList<TabletServerStatus>(_list9.size);
-              for (int _i10 = 0; _i10 < _list9.size; ++_i10)
+              org.apache.thrift.protocol.TList _list13 = iprot.readListBegin();
+              this.tServerInfo = new ArrayList<TabletServerStatus>(_list13.size);
+              for (int _i14 = 0; _i14 < _list13.size; ++_i14)
               {
-                TabletServerStatus _elem11;
-                _elem11 = new TabletServerStatus();
-                _elem11.read(iprot);
-                this.tServerInfo.add(_elem11);
+                TabletServerStatus _elem15;
+                _elem15 = new TabletServerStatus();
+                _elem15.read(iprot);
+                this.tServerInfo.add(_elem15);
               }
               iprot.readListEnd();
             }
@@ -1006,15 +917,15 @@ import org.slf4j.LoggerFactory;
         case 3: // BAD_TSERVERS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
-              this.badTServers = new HashMap<String,Byte>(2*_map12.size);
-              for (int _i13 = 0; _i13 < _map12.size; ++_i13)
+              org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
+              this.badTServers = new HashMap<String,Byte>(2*_map16.size);
+              for (int _i17 = 0; _i17 < _map16.size; ++_i17)
               {
-                String _key14;
-                byte _val15;
-                _key14 = iprot.readString();
-                _val15 = iprot.readByte();
-                this.badTServers.put(_key14, _val15);
+                String _key18;
+                byte _val19;
+                _key18 = iprot.readString();
+                _val19 = iprot.readByte();
+                this.badTServers.put(_key18, _val19);
               }
               iprot.readMapEnd();
             }
@@ -1022,24 +933,6 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 4: // RECOVERY
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
-              this.recovery = new ArrayList<RecoveryStatus>(_list16.size);
-              for (int _i17 = 0; _i17 < _list16.size; ++_i17)
-              {
-                RecoveryStatus _elem18;
-                _elem18 = new RecoveryStatus();
-                _elem18.read(iprot);
-                this.recovery.add(_elem18);
-              }
-              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());
@@ -1065,13 +958,13 @@ import org.slf4j.LoggerFactory;
         case 9: // SERVERS_SHUTTING_DOWN
           if (field.type == org.apache.thrift.protocol.TType.SET) {
             {
-              org.apache.thrift.protocol.TSet _set19 = iprot.readSetBegin();
-              this.serversShuttingDown = new HashSet<String>(2*_set19.size);
-              for (int _i20 = 0; _i20 < _set19.size; ++_i20)
+              org.apache.thrift.protocol.TSet _set20 = iprot.readSetBegin();
+              this.serversShuttingDown = new HashSet<String>(2*_set20.size);
+              for (int _i21 = 0; _i21 < _set20.size; ++_i21)
               {
-                String _elem21;
-                _elem21 = iprot.readString();
-                this.serversShuttingDown.add(_elem21);
+                String _elem22;
+                _elem22 = iprot.readString();
+                this.serversShuttingDown.add(_elem22);
               }
               iprot.readSetEnd();
             }
@@ -1082,14 +975,14 @@ import org.slf4j.LoggerFactory;
         case 10: // DEAD_TABLET_SERVERS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
-              this.deadTabletServers = new ArrayList<DeadServer>(_list22.size);
-              for (int _i23 = 0; _i23 < _list22.size; ++_i23)
+              org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
+              this.deadTabletServers = new ArrayList<DeadServer>(_list23.size);
+              for (int _i24 = 0; _i24 < _list23.size; ++_i24)
               {
-                DeadServer _elem24;
-                _elem24 = new DeadServer();
-                _elem24.read(iprot);
-                this.deadTabletServers.add(_elem24);
+                DeadServer _elem25;
+                _elem25 = new DeadServer();
+                _elem25.read(iprot);
+                this.deadTabletServers.add(_elem25);
               }
               iprot.readListEnd();
             }
@@ -1116,10 +1009,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> _iter25 : this.tableMap.entrySet())
+        for (Map.Entry<String, TableInfo> _iter26 : this.tableMap.entrySet())
         {
-          oprot.writeString(_iter25.getKey());
-          _iter25.getValue().write(oprot);
+          oprot.writeString(_iter26.getKey());
+          _iter26.getValue().write(oprot);
         }
         oprot.writeMapEnd();
       }
@@ -1129,9 +1022,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 _iter26 : this.tServerInfo)
+        for (TabletServerStatus _iter27 : this.tServerInfo)
         {
-          _iter26.write(oprot);
+          _iter27.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1141,27 +1034,15 @@ 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> _iter27 : this.badTServers.entrySet())
+        for (Map.Entry<String, Byte> _iter28 : this.badTServers.entrySet())
         {
-          oprot.writeString(_iter27.getKey());
-          oprot.writeByte(_iter27.getValue());
+          oprot.writeString(_iter28.getKey());
+          oprot.writeByte(_iter28.getValue());
         }
         oprot.writeMapEnd();
       }
       oprot.writeFieldEnd();
     }
-    if (this.recovery != null) {
-      oprot.writeFieldBegin(RECOVERY_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.recovery.size()));
-        for (RecoveryStatus _iter28 : this.recovery)
-        {
-          _iter28.write(oprot);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
     if (this.state != null) {
       oprot.writeFieldBegin(STATE_FIELD_DESC);
       oprot.writeI32(this.state.getValue());
@@ -1232,14 +1113,6 @@ import org.slf4j.LoggerFactory;
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("recovery:");
-    if (this.recovery == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.recovery);
-    }
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("state:");
     if (this.state == null) {
       sb.append("null");

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java?rev=1344396&r1=1344395&r2=1344396&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java Wed May 30 18:34:43 2012
@@ -23,28 +23,19 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("all") public class RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, RecoveryStatus._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RecoveryStatus");
 
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField MAP_PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("mapProgress", org.apache.thrift.protocol.TType.DOUBLE, (short)3);
-  private static final org.apache.thrift.protocol.TField REDUCE_PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("reduceProgress", org.apache.thrift.protocol.TType.DOUBLE, (short)4);
   private static final org.apache.thrift.protocol.TField RUNTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("runtime", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField COPY_PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("copyProgress", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
+  private static final org.apache.thrift.protocol.TField PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("progress", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
 
-  public String host;
   public String name;
-  public double mapProgress;
-  public double reduceProgress;
   public int runtime;
-  public double copyProgress;
+  public double progress;
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    HOST((short)1, "host"),
     NAME((short)2, "name"),
-    MAP_PROGRESS((short)3, "mapProgress"),
-    REDUCE_PROGRESS((short)4, "reduceProgress"),
     RUNTIME((short)5, "runtime"),
-    COPY_PROGRESS((short)6, "copyProgress");
+    PROGRESS((short)6, "progress");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -59,18 +50,12 @@ import org.slf4j.LoggerFactory;
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // HOST
-          return HOST;
         case 2: // NAME
           return NAME;
-        case 3: // MAP_PROGRESS
-          return MAP_PROGRESS;
-        case 4: // REDUCE_PROGRESS
-          return REDUCE_PROGRESS;
         case 5: // RUNTIME
           return RUNTIME;
-        case 6: // COPY_PROGRESS
-          return COPY_PROGRESS;
+        case 6: // PROGRESS
+          return PROGRESS;
         default:
           return null;
       }
@@ -111,26 +96,18 @@ import org.slf4j.LoggerFactory;
   }
 
   // isset id assignments
-  private static final int __MAPPROGRESS_ISSET_ID = 0;
-  private static final int __REDUCEPROGRESS_ISSET_ID = 1;
-  private static final int __RUNTIME_ISSET_ID = 2;
-  private static final int __COPYPROGRESS_ISSET_ID = 3;
-  private BitSet __isset_bit_vector = new BitSet(4);
+  private static final int __RUNTIME_ISSET_ID = 0;
+  private static final int __PROGRESS_ISSET_ID = 1;
+  private BitSet __isset_bit_vector = new BitSet(2);
 
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.MAP_PROGRESS, new org.apache.thrift.meta_data.FieldMetaData("mapProgress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REDUCE_PROGRESS, new org.apache.thrift.meta_data.FieldMetaData("reduceProgress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.RUNTIME, new org.apache.thrift.meta_data.FieldMetaData("runtime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.COPY_PROGRESS, new org.apache.thrift.meta_data.FieldMetaData("copyProgress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.PROGRESS, new org.apache.thrift.meta_data.FieldMetaData("progress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RecoveryStatus.class, metaDataMap);
@@ -140,24 +117,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public RecoveryStatus(
-    String host,
     String name,
-    double mapProgress,
-    double reduceProgress,
     int runtime,
-    double copyProgress)
+    double progress)
   {
     this();
-    this.host = host;
     this.name = name;
-    this.mapProgress = mapProgress;
-    setMapProgressIsSet(true);
-    this.reduceProgress = reduceProgress;
-    setReduceProgressIsSet(true);
     this.runtime = runtime;
     setRuntimeIsSet(true);
-    this.copyProgress = copyProgress;
-    setCopyProgressIsSet(true);
+    this.progress = progress;
+    setProgressIsSet(true);
   }
 
   /**
@@ -166,16 +135,11 @@ import org.slf4j.LoggerFactory;
   public RecoveryStatus(RecoveryStatus other) {
     __isset_bit_vector.clear();
     __isset_bit_vector.or(other.__isset_bit_vector);
-    if (other.isSetHost()) {
-      this.host = other.host;
-    }
     if (other.isSetName()) {
       this.name = other.name;
     }
-    this.mapProgress = other.mapProgress;
-    this.reduceProgress = other.reduceProgress;
     this.runtime = other.runtime;
-    this.copyProgress = other.copyProgress;
+    this.progress = other.progress;
   }
 
   public RecoveryStatus deepCopy() {
@@ -184,40 +148,11 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public void clear() {
-    this.host = null;
     this.name = null;
-    setMapProgressIsSet(false);
-    this.mapProgress = 0.0;
-    setReduceProgressIsSet(false);
-    this.reduceProgress = 0.0;
     setRuntimeIsSet(false);
     this.runtime = 0;
-    setCopyProgressIsSet(false);
-    this.copyProgress = 0.0;
-  }
-
-  public String getHost() {
-    return this.host;
-  }
-
-  public RecoveryStatus setHost(String host) {
-    this.host = host;
-    return this;
-  }
-
-  public void unsetHost() {
-    this.host = null;
-  }
-
-  /** Returns true if field host is set (has been assigned a value) and false otherwise */
-  public boolean isSetHost() {
-    return this.host != null;
-  }
-
-  public void setHostIsSet(boolean value) {
-    if (!value) {
-      this.host = null;
-    }
+    setProgressIsSet(false);
+    this.progress = 0.0;
   }
 
   public String getName() {
@@ -244,52 +179,6 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public double getMapProgress() {
-    return this.mapProgress;
-  }
-
-  public RecoveryStatus setMapProgress(double mapProgress) {
-    this.mapProgress = mapProgress;
-    setMapProgressIsSet(true);
-    return this;
-  }
-
-  public void unsetMapProgress() {
-    __isset_bit_vector.clear(__MAPPROGRESS_ISSET_ID);
-  }
-
-  /** Returns true if field mapProgress is set (has been assigned a value) and false otherwise */
-  public boolean isSetMapProgress() {
-    return __isset_bit_vector.get(__MAPPROGRESS_ISSET_ID);
-  }
-
-  public void setMapProgressIsSet(boolean value) {
-    __isset_bit_vector.set(__MAPPROGRESS_ISSET_ID, value);
-  }
-
-  public double getReduceProgress() {
-    return this.reduceProgress;
-  }
-
-  public RecoveryStatus setReduceProgress(double reduceProgress) {
-    this.reduceProgress = reduceProgress;
-    setReduceProgressIsSet(true);
-    return this;
-  }
-
-  public void unsetReduceProgress() {
-    __isset_bit_vector.clear(__REDUCEPROGRESS_ISSET_ID);
-  }
-
-  /** Returns true if field reduceProgress is set (has been assigned a value) and false otherwise */
-  public boolean isSetReduceProgress() {
-    return __isset_bit_vector.get(__REDUCEPROGRESS_ISSET_ID);
-  }
-
-  public void setReduceProgressIsSet(boolean value) {
-    __isset_bit_vector.set(__REDUCEPROGRESS_ISSET_ID, value);
-  }
-
   public int getRuntime() {
     return this.runtime;
   }
@@ -313,39 +202,31 @@ import org.slf4j.LoggerFactory;
     __isset_bit_vector.set(__RUNTIME_ISSET_ID, value);
   }
 
-  public double getCopyProgress() {
-    return this.copyProgress;
+  public double getProgress() {
+    return this.progress;
   }
 
-  public RecoveryStatus setCopyProgress(double copyProgress) {
-    this.copyProgress = copyProgress;
-    setCopyProgressIsSet(true);
+  public RecoveryStatus setProgress(double progress) {
+    this.progress = progress;
+    setProgressIsSet(true);
     return this;
   }
 
-  public void unsetCopyProgress() {
-    __isset_bit_vector.clear(__COPYPROGRESS_ISSET_ID);
+  public void unsetProgress() {
+    __isset_bit_vector.clear(__PROGRESS_ISSET_ID);
   }
 
-  /** Returns true if field copyProgress is set (has been assigned a value) and false otherwise */
-  public boolean isSetCopyProgress() {
-    return __isset_bit_vector.get(__COPYPROGRESS_ISSET_ID);
+  /** Returns true if field progress is set (has been assigned a value) and false otherwise */
+  public boolean isSetProgress() {
+    return __isset_bit_vector.get(__PROGRESS_ISSET_ID);
   }
 
-  public void setCopyProgressIsSet(boolean value) {
-    __isset_bit_vector.set(__COPYPROGRESS_ISSET_ID, value);
+  public void setProgressIsSet(boolean value) {
+    __isset_bit_vector.set(__PROGRESS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case HOST:
-      if (value == null) {
-        unsetHost();
-      } else {
-        setHost((String)value);
-      }
-      break;
-
     case NAME:
       if (value == null) {
         unsetName();
@@ -354,22 +235,6 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case MAP_PROGRESS:
-      if (value == null) {
-        unsetMapProgress();
-      } else {
-        setMapProgress((Double)value);
-      }
-      break;
-
-    case REDUCE_PROGRESS:
-      if (value == null) {
-        unsetReduceProgress();
-      } else {
-        setReduceProgress((Double)value);
-      }
-      break;
-
     case RUNTIME:
       if (value == null) {
         unsetRuntime();
@@ -378,11 +243,11 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case COPY_PROGRESS:
+    case PROGRESS:
       if (value == null) {
-        unsetCopyProgress();
+        unsetProgress();
       } else {
-        setCopyProgress((Double)value);
+        setProgress((Double)value);
       }
       break;
 
@@ -391,23 +256,14 @@ import org.slf4j.LoggerFactory;
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case HOST:
-      return getHost();
-
     case NAME:
       return getName();
 
-    case MAP_PROGRESS:
-      return new Double(getMapProgress());
-
-    case REDUCE_PROGRESS:
-      return new Double(getReduceProgress());
-
     case RUNTIME:
       return new Integer(getRuntime());
 
-    case COPY_PROGRESS:
-      return new Double(getCopyProgress());
+    case PROGRESS:
+      return new Double(getProgress());
 
     }
     throw new IllegalStateException();
@@ -420,18 +276,12 @@ import org.slf4j.LoggerFactory;
     }
 
     switch (field) {
-    case HOST:
-      return isSetHost();
     case NAME:
       return isSetName();
-    case MAP_PROGRESS:
-      return isSetMapProgress();
-    case REDUCE_PROGRESS:
-      return isSetReduceProgress();
     case RUNTIME:
       return isSetRuntime();
-    case COPY_PROGRESS:
-      return isSetCopyProgress();
+    case PROGRESS:
+      return isSetProgress();
     }
     throw new IllegalStateException();
   }
@@ -449,15 +299,6 @@ import org.slf4j.LoggerFactory;
     if (that == null)
       return false;
 
-    boolean this_present_host = true && this.isSetHost();
-    boolean that_present_host = true && that.isSetHost();
-    if (this_present_host || that_present_host) {
-      if (!(this_present_host && that_present_host))
-        return false;
-      if (!this.host.equals(that.host))
-        return false;
-    }
-
     boolean this_present_name = true && this.isSetName();
     boolean that_present_name = true && that.isSetName();
     if (this_present_name || that_present_name) {
@@ -467,24 +308,6 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_mapProgress = true;
-    boolean that_present_mapProgress = true;
-    if (this_present_mapProgress || that_present_mapProgress) {
-      if (!(this_present_mapProgress && that_present_mapProgress))
-        return false;
-      if (this.mapProgress != that.mapProgress)
-        return false;
-    }
-
-    boolean this_present_reduceProgress = true;
-    boolean that_present_reduceProgress = true;
-    if (this_present_reduceProgress || that_present_reduceProgress) {
-      if (!(this_present_reduceProgress && that_present_reduceProgress))
-        return false;
-      if (this.reduceProgress != that.reduceProgress)
-        return false;
-    }
-
     boolean this_present_runtime = true;
     boolean that_present_runtime = true;
     if (this_present_runtime || that_present_runtime) {
@@ -494,12 +317,12 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_copyProgress = true;
-    boolean that_present_copyProgress = true;
-    if (this_present_copyProgress || that_present_copyProgress) {
-      if (!(this_present_copyProgress && that_present_copyProgress))
+    boolean this_present_progress = true;
+    boolean that_present_progress = true;
+    if (this_present_progress || that_present_progress) {
+      if (!(this_present_progress && that_present_progress))
         return false;
-      if (this.copyProgress != that.copyProgress)
+      if (this.progress != that.progress)
         return false;
     }
 
@@ -519,16 +342,6 @@ import org.slf4j.LoggerFactory;
     int lastComparison = 0;
     RecoveryStatus typedOther = (RecoveryStatus)other;
 
-    lastComparison = Boolean.valueOf(isSetHost()).compareTo(typedOther.isSetHost());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetHost()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
@@ -539,26 +352,6 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMapProgress()).compareTo(typedOther.isSetMapProgress());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetMapProgress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mapProgress, typedOther.mapProgress);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetReduceProgress()).compareTo(typedOther.isSetReduceProgress());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetReduceProgress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reduceProgress, typedOther.reduceProgress);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetRuntime()).compareTo(typedOther.isSetRuntime());
     if (lastComparison != 0) {
       return lastComparison;
@@ -569,12 +362,12 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCopyProgress()).compareTo(typedOther.isSetCopyProgress());
+    lastComparison = Boolean.valueOf(isSetProgress()).compareTo(typedOther.isSetProgress());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetCopyProgress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.copyProgress, typedOther.copyProgress);
+    if (isSetProgress()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.progress, typedOther.progress);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -596,13 +389,6 @@ import org.slf4j.LoggerFactory;
         break;
       }
       switch (field.id) {
-        case 1: // HOST
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.host = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 2: // NAME
           if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.name = iprot.readString();
@@ -610,22 +396,6 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 3: // MAP_PROGRESS
-          if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
-            this.mapProgress = iprot.readDouble();
-            setMapProgressIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 4: // REDUCE_PROGRESS
-          if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
-            this.reduceProgress = iprot.readDouble();
-            setReduceProgressIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 5: // RUNTIME
           if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.runtime = iprot.readI32();
@@ -634,10 +404,10 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 6: // COPY_PROGRESS
+        case 6: // PROGRESS
           if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
-            this.copyProgress = iprot.readDouble();
-            setCopyProgressIsSet(true);
+            this.progress = iprot.readDouble();
+            setProgressIsSet(true);
           } else { 
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
@@ -657,27 +427,16 @@ import org.slf4j.LoggerFactory;
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
-    if (this.host != null) {
-      oprot.writeFieldBegin(HOST_FIELD_DESC);
-      oprot.writeString(this.host);
-      oprot.writeFieldEnd();
-    }
     if (this.name != null) {
       oprot.writeFieldBegin(NAME_FIELD_DESC);
       oprot.writeString(this.name);
       oprot.writeFieldEnd();
     }
-    oprot.writeFieldBegin(MAP_PROGRESS_FIELD_DESC);
-    oprot.writeDouble(this.mapProgress);
-    oprot.writeFieldEnd();
-    oprot.writeFieldBegin(REDUCE_PROGRESS_FIELD_DESC);
-    oprot.writeDouble(this.reduceProgress);
-    oprot.writeFieldEnd();
     oprot.writeFieldBegin(RUNTIME_FIELD_DESC);
     oprot.writeI32(this.runtime);
     oprot.writeFieldEnd();
-    oprot.writeFieldBegin(COPY_PROGRESS_FIELD_DESC);
-    oprot.writeDouble(this.copyProgress);
+    oprot.writeFieldBegin(PROGRESS_FIELD_DESC);
+    oprot.writeDouble(this.progress);
     oprot.writeFieldEnd();
     oprot.writeFieldStop();
     oprot.writeStructEnd();
@@ -688,14 +447,6 @@ import org.slf4j.LoggerFactory;
     StringBuilder sb = new StringBuilder("RecoveryStatus(");
     boolean first = true;
 
-    sb.append("host:");
-    if (this.host == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.host);
-    }
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("name:");
     if (this.name == null) {
       sb.append("null");
@@ -704,20 +455,12 @@ import org.slf4j.LoggerFactory;
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("mapProgress:");
-    sb.append(this.mapProgress);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("reduceProgress:");
-    sb.append(this.reduceProgress);
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("runtime:");
     sb.append(this.runtime);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("copyProgress:");
-    sb.append(this.copyProgress);
+    sb.append("progress:");
+    sb.append(this.progress);
     first = false;
     sb.append(")");
     return sb.toString();

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1344396&r1=1344395&r2=1344396&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java (original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java Wed May 30 18:34:43 2012
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField INDEX_CACHE_REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("indexCacheRequest", org.apache.thrift.protocol.TType.I64, (short)11);
   private static final org.apache.thrift.protocol.TField DATA_CACHE_HITS_FIELD_DESC = new org.apache.thrift.protocol.TField("dataCacheHits", org.apache.thrift.protocol.TType.I64, (short)12);
   private static final org.apache.thrift.protocol.TField DATA_CACHE_REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("dataCacheRequest", org.apache.thrift.protocol.TType.I64, (short)13);
+  private static final org.apache.thrift.protocol.TField LOG_SORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("logSorts", org.apache.thrift.protocol.TType.LIST, (short)14);
 
   public Map<String,TableInfo> tableMap;
   public long lastContact;
@@ -44,6 +45,7 @@ import org.slf4j.LoggerFactory;
   public long indexCacheRequest;
   public long dataCacheHits;
   public long dataCacheRequest;
+  public List<RecoveryStatus> logSorts;
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -56,7 +58,8 @@ import org.slf4j.LoggerFactory;
     INDEX_CACHE_HITS((short)10, "indexCacheHits"),
     INDEX_CACHE_REQUEST((short)11, "indexCacheRequest"),
     DATA_CACHE_HITS((short)12, "dataCacheHits"),
-    DATA_CACHE_REQUEST((short)13, "dataCacheRequest");
+    DATA_CACHE_REQUEST((short)13, "dataCacheRequest"),
+    LOG_SORTS((short)14, "logSorts");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -91,6 +94,8 @@ import org.slf4j.LoggerFactory;
           return DATA_CACHE_HITS;
         case 13: // DATA_CACHE_REQUEST
           return DATA_CACHE_REQUEST;
+        case 14: // LOG_SORTS
+          return LOG_SORTS;
         default:
           return null;
       }
@@ -166,6 +171,9 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.DATA_CACHE_REQUEST, new org.apache.thrift.meta_data.FieldMetaData("dataCacheRequest", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.LOG_SORTS, new org.apache.thrift.meta_data.FieldMetaData("logSorts", 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))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TabletServerStatus.class, metaDataMap);
   }
@@ -183,7 +191,8 @@ import org.slf4j.LoggerFactory;
     long indexCacheHits,
     long indexCacheRequest,
     long dataCacheHits,
-    long dataCacheRequest)
+    long dataCacheRequest,
+    List<RecoveryStatus> logSorts)
   {
     this();
     this.tableMap = tableMap;
@@ -204,6 +213,7 @@ import org.slf4j.LoggerFactory;
     setDataCacheHitsIsSet(true);
     this.dataCacheRequest = dataCacheRequest;
     setDataCacheRequestIsSet(true);
+    this.logSorts = logSorts;
   }
 
   /**
@@ -238,6 +248,13 @@ import org.slf4j.LoggerFactory;
     this.indexCacheRequest = other.indexCacheRequest;
     this.dataCacheHits = other.dataCacheHits;
     this.dataCacheRequest = other.dataCacheRequest;
+    if (other.isSetLogSorts()) {
+      List<RecoveryStatus> __this__logSorts = new ArrayList<RecoveryStatus>();
+      for (RecoveryStatus other_element : other.logSorts) {
+        __this__logSorts.add(new RecoveryStatus(other_element));
+      }
+      this.logSorts = __this__logSorts;
+    }
   }
 
   public TabletServerStatus deepCopy() {
@@ -264,6 +281,7 @@ import org.slf4j.LoggerFactory;
     this.dataCacheHits = 0;
     setDataCacheRequestIsSet(false);
     this.dataCacheRequest = 0;
+    this.logSorts = null;
   }
 
   public int getTableMapSize() {
@@ -509,6 +527,45 @@ import org.slf4j.LoggerFactory;
     __isset_bit_vector.set(__DATACACHEREQUEST_ISSET_ID, value);
   }
 
+  public int getLogSortsSize() {
+    return (this.logSorts == null) ? 0 : this.logSorts.size();
+  }
+
+  public java.util.Iterator<RecoveryStatus> getLogSortsIterator() {
+    return (this.logSorts == null) ? null : this.logSorts.iterator();
+  }
+
+  public void addToLogSorts(RecoveryStatus elem) {
+    if (this.logSorts == null) {
+      this.logSorts = new ArrayList<RecoveryStatus>();
+    }
+    this.logSorts.add(elem);
+  }
+
+  public List<RecoveryStatus> getLogSorts() {
+    return this.logSorts;
+  }
+
+  public TabletServerStatus setLogSorts(List<RecoveryStatus> logSorts) {
+    this.logSorts = logSorts;
+    return this;
+  }
+
+  public void unsetLogSorts() {
+    this.logSorts = null;
+  }
+
+  /** Returns true if field logSorts is set (has been assigned a value) and false otherwise */
+  public boolean isSetLogSorts() {
+    return this.logSorts != null;
+  }
+
+  public void setLogSortsIsSet(boolean value) {
+    if (!value) {
+      this.logSorts = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TABLE_MAP:
@@ -591,6 +648,14 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
+    case LOG_SORTS:
+      if (value == null) {
+        unsetLogSorts();
+      } else {
+        setLogSorts((List<RecoveryStatus>)value);
+      }
+      break;
+
     }
   }
 
@@ -626,6 +691,9 @@ import org.slf4j.LoggerFactory;
     case DATA_CACHE_REQUEST:
       return new Long(getDataCacheRequest());
 
+    case LOG_SORTS:
+      return getLogSorts();
+
     }
     throw new IllegalStateException();
   }
@@ -657,6 +725,8 @@ import org.slf4j.LoggerFactory;
       return isSetDataCacheHits();
     case DATA_CACHE_REQUEST:
       return isSetDataCacheRequest();
+    case LOG_SORTS:
+      return isSetLogSorts();
     }
     throw new IllegalStateException();
   }
@@ -764,6 +834,15 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
+    boolean this_present_logSorts = true && this.isSetLogSorts();
+    boolean that_present_logSorts = true && that.isSetLogSorts();
+    if (this_present_logSorts || that_present_logSorts) {
+      if (!(this_present_logSorts && that_present_logSorts))
+        return false;
+      if (!this.logSorts.equals(that.logSorts))
+        return false;
+    }
+
     return true;
   }
 
@@ -880,6 +959,16 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetLogSorts()).compareTo(typedOther.isSetLogSorts());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLogSorts()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.logSorts, typedOther.logSorts);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -988,6 +1077,24 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
+        case 14: // LOG_SORTS
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
+            {
+              org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
+              this.logSorts = new ArrayList<RecoveryStatus>(_list4.size);
+              for (int _i5 = 0; _i5 < _list4.size; ++_i5)
+              {
+                RecoveryStatus _elem6;
+                _elem6 = new RecoveryStatus();
+                _elem6.read(iprot);
+                this.logSorts.add(_elem6);
+              }
+              iprot.readListEnd();
+            }
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
         default:
           org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
@@ -1007,10 +1114,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> _iter4 : this.tableMap.entrySet())
+        for (Map.Entry<String, TableInfo> _iter7 : this.tableMap.entrySet())
         {
-          oprot.writeString(_iter4.getKey());
-          _iter4.getValue().write(oprot);
+          oprot.writeString(_iter7.getKey());
+          _iter7.getValue().write(oprot);
         }
         oprot.writeMapEnd();
       }
@@ -1045,6 +1152,18 @@ import org.slf4j.LoggerFactory;
     oprot.writeFieldBegin(DATA_CACHE_REQUEST_FIELD_DESC);
     oprot.writeI64(this.dataCacheRequest);
     oprot.writeFieldEnd();
+    if (this.logSorts != null) {
+      oprot.writeFieldBegin(LOG_SORTS_FIELD_DESC);
+      {
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.logSorts.size()));
+        for (RecoveryStatus _iter8 : this.logSorts)
+        {
+          _iter8.write(oprot);
+        }
+        oprot.writeListEnd();
+      }
+      oprot.writeFieldEnd();
+    }
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
@@ -1101,6 +1220,14 @@ import org.slf4j.LoggerFactory;
     sb.append("dataCacheRequest:");
     sb.append(this.dataCacheRequest);
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("logSorts:");
+    if (this.logSorts == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.logSorts);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }



Mime
View raw message