hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1459015 [5/8] - in /hbase/branches/0.95: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/ hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ hbase-client/src/test/...
Date Wed, 20 Mar 2013 19:39:51 GMT
Modified: hbase/branches/0.95/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java?rev=1459015&r1=1459014&r2=1459015&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java (original)
+++ hbase/branches/0.95/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java Wed Mar 20 19:39:50 2013
@@ -538,6 +538,14 @@ public final class RPCProtos {
     // optional string protocol = 2 [default = "org.apache.hadoop.hbase.client.ClientProtocol"];
     boolean hasProtocol();
     String getProtocol();
+    
+    // optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];
+    boolean hasCellBlockCodecClass();
+    String getCellBlockCodecClass();
+    
+    // optional string cellBlockCompressorClass = 4;
+    boolean hasCellBlockCompressorClass();
+    String getCellBlockCompressorClass();
   }
   public static final class ConnectionHeader extends
       com.google.protobuf.GeneratedMessage
@@ -613,9 +621,75 @@ public final class RPCProtos {
       }
     }
     
+    // optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];
+    public static final int CELLBLOCKCODECCLASS_FIELD_NUMBER = 3;
+    private java.lang.Object cellBlockCodecClass_;
+    public boolean hasCellBlockCodecClass() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    public String getCellBlockCodecClass() {
+      java.lang.Object ref = cellBlockCodecClass_;
+      if (ref instanceof String) {
+        return (String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+          cellBlockCodecClass_ = s;
+        }
+        return s;
+      }
+    }
+    private com.google.protobuf.ByteString getCellBlockCodecClassBytes() {
+      java.lang.Object ref = cellBlockCodecClass_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+        cellBlockCodecClass_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    
+    // optional string cellBlockCompressorClass = 4;
+    public static final int CELLBLOCKCOMPRESSORCLASS_FIELD_NUMBER = 4;
+    private java.lang.Object cellBlockCompressorClass_;
+    public boolean hasCellBlockCompressorClass() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    public String getCellBlockCompressorClass() {
+      java.lang.Object ref = cellBlockCompressorClass_;
+      if (ref instanceof String) {
+        return (String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+          cellBlockCompressorClass_ = s;
+        }
+        return s;
+      }
+    }
+    private com.google.protobuf.ByteString getCellBlockCompressorClassBytes() {
+      java.lang.Object ref = cellBlockCompressorClass_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+        cellBlockCompressorClass_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    
     private void initFields() {
       userInfo_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.UserInformation.getDefaultInstance();
       protocol_ = "org.apache.hadoop.hbase.client.ClientProtocol";
+      cellBlockCodecClass_ = "org.apache.hadoop.hbase.codec.KeyValueCodec";
+      cellBlockCompressorClass_ = "";
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -641,6 +715,12 @@ public final class RPCProtos {
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeBytes(2, getProtocolBytes());
       }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(3, getCellBlockCodecClassBytes());
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeBytes(4, getCellBlockCompressorClassBytes());
+      }
       getUnknownFields().writeTo(output);
     }
     
@@ -658,6 +738,14 @@ public final class RPCProtos {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(2, getProtocolBytes());
       }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, getCellBlockCodecClassBytes());
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(4, getCellBlockCompressorClassBytes());
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -691,6 +779,16 @@ public final class RPCProtos {
         result = result && getProtocol()
             .equals(other.getProtocol());
       }
+      result = result && (hasCellBlockCodecClass() == other.hasCellBlockCodecClass());
+      if (hasCellBlockCodecClass()) {
+        result = result && getCellBlockCodecClass()
+            .equals(other.getCellBlockCodecClass());
+      }
+      result = result && (hasCellBlockCompressorClass() == other.hasCellBlockCompressorClass());
+      if (hasCellBlockCompressorClass()) {
+        result = result && getCellBlockCompressorClass()
+            .equals(other.getCellBlockCompressorClass());
+      }
       result = result &&
           getUnknownFields().equals(other.getUnknownFields());
       return result;
@@ -708,6 +806,14 @@ public final class RPCProtos {
         hash = (37 * hash) + PROTOCOL_FIELD_NUMBER;
         hash = (53 * hash) + getProtocol().hashCode();
       }
+      if (hasCellBlockCodecClass()) {
+        hash = (37 * hash) + CELLBLOCKCODECCLASS_FIELD_NUMBER;
+        hash = (53 * hash) + getCellBlockCodecClass().hashCode();
+      }
+      if (hasCellBlockCompressorClass()) {
+        hash = (37 * hash) + CELLBLOCKCOMPRESSORCLASS_FIELD_NUMBER;
+        hash = (53 * hash) + getCellBlockCompressorClass().hashCode();
+      }
       hash = (29 * hash) + getUnknownFields().hashCode();
       return hash;
     }
@@ -833,6 +939,10 @@ public final class RPCProtos {
         bitField0_ = (bitField0_ & ~0x00000001);
         protocol_ = "org.apache.hadoop.hbase.client.ClientProtocol";
         bitField0_ = (bitField0_ & ~0x00000002);
+        cellBlockCodecClass_ = "org.apache.hadoop.hbase.codec.KeyValueCodec";
+        bitField0_ = (bitField0_ & ~0x00000004);
+        cellBlockCompressorClass_ = "";
+        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
       
@@ -883,6 +993,14 @@ public final class RPCProtos {
           to_bitField0_ |= 0x00000002;
         }
         result.protocol_ = protocol_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.cellBlockCodecClass_ = cellBlockCodecClass_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.cellBlockCompressorClass_ = cellBlockCompressorClass_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -905,6 +1023,12 @@ public final class RPCProtos {
         if (other.hasProtocol()) {
           setProtocol(other.getProtocol());
         }
+        if (other.hasCellBlockCodecClass()) {
+          setCellBlockCodecClass(other.getCellBlockCodecClass());
+        }
+        if (other.hasCellBlockCompressorClass()) {
+          setCellBlockCompressorClass(other.getCellBlockCompressorClass());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -956,6 +1080,16 @@ public final class RPCProtos {
               protocol_ = input.readBytes();
               break;
             }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              cellBlockCodecClass_ = input.readBytes();
+              break;
+            }
+            case 34: {
+              bitField0_ |= 0x00000008;
+              cellBlockCompressorClass_ = input.readBytes();
+              break;
+            }
           }
         }
       }
@@ -1088,6 +1222,78 @@ public final class RPCProtos {
         onChanged();
       }
       
+      // optional string cellBlockCodecClass = 3 [default = "org.apache.hadoop.hbase.codec.KeyValueCodec"];
+      private java.lang.Object cellBlockCodecClass_ = "org.apache.hadoop.hbase.codec.KeyValueCodec";
+      public boolean hasCellBlockCodecClass() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      public String getCellBlockCodecClass() {
+        java.lang.Object ref = cellBlockCodecClass_;
+        if (!(ref instanceof String)) {
+          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+          cellBlockCodecClass_ = s;
+          return s;
+        } else {
+          return (String) ref;
+        }
+      }
+      public Builder setCellBlockCodecClass(String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        cellBlockCodecClass_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearCellBlockCodecClass() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        cellBlockCodecClass_ = getDefaultInstance().getCellBlockCodecClass();
+        onChanged();
+        return this;
+      }
+      void setCellBlockCodecClass(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000004;
+        cellBlockCodecClass_ = value;
+        onChanged();
+      }
+      
+      // optional string cellBlockCompressorClass = 4;
+      private java.lang.Object cellBlockCompressorClass_ = "";
+      public boolean hasCellBlockCompressorClass() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      public String getCellBlockCompressorClass() {
+        java.lang.Object ref = cellBlockCompressorClass_;
+        if (!(ref instanceof String)) {
+          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+          cellBlockCompressorClass_ = s;
+          return s;
+        } else {
+          return (String) ref;
+        }
+      }
+      public Builder setCellBlockCompressorClass(String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000008;
+        cellBlockCompressorClass_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearCellBlockCompressorClass() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        cellBlockCompressorClass_ = getDefaultInstance().getCellBlockCompressorClass();
+        onChanged();
+        return this;
+      }
+      void setCellBlockCompressorClass(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000008;
+        cellBlockCompressorClass_ = value;
+        onChanged();
+      }
+      
       // @@protoc_insertion_point(builder_scope:ConnectionHeader)
     }
     
@@ -1099,83 +1305,60 @@ public final class RPCProtos {
     // @@protoc_insertion_point(class_scope:ConnectionHeader)
   }
   
-  public interface RpcRequestHeaderOrBuilder
+  public interface CellBlockMetaOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // required uint32 callId = 1;
-    boolean hasCallId();
-    int getCallId();
-    
-    // optional .RPCTInfo tinfo = 2;
-    boolean hasTinfo();
-    org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo getTinfo();
-    org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfoOrBuilder getTinfoOrBuilder();
+    // optional uint32 length = 1;
+    boolean hasLength();
+    int getLength();
   }
-  public static final class RpcRequestHeader extends
+  public static final class CellBlockMeta extends
       com.google.protobuf.GeneratedMessage
-      implements RpcRequestHeaderOrBuilder {
-    // Use RpcRequestHeader.newBuilder() to construct.
-    private RpcRequestHeader(Builder builder) {
+      implements CellBlockMetaOrBuilder {
+    // Use CellBlockMeta.newBuilder() to construct.
+    private CellBlockMeta(Builder builder) {
       super(builder);
     }
-    private RpcRequestHeader(boolean noInit) {}
+    private CellBlockMeta(boolean noInit) {}
     
-    private static final RpcRequestHeader defaultInstance;
-    public static RpcRequestHeader getDefaultInstance() {
+    private static final CellBlockMeta defaultInstance;
+    public static CellBlockMeta getDefaultInstance() {
       return defaultInstance;
     }
     
-    public RpcRequestHeader getDefaultInstanceForType() {
+    public CellBlockMeta getDefaultInstanceForType() {
       return defaultInstance;
     }
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcRequestHeader_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcRequestHeader_fieldAccessorTable;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_fieldAccessorTable;
     }
     
     private int bitField0_;
-    // required uint32 callId = 1;
-    public static final int CALLID_FIELD_NUMBER = 1;
-    private int callId_;
-    public boolean hasCallId() {
+    // optional uint32 length = 1;
+    public static final int LENGTH_FIELD_NUMBER = 1;
+    private int length_;
+    public boolean hasLength() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public int getCallId() {
-      return callId_;
-    }
-    
-    // optional .RPCTInfo tinfo = 2;
-    public static final int TINFO_FIELD_NUMBER = 2;
-    private org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo tinfo_;
-    public boolean hasTinfo() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo getTinfo() {
-      return tinfo_;
-    }
-    public org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfoOrBuilder getTinfoOrBuilder() {
-      return tinfo_;
+    public int getLength() {
+      return length_;
     }
     
     private void initFields() {
-      callId_ = 0;
-      tinfo_ = org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.getDefaultInstance();
+      length_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
       
-      if (!hasCallId()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -1184,10 +1367,7 @@ public final class RPCProtos {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeUInt32(1, callId_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, tinfo_);
+        output.writeUInt32(1, length_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -1200,11 +1380,7 @@ public final class RPCProtos {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, callId_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, tinfo_);
+          .computeUInt32Size(1, length_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -1223,21 +1399,16 @@ public final class RPCProtos {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader)) {
+      if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta)) {
         return super.equals(obj);
       }
-      org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader) obj;
+      org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta) obj;
       
       boolean result = true;
-      result = result && (hasCallId() == other.hasCallId());
-      if (hasCallId()) {
-        result = result && (getCallId()
-            == other.getCallId());
-      }
-      result = result && (hasTinfo() == other.hasTinfo());
-      if (hasTinfo()) {
-        result = result && getTinfo()
-            .equals(other.getTinfo());
+      result = result && (hasLength() == other.hasLength());
+      if (hasLength()) {
+        result = result && (getLength()
+            == other.getLength());
       }
       result = result &&
           getUnknownFields().equals(other.getUnknownFields());
@@ -1248,53 +1419,49 @@ public final class RPCProtos {
     public int hashCode() {
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
-      if (hasCallId()) {
-        hash = (37 * hash) + CALLID_FIELD_NUMBER;
-        hash = (53 * hash) + getCallId();
-      }
-      if (hasTinfo()) {
-        hash = (37 * hash) + TINFO_FIELD_NUMBER;
-        hash = (53 * hash) + getTinfo().hashCode();
+      if (hasLength()) {
+        hash = (37 * hash) + LENGTH_FIELD_NUMBER;
+        hash = (53 * hash) + getLength();
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
       return hash;
     }
     
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseFrom(byte[] data)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseFrom(java.io.InputStream input)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -1303,7 +1470,7 @@ public final class RPCProtos {
         return null;
       }
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseDelimitedFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1314,12 +1481,12 @@ public final class RPCProtos {
         return null;
       }
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1329,7 +1496,7 @@ public final class RPCProtos {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader prototype) {
+    public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1342,18 +1509,18 @@ public final class RPCProtos {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeaderOrBuilder {
+       implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcRequestHeader_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcRequestHeader_fieldAccessorTable;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_CellBlockMeta_fieldAccessorTable;
       }
       
-      // Construct using org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader.newBuilder()
+      // Construct using org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1364,7 +1531,6 @@ public final class RPCProtos {
       }
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getTinfoFieldBuilder();
         }
       }
       private static Builder create() {
@@ -1373,14 +1539,8 @@ public final class RPCProtos {
       
       public Builder clear() {
         super.clear();
-        callId_ = 0;
+        length_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
-        if (tinfoBuilder_ == null) {
-          tinfo_ = org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.getDefaultInstance();
-        } else {
-          tinfoBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
       
@@ -1390,24 +1550,24 @@ public final class RPCProtos {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader.getDescriptor();
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.getDescriptor();
       }
       
-      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader getDefaultInstanceForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader.getDefaultInstance();
+      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta getDefaultInstanceForType() {
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.getDefaultInstance();
       }
       
-      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader build() {
-        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader result = buildPartial();
+      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta build() {
+        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader buildParsed()
+      private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader result = buildPartial();
+        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -1415,53 +1575,38 @@ public final class RPCProtos {
         return result;
       }
       
-      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader buildPartial() {
-        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader result = new org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader(this);
+      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta buildPartial() {
+        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta result = new org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.callId_ = callId_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        if (tinfoBuilder_ == null) {
-          result.tinfo_ = tinfo_;
-        } else {
-          result.tinfo_ = tinfoBuilder_.build();
-        }
+        result.length_ = length_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader) {
-          return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader)other);
+        if (other instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta) {
+          return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader other) {
-        if (other == org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestHeader.getDefaultInstance()) return this;
-        if (other.hasCallId()) {
-          setCallId(other.getCallId());
-        }
-        if (other.hasTinfo()) {
-          mergeTinfo(other.getTinfo());
+      public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta other) {
+        if (other == org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.getDefaultInstance()) return this;
+        if (other.hasLength()) {
+          setLength(other.getLength());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
       
       public final boolean isInitialized() {
-        if (!hasCallId()) {
-          
-          return false;
-        }
         return true;
       }
       
@@ -1490,16 +1635,7 @@ public final class RPCProtos {
             }
             case 8: {
               bitField0_ |= 0x00000001;
-              callId_ = input.readUInt32();
-              break;
-            }
-            case 18: {
-              org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.newBuilder();
-              if (hasTinfo()) {
-                subBuilder.mergeFrom(getTinfo());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setTinfo(subBuilder.buildPartial());
+              length_ = input.readUInt32();
               break;
             }
           }
@@ -1508,180 +1644,98 @@ public final class RPCProtos {
       
       private int bitField0_;
       
-      // required uint32 callId = 1;
-      private int callId_ ;
-      public boolean hasCallId() {
+      // optional uint32 length = 1;
+      private int length_ ;
+      public boolean hasLength() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public int getCallId() {
-        return callId_;
+      public int getLength() {
+        return length_;
       }
-      public Builder setCallId(int value) {
+      public Builder setLength(int value) {
         bitField0_ |= 0x00000001;
-        callId_ = value;
+        length_ = value;
         onChanged();
         return this;
       }
-      public Builder clearCallId() {
+      public Builder clearLength() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        callId_ = 0;
+        length_ = 0;
         onChanged();
         return this;
       }
       
-      // optional .RPCTInfo tinfo = 2;
-      private org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo tinfo_ = org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo, org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfoOrBuilder> tinfoBuilder_;
-      public boolean hasTinfo() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo getTinfo() {
-        if (tinfoBuilder_ == null) {
-          return tinfo_;
-        } else {
-          return tinfoBuilder_.getMessage();
-        }
-      }
-      public Builder setTinfo(org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo value) {
-        if (tinfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          tinfo_ = value;
-          onChanged();
-        } else {
-          tinfoBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder setTinfo(
-          org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.Builder builderForValue) {
-        if (tinfoBuilder_ == null) {
-          tinfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          tinfoBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder mergeTinfo(org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo value) {
-        if (tinfoBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              tinfo_ != org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.getDefaultInstance()) {
-            tinfo_ =
-              org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.newBuilder(tinfo_).mergeFrom(value).buildPartial();
-          } else {
-            tinfo_ = value;
-          }
-          onChanged();
-        } else {
-          tinfoBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder clearTinfo() {
-        if (tinfoBuilder_ == null) {
-          tinfo_ = org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.getDefaultInstance();
-          onChanged();
-        } else {
-          tinfoBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      public org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.Builder getTinfoBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getTinfoFieldBuilder().getBuilder();
-      }
-      public org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfoOrBuilder getTinfoOrBuilder() {
-        if (tinfoBuilder_ != null) {
-          return tinfoBuilder_.getMessageOrBuilder();
-        } else {
-          return tinfo_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo, org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfoOrBuilder> 
-          getTinfoFieldBuilder() {
-        if (tinfoBuilder_ == null) {
-          tinfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo, org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.Builder, org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfoOrBuilder>(
-                  tinfo_,
-                  getParentForChildren(),
-                  isClean());
-          tinfo_ = null;
-        }
-        return tinfoBuilder_;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:RpcRequestHeader)
+      // @@protoc_insertion_point(builder_scope:CellBlockMeta)
     }
     
     static {
-      defaultInstance = new RpcRequestHeader(true);
+      defaultInstance = new CellBlockMeta(true);
       defaultInstance.initFields();
     }
     
-    // @@protoc_insertion_point(class_scope:RpcRequestHeader)
+    // @@protoc_insertion_point(class_scope:CellBlockMeta)
   }
   
-  public interface RpcRequestBodyOrBuilder
+  public interface ExceptionResponseOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // required string methodName = 1;
-    boolean hasMethodName();
-    String getMethodName();
+    // optional string exceptionClassName = 1;
+    boolean hasExceptionClassName();
+    String getExceptionClassName();
+    
+    // optional string stackTrace = 2;
+    boolean hasStackTrace();
+    String getStackTrace();
     
-    // optional bytes request = 2;
-    boolean hasRequest();
-    com.google.protobuf.ByteString getRequest();
-    
-    // optional string requestClassName = 4;
-    boolean hasRequestClassName();
-    String getRequestClassName();
+    // optional string hostname = 3;
+    boolean hasHostname();
+    String getHostname();
+    
+    // optional int32 port = 4;
+    boolean hasPort();
+    int getPort();
+    
+    // optional bool doNotRetry = 5;
+    boolean hasDoNotRetry();
+    boolean getDoNotRetry();
   }
-  public static final class RpcRequestBody extends
+  public static final class ExceptionResponse extends
       com.google.protobuf.GeneratedMessage
-      implements RpcRequestBodyOrBuilder {
-    // Use RpcRequestBody.newBuilder() to construct.
-    private RpcRequestBody(Builder builder) {
+      implements ExceptionResponseOrBuilder {
+    // Use ExceptionResponse.newBuilder() to construct.
+    private ExceptionResponse(Builder builder) {
       super(builder);
     }
-    private RpcRequestBody(boolean noInit) {}
+    private ExceptionResponse(boolean noInit) {}
     
-    private static final RpcRequestBody defaultInstance;
-    public static RpcRequestBody getDefaultInstance() {
+    private static final ExceptionResponse defaultInstance;
+    public static ExceptionResponse getDefaultInstance() {
       return defaultInstance;
     }
     
-    public RpcRequestBody getDefaultInstanceForType() {
+    public ExceptionResponse getDefaultInstanceForType() {
       return defaultInstance;
     }
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcRequestBody_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcRequestBody_fieldAccessorTable;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_fieldAccessorTable;
     }
     
     private int bitField0_;
-    // required string methodName = 1;
-    public static final int METHODNAME_FIELD_NUMBER = 1;
-    private java.lang.Object methodName_;
-    public boolean hasMethodName() {
+    // optional string exceptionClassName = 1;
+    public static final int EXCEPTIONCLASSNAME_FIELD_NUMBER = 1;
+    private java.lang.Object exceptionClassName_;
+    public boolean hasExceptionClassName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public String getMethodName() {
-      java.lang.Object ref = methodName_;
+    public String getExceptionClassName() {
+      java.lang.Object ref = exceptionClassName_;
       if (ref instanceof String) {
         return (String) ref;
       } else {
@@ -1689,41 +1743,31 @@ public final class RPCProtos {
             (com.google.protobuf.ByteString) ref;
         String s = bs.toStringUtf8();
         if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          methodName_ = s;
+          exceptionClassName_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getMethodNameBytes() {
-      java.lang.Object ref = methodName_;
+    private com.google.protobuf.ByteString getExceptionClassNameBytes() {
+      java.lang.Object ref = exceptionClassName_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        methodName_ = b;
+        exceptionClassName_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
     
-    // optional bytes request = 2;
-    public static final int REQUEST_FIELD_NUMBER = 2;
-    private com.google.protobuf.ByteString request_;
-    public boolean hasRequest() {
+    // optional string stackTrace = 2;
+    public static final int STACKTRACE_FIELD_NUMBER = 2;
+    private java.lang.Object stackTrace_;
+    public boolean hasStackTrace() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    public com.google.protobuf.ByteString getRequest() {
-      return request_;
-    }
-    
-    // optional string requestClassName = 4;
-    public static final int REQUESTCLASSNAME_FIELD_NUMBER = 4;
-    private java.lang.Object requestClassName_;
-    public boolean hasRequestClassName() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public String getRequestClassName() {
-      java.lang.Object ref = requestClassName_;
+    public String getStackTrace() {
+      java.lang.Object ref = stackTrace_;
       if (ref instanceof String) {
         return (String) ref;
       } else {
@@ -1731,37 +1775,87 @@ public final class RPCProtos {
             (com.google.protobuf.ByteString) ref;
         String s = bs.toStringUtf8();
         if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          requestClassName_ = s;
+          stackTrace_ = s;
         }
         return s;
       }
     }
-    private com.google.protobuf.ByteString getRequestClassNameBytes() {
-      java.lang.Object ref = requestClassName_;
+    private com.google.protobuf.ByteString getStackTraceBytes() {
+      java.lang.Object ref = stackTrace_;
       if (ref instanceof String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        requestClassName_ = b;
+        stackTrace_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
     
-    private void initFields() {
-      methodName_ = "";
-      request_ = com.google.protobuf.ByteString.EMPTY;
-      requestClassName_ = "";
+    // optional string hostname = 3;
+    public static final int HOSTNAME_FIELD_NUMBER = 3;
+    private java.lang.Object hostname_;
+    public boolean hasHostname() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
     }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
+    public String getHostname() {
+      java.lang.Object ref = hostname_;
+      if (ref instanceof String) {
+        return (String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+          hostname_ = s;
+        }
+        return s;
+      }
+    }
+    private com.google.protobuf.ByteString getHostnameBytes() {
+      java.lang.Object ref = hostname_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+        hostname_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    
+    // optional int32 port = 4;
+    public static final int PORT_FIELD_NUMBER = 4;
+    private int port_;
+    public boolean hasPort() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    public int getPort() {
+      return port_;
+    }
+    
+    // optional bool doNotRetry = 5;
+    public static final int DONOTRETRY_FIELD_NUMBER = 5;
+    private boolean doNotRetry_;
+    public boolean hasDoNotRetry() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    public boolean getDoNotRetry() {
+      return doNotRetry_;
+    }
+    
+    private void initFields() {
+      exceptionClassName_ = "";
+      stackTrace_ = "";
+      hostname_ = "";
+      port_ = 0;
+      doNotRetry_ = false;
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
       
-      if (!hasMethodName()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -1770,13 +1864,19 @@ public final class RPCProtos {
                         throws java.io.IOException {
       getSerializedSize();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getMethodNameBytes());
+        output.writeBytes(1, getExceptionClassNameBytes());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, request_);
+        output.writeBytes(2, getStackTraceBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(4, getRequestClassNameBytes());
+        output.writeBytes(3, getHostnameBytes());
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeInt32(4, port_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeBool(5, doNotRetry_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -1789,15 +1889,23 @@ public final class RPCProtos {
       size = 0;
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getMethodNameBytes());
+          .computeBytesSize(1, getExceptionClassNameBytes());
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, request_);
+          .computeBytesSize(2, getStackTraceBytes());
       }
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(4, getRequestClassNameBytes());
+          .computeBytesSize(3, getHostnameBytes());
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, port_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(5, doNotRetry_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -1816,26 +1924,36 @@ public final class RPCProtos {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody)) {
+      if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse)) {
         return super.equals(obj);
       }
-      org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody) obj;
+      org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse) obj;
       
       boolean result = true;
-      result = result && (hasMethodName() == other.hasMethodName());
-      if (hasMethodName()) {
-        result = result && getMethodName()
-            .equals(other.getMethodName());
+      result = result && (hasExceptionClassName() == other.hasExceptionClassName());
+      if (hasExceptionClassName()) {
+        result = result && getExceptionClassName()
+            .equals(other.getExceptionClassName());
+      }
+      result = result && (hasStackTrace() == other.hasStackTrace());
+      if (hasStackTrace()) {
+        result = result && getStackTrace()
+            .equals(other.getStackTrace());
       }
-      result = result && (hasRequest() == other.hasRequest());
-      if (hasRequest()) {
-        result = result && getRequest()
-            .equals(other.getRequest());
-      }
-      result = result && (hasRequestClassName() == other.hasRequestClassName());
-      if (hasRequestClassName()) {
-        result = result && getRequestClassName()
-            .equals(other.getRequestClassName());
+      result = result && (hasHostname() == other.hasHostname());
+      if (hasHostname()) {
+        result = result && getHostname()
+            .equals(other.getHostname());
+      }
+      result = result && (hasPort() == other.hasPort());
+      if (hasPort()) {
+        result = result && (getPort()
+            == other.getPort());
+      }
+      result = result && (hasDoNotRetry() == other.hasDoNotRetry());
+      if (hasDoNotRetry()) {
+        result = result && (getDoNotRetry()
+            == other.getDoNotRetry());
       }
       result = result &&
           getUnknownFields().equals(other.getUnknownFields());
@@ -1846,57 +1964,65 @@ public final class RPCProtos {
     public int hashCode() {
       int hash = 41;
       hash = (19 * hash) + getDescriptorForType().hashCode();
-      if (hasMethodName()) {
-        hash = (37 * hash) + METHODNAME_FIELD_NUMBER;
-        hash = (53 * hash) + getMethodName().hashCode();
+      if (hasExceptionClassName()) {
+        hash = (37 * hash) + EXCEPTIONCLASSNAME_FIELD_NUMBER;
+        hash = (53 * hash) + getExceptionClassName().hashCode();
+      }
+      if (hasStackTrace()) {
+        hash = (37 * hash) + STACKTRACE_FIELD_NUMBER;
+        hash = (53 * hash) + getStackTrace().hashCode();
       }
-      if (hasRequest()) {
-        hash = (37 * hash) + REQUEST_FIELD_NUMBER;
-        hash = (53 * hash) + getRequest().hashCode();
-      }
-      if (hasRequestClassName()) {
-        hash = (37 * hash) + REQUESTCLASSNAME_FIELD_NUMBER;
-        hash = (53 * hash) + getRequestClassName().hashCode();
+      if (hasHostname()) {
+        hash = (37 * hash) + HOSTNAME_FIELD_NUMBER;
+        hash = (53 * hash) + getHostname().hashCode();
+      }
+      if (hasPort()) {
+        hash = (37 * hash) + PORT_FIELD_NUMBER;
+        hash = (53 * hash) + getPort();
+      }
+      if (hasDoNotRetry()) {
+        hash = (37 * hash) + DONOTRETRY_FIELD_NUMBER;
+        hash = (53 * hash) + hashBoolean(getDoNotRetry());
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
       return hash;
     }
     
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseFrom(byte[] data)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseFrom(java.io.InputStream input)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -1905,7 +2031,7 @@ public final class RPCProtos {
         return null;
       }
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseDelimitedFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1916,12 +2042,12 @@ public final class RPCProtos {
         return null;
       }
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1931,7 +2057,7 @@ public final class RPCProtos {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody prototype) {
+    public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1944,18 +2070,18 @@ public final class RPCProtos {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBodyOrBuilder {
+       implements org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponseOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcRequestBody_descriptor;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcRequestBody_fieldAccessorTable;
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_ExceptionResponse_fieldAccessorTable;
       }
       
-      // Construct using org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody.newBuilder()
+      // Construct using org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1974,12 +2100,16 @@ public final class RPCProtos {
       
       public Builder clear() {
         super.clear();
-        methodName_ = "";
+        exceptionClassName_ = "";
         bitField0_ = (bitField0_ & ~0x00000001);
-        request_ = com.google.protobuf.ByteString.EMPTY;
+        stackTrace_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
-        requestClassName_ = "";
+        hostname_ = "";
         bitField0_ = (bitField0_ & ~0x00000004);
+        port_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        doNotRetry_ = false;
+        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
       
@@ -1989,24 +2119,24 @@ public final class RPCProtos {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody.getDescriptor();
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.getDescriptor();
       }
       
-      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody getDefaultInstanceForType() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody.getDefaultInstance();
+      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse getDefaultInstanceForType() {
+        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.getDefaultInstance();
       }
       
-      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody build() {
-        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody result = buildPartial();
+      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse build() {
+        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody buildParsed()
+      private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody result = buildPartial();
+        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -2014,56 +2144,66 @@ public final class RPCProtos {
         return result;
       }
       
-      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody buildPartial() {
-        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody result = new org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody(this);
+      public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse buildPartial() {
+        org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse result = new org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
           to_bitField0_ |= 0x00000001;
         }
-        result.methodName_ = methodName_;
+        result.exceptionClassName_ = exceptionClassName_;
         if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
           to_bitField0_ |= 0x00000002;
         }
-        result.request_ = request_;
+        result.stackTrace_ = stackTrace_;
         if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
           to_bitField0_ |= 0x00000004;
         }
-        result.requestClassName_ = requestClassName_;
+        result.hostname_ = hostname_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.port_ = port_;
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000010;
+        }
+        result.doNotRetry_ = doNotRetry_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody) {
-          return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody)other);
+        if (other instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse) {
+          return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody other) {
-        if (other == org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcRequestBody.getDefaultInstance()) return this;
-        if (other.hasMethodName()) {
-          setMethodName(other.getMethodName());
+      public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse other) {
+        if (other == org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ExceptionResponse.getDefaultInstance()) return this;
+        if (other.hasExceptionClassName()) {
+          setExceptionClassName(other.getExceptionClassName());
+        }
+        if (other.hasStackTrace()) {
+          setStackTrace(other.getStackTrace());
+        }
+        if (other.hasHostname()) {
+          setHostname(other.getHostname());
         }
-        if (other.hasRequest()) {
-          setRequest(other.getRequest());
+        if (other.hasPort()) {
+          setPort(other.getPort());
         }
-        if (other.hasRequestClassName()) {
-          setRequestClassName(other.getRequestClassName());
+        if (other.hasDoNotRetry()) {
+          setDoNotRetry(other.getDoNotRetry());
         }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
       
       public final boolean isInitialized() {
-        if (!hasMethodName()) {
-          
-          return false;
-        }
         return true;
       }
       
@@ -2092,17 +2232,27 @@ public final class RPCProtos {
             }
             case 10: {
               bitField0_ |= 0x00000001;
-              methodName_ = input.readBytes();
+              exceptionClassName_ = input.readBytes();
               break;
             }
             case 18: {
               bitField0_ |= 0x00000002;
-              request_ = input.readBytes();
+              stackTrace_ = input.readBytes();
               break;
             }
-            case 34: {
+            case 26: {
               bitField0_ |= 0x00000004;
-              requestClassName_ = input.readBytes();
+              hostname_ = input.readBytes();
+              break;
+            }
+            case 32: {
+              bitField0_ |= 0x00000008;
+              port_ = input.readInt32();
+              break;
+            }
+            case 40: {
+              bitField0_ |= 0x00000010;
+              doNotRetry_ = input.readBool();
               break;
             }
           }
@@ -2111,226 +2261,222 @@ public final class RPCProtos {
       
       private int bitField0_;
       
-      // required string methodName = 1;
-      private java.lang.Object methodName_ = "";
-      public boolean hasMethodName() {
+      // optional string exceptionClassName = 1;
+      private java.lang.Object exceptionClassName_ = "";
+      public boolean hasExceptionClassName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public String getMethodName() {
-        java.lang.Object ref = methodName_;
+      public String getExceptionClassName() {
+        java.lang.Object ref = exceptionClassName_;
         if (!(ref instanceof String)) {
           String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          methodName_ = s;
+          exceptionClassName_ = s;
           return s;
         } else {
           return (String) ref;
         }
       }
-      public Builder setMethodName(String value) {
+      public Builder setExceptionClassName(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   bitField0_ |= 0x00000001;
-        methodName_ = value;
+        exceptionClassName_ = value;
         onChanged();
         return this;
       }
-      public Builder clearMethodName() {
+      public Builder clearExceptionClassName() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        methodName_ = getDefaultInstance().getMethodName();
+        exceptionClassName_ = getDefaultInstance().getExceptionClassName();
         onChanged();
         return this;
       }
-      void setMethodName(com.google.protobuf.ByteString value) {
+      void setExceptionClassName(com.google.protobuf.ByteString value) {
         bitField0_ |= 0x00000001;
-        methodName_ = value;
+        exceptionClassName_ = value;
         onChanged();
       }
       
-      // optional bytes request = 2;
-      private com.google.protobuf.ByteString request_ = com.google.protobuf.ByteString.EMPTY;
-      public boolean hasRequest() {
+      // optional string stackTrace = 2;
+      private java.lang.Object stackTrace_ = "";
+      public boolean hasStackTrace() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
-      public com.google.protobuf.ByteString getRequest() {
-        return request_;
+      public String getStackTrace() {
+        java.lang.Object ref = stackTrace_;
+        if (!(ref instanceof String)) {
+          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
+          stackTrace_ = s;
+          return s;
+        } else {
+          return (String) ref;
+        }
       }
-      public Builder setRequest(com.google.protobuf.ByteString value) {
+      public Builder setStackTrace(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   bitField0_ |= 0x00000002;
-        request_ = value;
+        stackTrace_ = value;
         onChanged();
         return this;
       }
-      public Builder clearRequest() {
+      public Builder clearStackTrace() {
         bitField0_ = (bitField0_ & ~0x00000002);
-        request_ = getDefaultInstance().getRequest();
+        stackTrace_ = getDefaultInstance().getStackTrace();
         onChanged();
         return this;
       }
+      void setStackTrace(com.google.protobuf.ByteString value) {
+        bitField0_ |= 0x00000002;
+        stackTrace_ = value;
+        onChanged();
+      }
       
-      // optional string requestClassName = 4;
-      private java.lang.Object requestClassName_ = "";
-      public boolean hasRequestClassName() {
+      // optional string hostname = 3;
+      private java.lang.Object hostname_ = "";
+      public boolean hasHostname() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
-      public String getRequestClassName() {
-        java.lang.Object ref = requestClassName_;
+      public String getHostname() {
+        java.lang.Object ref = hostname_;
         if (!(ref instanceof String)) {
           String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          requestClassName_ = s;
+          hostname_ = s;
           return s;
         } else {
           return (String) ref;
         }
       }
-      public Builder setRequestClassName(String value) {
+      public Builder setHostname(String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   bitField0_ |= 0x00000004;
-        requestClassName_ = value;
+        hostname_ = value;
         onChanged();
         return this;
       }
-      public Builder clearRequestClassName() {
+      public Builder clearHostname() {
         bitField0_ = (bitField0_ & ~0x00000004);
-        requestClassName_ = getDefaultInstance().getRequestClassName();
+        hostname_ = getDefaultInstance().getHostname();
         onChanged();
         return this;
       }
-      void setRequestClassName(com.google.protobuf.ByteString value) {
+      void setHostname(com.google.protobuf.ByteString value) {
         bitField0_ |= 0x00000004;
-        requestClassName_ = value;
+        hostname_ = value;
+        onChanged();
+      }
+      
+      // optional int32 port = 4;
+      private int port_ ;
+      public boolean hasPort() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      public int getPort() {
+        return port_;
+      }
+      public Builder setPort(int value) {
+        bitField0_ |= 0x00000008;
+        port_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearPort() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        port_ = 0;
+        onChanged();
+        return this;
+      }
+      
+      // optional bool doNotRetry = 5;
+      private boolean doNotRetry_ ;
+      public boolean hasDoNotRetry() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      public boolean getDoNotRetry() {
+        return doNotRetry_;
+      }
+      public Builder setDoNotRetry(boolean value) {
+        bitField0_ |= 0x00000010;
+        doNotRetry_ = value;
+        onChanged();
+        return this;
+      }
+      public Builder clearDoNotRetry() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        doNotRetry_ = false;
         onChanged();
+        return this;
       }
       
-      // @@protoc_insertion_point(builder_scope:RpcRequestBody)
+      // @@protoc_insertion_point(builder_scope:ExceptionResponse)
     }
     
     static {
-      defaultInstance = new RpcRequestBody(true);
+      defaultInstance = new ExceptionResponse(true);
       defaultInstance.initFields();
     }
     
-    // @@protoc_insertion_point(class_scope:RpcRequestBody)
+    // @@protoc_insertion_point(class_scope:ExceptionResponse)
   }
   
-  public interface RpcResponseHeaderOrBuilder
+  public interface RequestHeaderOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // required uint32 callId = 1;
+    // optional uint32 callId = 1;
     boolean hasCallId();
     int getCallId();
     
-    // required .RpcResponseHeader.Status status = 2;
-    boolean hasStatus();
-    org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader.Status getStatus();
+    // optional .RPCTInfo traceInfo = 2;
+    boolean hasTraceInfo();
+    org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo getTraceInfo();
+    org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfoOrBuilder getTraceInfoOrBuilder();
+    
+    // optional string methodName = 3;
+    boolean hasMethodName();
+    String getMethodName();
+    
+    // optional bool requestParam = 4;
+    boolean hasRequestParam();
+    boolean getRequestParam();
+    
+    // optional .CellBlockMeta cellBlockMeta = 5;
+    boolean hasCellBlockMeta();
+    org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta getCellBlockMeta();
+    org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder getCellBlockMetaOrBuilder();
   }
-  public static final class RpcResponseHeader extends
+  public static final class RequestHeader extends
       com.google.protobuf.GeneratedMessage
-      implements RpcResponseHeaderOrBuilder {
-    // Use RpcResponseHeader.newBuilder() to construct.
-    private RpcResponseHeader(Builder builder) {
+      implements RequestHeaderOrBuilder {
+    // Use RequestHeader.newBuilder() to construct.
+    private RequestHeader(Builder builder) {
       super(builder);
     }
-    private RpcResponseHeader(boolean noInit) {}
+    private RequestHeader(boolean noInit) {}
     
-    private static final RpcResponseHeader defaultInstance;
-    public static RpcResponseHeader getDefaultInstance() {
+    private static final RequestHeader defaultInstance;
+    public static RequestHeader getDefaultInstance() {
       return defaultInstance;
     }
     
-    public RpcResponseHeader getDefaultInstanceForType() {
+    public RequestHeader getDefaultInstanceForType() {
       return defaultInstance;
     }
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcResponseHeader_descriptor;
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RequestHeader_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RpcResponseHeader_fieldAccessorTable;
-    }
-    
-    public enum Status
-        implements com.google.protobuf.ProtocolMessageEnum {
-      SUCCESS(0, 0),
-      ERROR(1, 1),
-      FATAL(2, 2),
-      ;
-      
-      public static final int SUCCESS_VALUE = 0;
-      public static final int ERROR_VALUE = 1;
-      public static final int FATAL_VALUE = 2;
-      
-      
-      public final int getNumber() { return value; }
-      
-      public static Status valueOf(int value) {
-        switch (value) {
-          case 0: return SUCCESS;
-          case 1: return ERROR;
-          case 2: return FATAL;
-          default: return null;
-        }
-      }
-      
-      public static com.google.protobuf.Internal.EnumLiteMap<Status>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static com.google.protobuf.Internal.EnumLiteMap<Status>
-          internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<Status>() {
-              public Status findValueByNumber(int number) {
-                return Status.valueOf(number);
-              }
-            };
-      
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        return getDescriptor().getValues().get(index);
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader.getDescriptor().getEnumTypes().get(0);
-      }
-      
-      private static final Status[] VALUES = {
-        SUCCESS, ERROR, FATAL, 
-      };
-      
-      public static Status valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        return VALUES[desc.getIndex()];
-      }
-      
-      private final int index;
-      private final int value;
-      
-      private Status(int index, int value) {
-        this.index = index;
-        this.value = value;
-      }
-      
-      // @@protoc_insertion_point(enum_scope:RpcResponseHeader.Status)
+      return org.apache.hadoop.hbase.protobuf.generated.RPCProtos.internal_static_RequestHeader_fieldAccessorTable;
     }
     
     private int bitField0_;
-    // required uint32 callId = 1;
+    // optional uint32 callId = 1;
     public static final int CALLID_FIELD_NUMBER = 1;
     private int callId_;
     public boolean hasCallId() {
@@ -2340,33 +2486,86 @@ public final class RPCProtos {
       return callId_;
     }
     
-    // required .RpcResponseHeader.Status status = 2;
-    public static final int STATUS_FIELD_NUMBER = 2;
-    private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader.Status status_;
-    public boolean hasStatus() {
+    // optional .RPCTInfo traceInfo = 2;
+    public static final int TRACEINFO_FIELD_NUMBER = 2;
+    private org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo traceInfo_;
+    public boolean hasTraceInfo() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
-    public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader.Status getStatus() {
-      return status_;
+    public org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo getTraceInfo() {
+      return traceInfo_;
+    }
+    public org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfoOrBuilder getTraceInfoOrBuilder() {
+      return traceInfo_;
+    }
+    
+    // optional string methodName = 3;
+    public static final int METHODNAME_FIELD_NUMBER = 3;
+    private java.lang.Object methodName_;
+    public boolean hasMethodName() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    public String getMethodName() {
+      java.lang.Object ref = methodName_;
+      if (ref instanceof String) {
+        return (String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        String s = bs.toStringUtf8();
+        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
+          methodName_ = s;
+        }
+        return s;
+      }
+    }
+    private com.google.protobuf.ByteString getMethodNameBytes() {
+      java.lang.Object ref = methodName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
+        methodName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    
+    // optional bool requestParam = 4;
+    public static final int REQUESTPARAM_FIELD_NUMBER = 4;
+    private boolean requestParam_;
+    public boolean hasRequestParam() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    public boolean getRequestParam() {
+      return requestParam_;
+    }
+    
+    // optional .CellBlockMeta cellBlockMeta = 5;
+    public static final int CELLBLOCKMETA_FIELD_NUMBER = 5;
+    private org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta cellBlockMeta_;
+    public boolean hasCellBlockMeta() {
+      return ((bitField0_ & 0x00000010) == 0x00000010);
+    }
+    public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta getCellBlockMeta() {
+      return cellBlockMeta_;
+    }
+    public org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder getCellBlockMetaOrBuilder() {
+      return cellBlockMeta_;
     }
     
     private void initFields() {
       callId_ = 0;
-      status_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader.Status.SUCCESS;
+      traceInfo_ = org.apache.hadoop.hbase.protobuf.generated.Tracing.RPCTInfo.getDefaultInstance();
+      methodName_ = "";
+      requestParam_ = false;
+      cellBlockMeta_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized != -1) return isInitialized == 1;
       
-      if (!hasCallId()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasStatus()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
       memoizedIsInitialized = 1;
       return true;
     }
@@ -2378,7 +2577,16 @@ public final class RPCProtos {
         output.writeUInt32(1, callId_);
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeEnum(2, status_.getNumber());
+        output.writeMessage(2, traceInfo_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(3, getMethodNameBytes());
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeBool(4, requestParam_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        output.writeMessage(5, cellBlockMeta_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -2395,7 +2603,19 @@ public final class RPCProtos {
       }
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, status_.getNumber());
+          .computeMessageSize(2, traceInfo_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, getMethodNameBytes());
+      }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(4, requestParam_);
+      }
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, cellBlockMeta_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -2414,10 +2634,10 @@ public final class RPCProtos {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader)) {
+      if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader)) {
         return super.equals(obj);
       }
-      org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader) obj;
+      org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader other = (org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader) obj;
       
       boolean result = true;
       result = result && (hasCallId() == other.hasCallId());
@@ -2425,10 +2645,25 @@ public final class RPCProtos {
         result = result && (getCallId()
             == other.getCallId());
       }
-      result = result && (hasStatus() == other.hasStatus());
-      if (hasStatus()) {
-        result = result &&
-            (getStatus() == other.getStatus());
+      result = result && (hasTraceInfo() == other.hasTraceInfo());
+      if (hasTraceInfo()) {
+        result = result && getTraceInfo()
+            .equals(other.getTraceInfo());
+      }
+      result = result && (hasMethodName() == other.hasMethodName());
+      if (hasMethodName()) {
+        result = result && getMethodName()
+            .equals(other.getMethodName());
+      }
+      result = result && (hasRequestParam() == other.hasRequestParam());
+      if (hasRequestParam()) {
+        result = result && (getRequestParam()
+            == other.getRequestParam());
+      }
+      result = result && (hasCellBlockMeta() == other.hasCellBlockMeta());
+      if (hasCellBlockMeta()) {
+        result = result && getCellBlockMeta()
+            .equals(other.getCellBlockMeta());
       }
       result = result &&
           getUnknownFields().equals(other.getUnknownFields());
@@ -2443,49 +2678,61 @@ public final class RPCProtos {
         hash = (37 * hash) + CALLID_FIELD_NUMBER;
         hash = (53 * hash) + getCallId();
       }
-      if (hasStatus()) {
-        hash = (37 * hash) + STATUS_FIELD_NUMBER;
-        hash = (53 * hash) + hashEnum(getStatus());
+      if (hasTraceInfo()) {
+        hash = (37 * hash) + TRACEINFO_FIELD_NUMBER;
+        hash = (53 * hash) + getTraceInfo().hashCode();
+      }
+      if (hasMethodName()) {
+        hash = (37 * hash) + METHODNAME_FIELD_NUMBER;
+        hash = (53 * hash) + getMethodName().hashCode();
+      }
+      if (hasRequestParam()) {
+        hash = (37 * hash) + REQUESTPARAM_FIELD_NUMBER;
+        hash = (53 * hash) + hashBoolean(getRequestParam());
+      }
+      if (hasCellBlockMeta()) {
+        hash = (37 * hash) + CELLBLOCKMETA_FIELD_NUMBER;
+        hash = (53 * hash) + getCellBlockMeta().hashCode();
       }
       hash = (29 * hash) + getUnknownFields().hashCode();
       return hash;
     }
     
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseFrom(byte[] data)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseFrom(java.io.InputStream input)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseDelimitedFrom(java.io.InputStream input)
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -2494,7 +2741,7 @@ public final class RPCProtos {
         return null;
       }
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseDelimitedFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2505,12 +2752,12 @@ public final class RPCProtos {
         return null;
       }
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader parseFrom(
+    public static org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2520,7 +2767,7 @@ public final class RPCProtos {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RpcResponseHeader prototype) {
+    public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2533,18 +2780,18 @@ public final class RPCProtos {
     }
     public static final class Builder extends

[... 1814 lines stripped ...]


Mime
View raw message