hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [2/3] hbase git commit: HBASE-18497 Add clock type to proto message for HLC region open/close (revision 4)
Date Mon, 14 Aug 2017 19:28:05 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/93c0d71c/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
index f739de6..a74ee18 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
@@ -4542,28 +4542,47 @@ public final class AdminProtos {
 
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    boolean hasNodeTime();
+    java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> 
+        getNodeTimesList();
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime();
+    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index);
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder();
+    int getNodeTimesCount();
+    /**
+     * <pre>
+     * timestamps from each clock on master
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+     */
+    java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+        getNodeTimesOrBuilderList();
+    /**
+     * <pre>
+     * timestamps from each clock on master
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+     */
+    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+        int index);
   }
   /**
    * Protobuf type {@code hbase.pb.OpenRegionRequest}
@@ -4580,6 +4599,7 @@ public final class AdminProtos {
       openInfo_ = java.util.Collections.emptyList();
       serverStartCode_ = 0L;
       masterSystemTime_ = 0L;
+      nodeTimes_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -4630,16 +4650,12 @@ public final class AdminProtos {
               break;
             }
             case 50: {
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000004) == 0x00000004)) {
-                subBuilder = nodeTime_.toBuilder();
-              }
-              nodeTime_ = input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(nodeTime_);
-                nodeTime_ = subBuilder.buildPartial();
+              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+                nodeTimes_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime>();
+                mutable_bitField0_ |= 0x00000008;
               }
-              bitField0_ |= 0x00000004;
+              nodeTimes_.add(
+                  input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.PARSER, extensionRegistry));
               break;
             }
           }
@@ -4653,6 +4669,9 @@ public final class AdminProtos {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           openInfo_ = java.util.Collections.unmodifiableList(openInfo_);
         }
+        if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+          nodeTimes_ = java.util.Collections.unmodifiableList(nodeTimes_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -5928,37 +5947,59 @@ public final class AdminProtos {
       return masterSystemTime_;
     }
 
-    public static final int NODETIME_FIELD_NUMBER = 6;
-    private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime nodeTime_;
+    public static final int NODETIMES_FIELD_NUMBER = 6;
+    private java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> nodeTimes_;
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    public boolean hasNodeTime() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
+    public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> getNodeTimesList() {
+      return nodeTimes_;
     }
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime() {
-      return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+    public java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+        getNodeTimesOrBuilderList() {
+      return nodeTimes_;
     }
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder() {
-      return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+    public int getNodeTimesCount() {
+      return nodeTimes_.size();
+    }
+    /**
+     * <pre>
+     * timestamps from each clock on master
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+     */
+    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index) {
+      return nodeTimes_.get(index);
+    }
+    /**
+     * <pre>
+     * timestamps from each clock on master
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+     */
+    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+        int index) {
+      return nodeTimes_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -5988,8 +6029,8 @@ public final class AdminProtos {
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeUInt64(5, masterSystemTime_);
       }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeMessage(6, getNodeTime());
+      for (int i = 0; i < nodeTimes_.size(); i++) {
+        output.writeMessage(6, nodeTimes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -6011,9 +6052,9 @@ public final class AdminProtos {
         size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
           .computeUInt64Size(5, masterSystemTime_);
       }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+      for (int i = 0; i < nodeTimes_.size(); i++) {
         size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getNodeTime());
+          .computeMessageSize(6, nodeTimes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -6044,11 +6085,8 @@ public final class AdminProtos {
         result = result && (getMasterSystemTime()
             == other.getMasterSystemTime());
       }
-      result = result && (hasNodeTime() == other.hasNodeTime());
-      if (hasNodeTime()) {
-        result = result && getNodeTime()
-            .equals(other.getNodeTime());
-      }
+      result = result && getNodeTimesList()
+          .equals(other.getNodeTimesList());
       result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
@@ -6074,9 +6112,9 @@ public final class AdminProtos {
         hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
             getMasterSystemTime());
       }
-      if (hasNodeTime()) {
-        hash = (37 * hash) + NODETIME_FIELD_NUMBER;
-        hash = (53 * hash) + getNodeTime().hashCode();
+      if (getNodeTimesCount() > 0) {
+        hash = (37 * hash) + NODETIMES_FIELD_NUMBER;
+        hash = (53 * hash) + getNodeTimesList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -6193,7 +6231,7 @@ public final class AdminProtos {
         if (org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
           getOpenInfoFieldBuilder();
-          getNodeTimeFieldBuilder();
+          getNodeTimesFieldBuilder();
         }
       }
       public Builder clear() {
@@ -6208,12 +6246,12 @@ public final class AdminProtos {
         bitField0_ = (bitField0_ & ~0x00000002);
         masterSystemTime_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000004);
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = null;
+        if (nodeTimesBuilder_ == null) {
+          nodeTimes_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
-          nodeTimeBuilder_.clear();
+          nodeTimesBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
@@ -6255,13 +6293,14 @@ public final class AdminProtos {
           to_bitField0_ |= 0x00000002;
         }
         result.masterSystemTime_ = masterSystemTime_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        if (nodeTimeBuilder_ == null) {
-          result.nodeTime_ = nodeTime_;
+        if (nodeTimesBuilder_ == null) {
+          if (((bitField0_ & 0x00000008) == 0x00000008)) {
+            nodeTimes_ = java.util.Collections.unmodifiableList(nodeTimes_);
+            bitField0_ = (bitField0_ & ~0x00000008);
+          }
+          result.nodeTimes_ = nodeTimes_;
         } else {
-          result.nodeTime_ = nodeTimeBuilder_.build();
+          result.nodeTimes_ = nodeTimesBuilder_.build();
         }
         result.bitField0_ = to_bitField0_;
         onBuilt();
@@ -6337,8 +6376,31 @@ public final class AdminProtos {
         if (other.hasMasterSystemTime()) {
           setMasterSystemTime(other.getMasterSystemTime());
         }
-        if (other.hasNodeTime()) {
-          mergeNodeTime(other.getNodeTime());
+        if (nodeTimesBuilder_ == null) {
+          if (!other.nodeTimes_.isEmpty()) {
+            if (nodeTimes_.isEmpty()) {
+              nodeTimes_ = other.nodeTimes_;
+              bitField0_ = (bitField0_ & ~0x00000008);
+            } else {
+              ensureNodeTimesIsMutable();
+              nodeTimes_.addAll(other.nodeTimes_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.nodeTimes_.isEmpty()) {
+            if (nodeTimesBuilder_.isEmpty()) {
+              nodeTimesBuilder_.dispose();
+              nodeTimesBuilder_ = null;
+              nodeTimes_ = other.nodeTimes_;
+              bitField0_ = (bitField0_ & ~0x00000008);
+              nodeTimesBuilder_ = 
+                org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getNodeTimesFieldBuilder() : null;
+            } else {
+              nodeTimesBuilder_.addAllMessages(other.nodeTimes_);
+            }
+          }
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -6709,158 +6771,316 @@ public final class AdminProtos {
         return this;
       }
 
-      private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime nodeTime_ = null;
-      private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> nodeTimeBuilder_;
+      private java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> nodeTimes_ =
+        java.util.Collections.emptyList();
+      private void ensureNodeTimesIsMutable() {
+        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+          nodeTimes_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime>(nodeTimes_);
+          bitField0_ |= 0x00000008;
+         }
+      }
+
+      private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
+          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> nodeTimesBuilder_;
+
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public boolean hasNodeTime() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
+      public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> getNodeTimesList() {
+        if (nodeTimesBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(nodeTimes_);
+        } else {
+          return nodeTimesBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public int getNodeTimesCount() {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.size();
+        } else {
+          return nodeTimesBuilder_.getCount();
+        }
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime() {
-        if (nodeTimeBuilder_ == null) {
-          return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index) {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.get(index);
         } else {
-          return nodeTimeBuilder_.getMessage();
+          return nodeTimesBuilder_.getMessage(index);
         }
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public Builder setNodeTime(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
-        if (nodeTimeBuilder_ == null) {
+      public Builder setNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          nodeTime_ = value;
+          ensureNodeTimesIsMutable();
+          nodeTimes_.set(index, value);
           onChanged();
         } else {
-          nodeTimeBuilder_.setMessage(value);
+          nodeTimesBuilder_.setMessage(index, value);
         }
-        bitField0_ |= 0x00000008;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public Builder setNodeTime(
-          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = builderForValue.build();
+      public Builder setNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.set(index, builderForValue.build());
           onChanged();
         } else {
-          nodeTimeBuilder_.setMessage(builderForValue.build());
+          nodeTimesBuilder_.setMessage(index, builderForValue.build());
         }
-        bitField0_ |= 0x00000008;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public Builder mergeNodeTime(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
-        if (nodeTimeBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              nodeTime_ != null &&
-              nodeTime_ != org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance()) {
-            nodeTime_ =
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.newBuilder(nodeTime_).mergeFrom(value).buildPartial();
-          } else {
-            nodeTime_ = value;
+      public Builder addNodeTimes(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(value);
           onChanged();
         } else {
-          nodeTimeBuilder_.mergeFrom(value);
+          nodeTimesBuilder_.addMessage(value);
         }
-        bitField0_ |= 0x00000008;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public Builder clearNodeTime() {
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = null;
+      public Builder addNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(index, value);
           onChanged();
         } else {
-          nodeTimeBuilder_.clear();
+          nodeTimesBuilder_.addMessage(index, value);
         }
-        bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder getNodeTimeBuilder() {
-        bitField0_ |= 0x00000008;
-        onChanged();
-        return getNodeTimeFieldBuilder().getBuilder();
+      public Builder addNodeTimes(
+          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(builderForValue.build());
+          onChanged();
+        } else {
+          nodeTimesBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder() {
-        if (nodeTimeBuilder_ != null) {
-          return nodeTimeBuilder_.getMessageOrBuilder();
+      public Builder addNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(index, builderForValue.build());
+          onChanged();
         } else {
-          return nodeTime_ == null ?
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+          nodeTimesBuilder_.addMessage(index, builderForValue.build());
         }
+        return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+      public Builder addAllNodeTimes(
+          java.lang.Iterable<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> values) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, nodeTimes_);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public Builder clearNodeTimes() {
+        if (nodeTimesBuilder_ == null) {
+          nodeTimes_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000008);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public Builder removeNodeTimes(int index) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.remove(index);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder getNodeTimesBuilder(
+          int index) {
+        return getNodeTimesFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+          int index) {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.get(index);  } else {
+          return nodeTimesBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+           getNodeTimesOrBuilderList() {
+        if (nodeTimesBuilder_ != null) {
+          return nodeTimesBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(nodeTimes_);
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder addNodeTimesBuilder() {
+        return getNodeTimesFieldBuilder().addBuilder(
+            org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder addNodeTimesBuilder(
+          int index) {
+        return getNodeTimesFieldBuilder().addBuilder(
+            index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder> 
+           getNodeTimesBuilderList() {
+        return getNodeTimesFieldBuilder().getBuilderList();
+      }
+      private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
           org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
-          getNodeTimeFieldBuilder() {
-        if (nodeTimeBuilder_ == null) {
-          nodeTimeBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+          getNodeTimesFieldBuilder() {
+        if (nodeTimesBuilder_ == null) {
+          nodeTimesBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
               org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder>(
-                  getNodeTime(),
+                  nodeTimes_,
+                  ((bitField0_ & 0x00000008) == 0x00000008),
                   getParentForChildren(),
                   isClean());
-          nodeTime_ = null;
+          nodeTimes_ = null;
         }
-        return nodeTimeBuilder_;
+        return nodeTimesBuilder_;
       }
       public final Builder setUnknownFields(
           final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -6930,28 +7150,47 @@ public final class AdminProtos {
 
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+     */
+    java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> 
+        getNodeTimesList();
+    /**
+     * <pre>
+     * timestamps from each clock on region server
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+     */
+    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index);
+    /**
+     * <pre>
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    boolean hasNodeTime();
+    int getNodeTimesCount();
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime();
+    java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+        getNodeTimesOrBuilderList();
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder();
+    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+        int index);
   }
   /**
    * Protobuf type {@code hbase.pb.OpenRegionResponse}
@@ -6966,6 +7205,7 @@ public final class AdminProtos {
     }
     private OpenRegionResponse() {
       openingState_ = java.util.Collections.emptyList();
+      nodeTimes_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -7030,16 +7270,12 @@ public final class AdminProtos {
               break;
             }
             case 18: {
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) == 0x00000001)) {
-                subBuilder = nodeTime_.toBuilder();
-              }
-              nodeTime_ = input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(nodeTime_);
-                nodeTime_ = subBuilder.buildPartial();
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                nodeTimes_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime>();
+                mutable_bitField0_ |= 0x00000002;
               }
-              bitField0_ |= 0x00000001;
+              nodeTimes_.add(
+                  input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.PARSER, extensionRegistry));
               break;
             }
           }
@@ -7053,6 +7289,9 @@ public final class AdminProtos {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           openingState_ = java.util.Collections.unmodifiableList(openingState_);
         }
+        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+          nodeTimes_ = java.util.Collections.unmodifiableList(nodeTimes_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -7168,7 +7407,6 @@ public final class AdminProtos {
       // @@protoc_insertion_point(enum_scope:hbase.pb.OpenRegionResponse.RegionOpeningState)
     }
 
-    private int bitField0_;
     public static final int OPENING_STATE_FIELD_NUMBER = 1;
     private java.util.List<java.lang.Integer> openingState_;
     private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.ListAdapter.Converter<
@@ -7200,37 +7438,59 @@ public final class AdminProtos {
       return openingState_converter_.convert(openingState_.get(index));
     }
 
-    public static final int NODETIME_FIELD_NUMBER = 2;
-    private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime nodeTime_;
+    public static final int NODETIMES_FIELD_NUMBER = 2;
+    private java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> nodeTimes_;
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    public boolean hasNodeTime() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
+    public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> getNodeTimesList() {
+      return nodeTimes_;
+    }
+    /**
+     * <pre>
+     * timestamps from each clock on region server
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+     */
+    public java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+        getNodeTimesOrBuilderList() {
+      return nodeTimes_;
+    }
+    /**
+     * <pre>
+     * timestamps from each clock on region server
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+     */
+    public int getNodeTimesCount() {
+      return nodeTimes_.size();
     }
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime() {
-      return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index) {
+      return nodeTimes_.get(index);
     }
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder() {
-      return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+        int index) {
+      return nodeTimes_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -7248,8 +7508,8 @@ public final class AdminProtos {
       for (int i = 0; i < openingState_.size(); i++) {
         output.writeEnum(1, openingState_.get(i));
       }
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(2, getNodeTime());
+      for (int i = 0; i < nodeTimes_.size(); i++) {
+        output.writeMessage(2, nodeTimes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -7268,9 +7528,9 @@ public final class AdminProtos {
         size += dataSize;
         size += 1 * openingState_.size();
       }
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+      for (int i = 0; i < nodeTimes_.size(); i++) {
         size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getNodeTime());
+          .computeMessageSize(2, nodeTimes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -7290,11 +7550,8 @@ public final class AdminProtos {
 
       boolean result = true;
       result = result && openingState_.equals(other.openingState_);
-      result = result && (hasNodeTime() == other.hasNodeTime());
-      if (hasNodeTime()) {
-        result = result && getNodeTime()
-            .equals(other.getNodeTime());
-      }
+      result = result && getNodeTimesList()
+          .equals(other.getNodeTimesList());
       result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
@@ -7310,9 +7567,9 @@ public final class AdminProtos {
         hash = (37 * hash) + OPENING_STATE_FIELD_NUMBER;
         hash = (53 * hash) + openingState_.hashCode();
       }
-      if (hasNodeTime()) {
-        hash = (37 * hash) + NODETIME_FIELD_NUMBER;
-        hash = (53 * hash) + getNodeTime().hashCode();
+      if (getNodeTimesCount() > 0) {
+        hash = (37 * hash) + NODETIMES_FIELD_NUMBER;
+        hash = (53 * hash) + getNodeTimesList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -7428,19 +7685,19 @@ public final class AdminProtos {
       private void maybeForceBuilderInitialization() {
         if (org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getNodeTimeFieldBuilder();
+          getNodeTimesFieldBuilder();
         }
       }
       public Builder clear() {
         super.clear();
         openingState_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = null;
+        if (nodeTimesBuilder_ == null) {
+          nodeTimes_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
-          nodeTimeBuilder_.clear();
+          nodeTimesBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -7464,21 +7721,20 @@ public final class AdminProtos {
       public org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionResponse buildPartial() {
         org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionResponse result = new org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.OpenRegionResponse(this);
         int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           openingState_ = java.util.Collections.unmodifiableList(openingState_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.openingState_ = openingState_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (nodeTimeBuilder_ == null) {
-          result.nodeTime_ = nodeTime_;
+        if (nodeTimesBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) == 0x00000002)) {
+            nodeTimes_ = java.util.Collections.unmodifiableList(nodeTimes_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.nodeTimes_ = nodeTimes_;
         } else {
-          result.nodeTime_ = nodeTimeBuilder_.build();
+          result.nodeTimes_ = nodeTimesBuilder_.build();
         }
-        result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
@@ -7530,8 +7786,31 @@ public final class AdminProtos {
           }
           onChanged();
         }
-        if (other.hasNodeTime()) {
-          mergeNodeTime(other.getNodeTime());
+        if (nodeTimesBuilder_ == null) {
+          if (!other.nodeTimes_.isEmpty()) {
+            if (nodeTimes_.isEmpty()) {
+              nodeTimes_ = other.nodeTimes_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureNodeTimesIsMutable();
+              nodeTimes_.addAll(other.nodeTimes_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.nodeTimes_.isEmpty()) {
+            if (nodeTimesBuilder_.isEmpty()) {
+              nodeTimesBuilder_.dispose();
+              nodeTimesBuilder_ = null;
+              nodeTimes_ = other.nodeTimes_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              nodeTimesBuilder_ = 
+                org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getNodeTimesFieldBuilder() : null;
+            } else {
+              nodeTimesBuilder_.addAllMessages(other.nodeTimes_);
+            }
+          }
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -7635,158 +7914,316 @@ public final class AdminProtos {
         return this;
       }
 
-      private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime nodeTime_ = null;
-      private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> nodeTimeBuilder_;
+      private java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> nodeTimes_ =
+        java.util.Collections.emptyList();
+      private void ensureNodeTimesIsMutable() {
+        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+          nodeTimes_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime>(nodeTimes_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
+          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> nodeTimesBuilder_;
+
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      public boolean hasNodeTime() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
+      public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> getNodeTimesList() {
+        if (nodeTimesBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(nodeTimes_);
+        } else {
+          return nodeTimesBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public int getNodeTimesCount() {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.size();
+        } else {
+          return nodeTimesBuilder_.getCount();
+        }
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime() {
-        if (nodeTimeBuilder_ == null) {
-          return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index) {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.get(index);
         } else {
-          return nodeTimeBuilder_.getMessage();
+          return nodeTimesBuilder_.getMessage(index);
         }
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      public Builder setNodeTime(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
-        if (nodeTimeBuilder_ == null) {
+      public Builder setNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          nodeTime_ = value;
+          ensureNodeTimesIsMutable();
+          nodeTimes_.set(index, value);
           onChanged();
         } else {
-          nodeTimeBuilder_.setMessage(value);
+          nodeTimesBuilder_.setMessage(index, value);
         }
-        bitField0_ |= 0x00000002;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      public Builder setNodeTime(
-          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = builderForValue.build();
+      public Builder setNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.set(index, builderForValue.build());
           onChanged();
         } else {
-          nodeTimeBuilder_.setMessage(builderForValue.build());
+          nodeTimesBuilder_.setMessage(index, builderForValue.build());
         }
-        bitField0_ |= 0x00000002;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      public Builder mergeNodeTime(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
-        if (nodeTimeBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              nodeTime_ != null &&
-              nodeTime_ != org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance()) {
-            nodeTime_ =
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.newBuilder(nodeTime_).mergeFrom(value).buildPartial();
-          } else {
-            nodeTime_ = value;
+      public Builder addNodeTimes(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(value);
           onChanged();
         } else {
-          nodeTimeBuilder_.mergeFrom(value);
+          nodeTimesBuilder_.addMessage(value);
         }
-        bitField0_ |= 0x00000002;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      public Builder clearNodeTime() {
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = null;
+      public Builder addNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(index, value);
           onChanged();
         } else {
-          nodeTimeBuilder_.clear();
+          nodeTimesBuilder_.addMessage(index, value);
         }
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder getNodeTimeBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getNodeTimeFieldBuilder().getBuilder();
+      public Builder addNodeTimes(
+          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(builderForValue.build());
+          onChanged();
+        } else {
+          nodeTimesBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder() {
-        if (nodeTimeBuilder_ != null) {
-          return nodeTimeBuilder_.getMessageOrBuilder();
+      public Builder addNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(index, builderForValue.build());
+          onChanged();
         } else {
-          return nodeTime_ == null ?
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+          nodeTimesBuilder_.addMessage(index, builderForValue.build());
         }
+        return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from region server clock
+       * timestamps from each clock on region server
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
        */
-      private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+      public Builder addAllNodeTimes(
+          java.lang.Iterable<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> values) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, nodeTimes_);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public Builder clearNodeTimes() {
+        if (nodeTimesBuilder_ == null) {
+          nodeTimes_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public Builder removeNodeTimes(int index) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.remove(index);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder getNodeTimesBuilder(
+          int index) {
+        return getNodeTimesFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+          int index) {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.get(index);  } else {
+          return nodeTimesBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+           getNodeTimesOrBuilderList() {
+        if (nodeTimesBuilder_ != null) {
+          return nodeTimesBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(nodeTimes_);
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder addNodeTimesBuilder() {
+        return getNodeTimesFieldBuilder().addBuilder(
+            org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder addNodeTimesBuilder(
+          int index) {
+        return getNodeTimesFieldBuilder().addBuilder(
+            index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on region server
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+       */
+      public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder> 
+           getNodeTimesBuilderList() {
+        return getNodeTimesFieldBuilder().getBuilderList();
+      }
+      private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
           org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
-          getNodeTimeFieldBuilder() {
-        if (nodeTimeBuilder_ == null) {
-          nodeTimeBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+          getNodeTimesFieldBuilder() {
+        if (nodeTimesBuilder_ == null) {
+          nodeTimesBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
               org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder>(
-                  getNodeTime(),
+                  nodeTimes_,
+                  ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
                   isClean());
-          nodeTime_ = null;
+          nodeTimes_ = null;
         }
-        return nodeTimeBuilder_;
+        return nodeTimesBuilder_;
       }
       public final Builder setUnknownFields(
           final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -8869,28 +9306,47 @@ public final class AdminProtos {
 
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    boolean hasNodeTime();
+    java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> 
+        getNodeTimesList();
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime();
+    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index);
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder();
+    int getNodeTimesCount();
+    /**
+     * <pre>
+     * timestamps from each clock on master
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+     */
+    java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+        getNodeTimesOrBuilderList();
+    /**
+     * <pre>
+     * timestamps from each clock on master
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+     */
+    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+        int index);
   }
   /**
    * <pre>
@@ -8913,6 +9369,7 @@ public final class AdminProtos {
       versionOfClosingNode_ = 0;
       transitionInZK_ = true;
       serverStartCode_ = 0L;
+      nodeTimes_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -8985,16 +9442,12 @@ public final class AdminProtos {
               break;
             }
             case 50: {
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000020) == 0x00000020)) {
-                subBuilder = nodeTime_.toBuilder();
-              }
-              nodeTime_ = input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(nodeTime_);
-                nodeTime_ = subBuilder.buildPartial();
+              if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+                nodeTimes_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime>();
+                mutable_bitField0_ |= 0x00000020;
               }
-              bitField0_ |= 0x00000020;
+              nodeTimes_.add(
+                  input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.PARSER, extensionRegistry));
               break;
             }
           }
@@ -9005,6 +9458,9 @@ public final class AdminProtos {
         throw new org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+          nodeTimes_ = java.util.Collections.unmodifiableList(nodeTimes_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -9117,37 +9573,59 @@ public final class AdminProtos {
       return serverStartCode_;
     }
 
-    public static final int NODETIME_FIELD_NUMBER = 6;
-    private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime nodeTime_;
+    public static final int NODETIMES_FIELD_NUMBER = 6;
+    private java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> nodeTimes_;
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    public boolean hasNodeTime() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
+    public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> getNodeTimesList() {
+      return nodeTimes_;
+    }
+    /**
+     * <pre>
+     * timestamps from each clock on master
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+     */
+    public java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+        getNodeTimesOrBuilderList() {
+      return nodeTimes_;
+    }
+    /**
+     * <pre>
+     * timestamps from each clock on master
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+     */
+    public int getNodeTimesCount() {
+      return nodeTimes_.size();
     }
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime() {
-      return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index) {
+      return nodeTimes_.get(index);
     }
     /**
      * <pre>
-     * physical or hybrid timestamp from master clock
+     * timestamps from each clock on master
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
      */
-    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder() {
-      return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+    public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+        int index) {
+      return nodeTimes_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -9191,8 +9669,8 @@ public final class AdminProtos {
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeUInt64(5, serverStartCode_);
       }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeMessage(6, getNodeTime());
+      for (int i = 0; i < nodeTimes_.size(); i++) {
+        output.writeMessage(6, nodeTimes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -9222,9 +9700,9 @@ public final class AdminProtos {
         size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
           .computeUInt64Size(5, serverStartCode_);
       }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+      for (int i = 0; i < nodeTimes_.size(); i++) {
         size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getNodeTime());
+          .computeMessageSize(6, nodeTimes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -9268,11 +9746,8 @@ public final class AdminProtos {
         result = result && (getServerStartCode()
             == other.getServerStartCode());
       }
-      result = result && (hasNodeTime() == other.hasNodeTime());
-      if (hasNodeTime()) {
-        result = result && getNodeTime()
-            .equals(other.getNodeTime());
-      }
+      result = result && getNodeTimesList()
+          .equals(other.getNodeTimesList());
       result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
@@ -9306,9 +9781,9 @@ public final class AdminProtos {
         hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
             getServerStartCode());
       }
-      if (hasNodeTime()) {
-        hash = (37 * hash) + NODETIME_FIELD_NUMBER;
-        hash = (53 * hash) + getNodeTime().hashCode();
+      if (getNodeTimesCount() > 0) {
+        hash = (37 * hash) + NODETIMES_FIELD_NUMBER;
+        hash = (53 * hash) + getNodeTimesList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -9432,7 +9907,7 @@ public final class AdminProtos {
                 .alwaysUseFieldBuilders) {
           getRegionFieldBuilder();
           getDestinationServerFieldBuilder();
-          getNodeTimeFieldBuilder();
+          getNodeTimesFieldBuilder();
         }
       }
       public Builder clear() {
@@ -9455,12 +9930,12 @@ public final class AdminProtos {
         bitField0_ = (bitField0_ & ~0x00000008);
         serverStartCode_ = 0L;
         bitField0_ = (bitField0_ & ~0x00000010);
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = null;
+        if (nodeTimesBuilder_ == null) {
+          nodeTimes_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
-          nodeTimeBuilder_.clear();
+          nodeTimesBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -9513,13 +9988,14 @@ public final class AdminProtos {
           to_bitField0_ |= 0x00000010;
         }
         result.serverStartCode_ = serverStartCode_;
-        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        if (nodeTimeBuilder_ == null) {
-          result.nodeTime_ = nodeTime_;
+        if (nodeTimesBuilder_ == null) {
+          if (((bitField0_ & 0x00000020) == 0x00000020)) {
+            nodeTimes_ = java.util.Collections.unmodifiableList(nodeTimes_);
+            bitField0_ = (bitField0_ & ~0x00000020);
+          }
+          result.nodeTimes_ = nodeTimes_;
         } else {
-          result.nodeTime_ = nodeTimeBuilder_.build();
+          result.nodeTimes_ = nodeTimesBuilder_.build();
         }
         result.bitField0_ = to_bitField0_;
         onBuilt();
@@ -9578,8 +10054,31 @@ public final class AdminProtos {
         if (other.hasServerStartCode()) {
           setServerStartCode(other.getServerStartCode());
         }
-        if (other.hasNodeTime()) {
-          mergeNodeTime(other.getNodeTime());
+        if (nodeTimesBuilder_ == null) {
+          if (!other.nodeTimes_.isEmpty()) {
+            if (nodeTimes_.isEmpty()) {
+              nodeTimes_ = other.nodeTimes_;
+              bitField0_ = (bitField0_ & ~0x00000020);
+            } else {
+              ensureNodeTimesIsMutable();
+              nodeTimes_.addAll(other.nodeTimes_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.nodeTimes_.isEmpty()) {
+            if (nodeTimesBuilder_.isEmpty()) {
+              nodeTimesBuilder_.dispose();
+              nodeTimesBuilder_ = null;
+              nodeTimes_ = other.nodeTimes_;
+              bitField0_ = (bitField0_ & ~0x00000020);
+              nodeTimesBuilder_ = 
+                org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getNodeTimesFieldBuilder() : null;
+            } else {
+              nodeTimesBuilder_.addAllMessages(other.nodeTimes_);
+            }
+          }
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -9968,158 +10467,316 @@ public final class AdminProtos {
         return this;
       }
 
-      private org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime nodeTime_ = null;
-      private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
-          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> nodeTimeBuilder_;
+      private java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> nodeTimes_ =
+        java.util.Collections.emptyList();
+      private void ensureNodeTimesIsMutable() {
+        if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+          nodeTimes_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime>(nodeTimes_);
+          bitField0_ |= 0x00000020;
+         }
+      }
+
+      private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
+          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> nodeTimesBuilder_;
+
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public boolean hasNodeTime() {
-        return ((bitField0_ & 0x00000020) == 0x00000020);
+      public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> getNodeTimesList() {
+        if (nodeTimesBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(nodeTimes_);
+        } else {
+          return nodeTimesBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public int getNodeTimesCount() {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.size();
+        } else {
+          return nodeTimesBuilder_.getCount();
+        }
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime() {
-        if (nodeTimeBuilder_ == null) {
-          return nodeTime_ == null ? org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index) {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.get(index);
         } else {
-          return nodeTimeBuilder_.getMessage();
+          return nodeTimesBuilder_.getMessage(index);
         }
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public Builder setNodeTime(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
-        if (nodeTimeBuilder_ == null) {
+      public Builder setNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          nodeTime_ = value;
+          ensureNodeTimesIsMutable();
+          nodeTimes_.set(index, value);
           onChanged();
         } else {
-          nodeTimeBuilder_.setMessage(value);
+          nodeTimesBuilder_.setMessage(index, value);
         }
-        bitField0_ |= 0x00000020;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public Builder setNodeTime(
-          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = builderForValue.build();
+      public Builder setNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.set(index, builderForValue.build());
           onChanged();
         } else {
-          nodeTimeBuilder_.setMessage(builderForValue.build());
+          nodeTimesBuilder_.setMessage(index, builderForValue.build());
         }
-        bitField0_ |= 0x00000020;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
-       */
-      public Builder mergeNodeTime(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
-        if (nodeTimeBuilder_ == null) {
-          if (((bitField0_ & 0x00000020) == 0x00000020) &&
-              nodeTime_ != null &&
-              nodeTime_ != org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance()) {
-            nodeTime_ =
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.newBuilder(nodeTime_).mergeFrom(value).buildPartial();
-          } else {
-            nodeTime_ = value;
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public Builder addNodeTimes(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
           }
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(value);
           onChanged();
         } else {
-          nodeTimeBuilder_.mergeFrom(value);
+          nodeTimesBuilder_.addMessage(value);
         }
-        bitField0_ |= 0x00000020;
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public Builder clearNodeTime() {
-        if (nodeTimeBuilder_ == null) {
-          nodeTime_ = null;
+      public Builder addNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime value) {
+        if (nodeTimesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(index, value);
           onChanged();
         } else {
-          nodeTimeBuilder_.clear();
+          nodeTimesBuilder_.addMessage(index, value);
         }
-        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder getNodeTimeBuilder() {
-        bitField0_ |= 0x00000020;
-        onChanged();
-        return getNodeTimeFieldBuilder().getBuilder();
+      public Builder addNodeTimes(
+          org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(builderForValue.build());
+          onChanged();
+        } else {
+          nodeTimesBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder() {
-        if (nodeTimeBuilder_ != null) {
-          return nodeTimeBuilder_.getMessageOrBuilder();
+      public Builder addNodeTimes(
+          int index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder builderForValue) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.add(index, builderForValue.build());
+          onChanged();
         } else {
-          return nodeTime_ == null ?
-              org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance() : nodeTime_;
+          nodeTimesBuilder_.addMessage(index, builderForValue.build());
         }
+        return this;
       }
       /**
        * <pre>
-       * physical or hybrid timestamp from master clock
+       * timestamps from each clock on master
        * </pre>
        *
-       * <code>optional .hbase.pb.NodeTime nodeTime = 6;</code>
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
        */
-      private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+      public Builder addAllNodeTimes(
+          java.lang.Iterable<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> values) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, nodeTimes_);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public Builder clearNodeTimes() {
+        if (nodeTimesBuilder_ == null) {
+          nodeTimes_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000020);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public Builder removeNodeTimes(int index) {
+        if (nodeTimesBuilder_ == null) {
+          ensureNodeTimesIsMutable();
+          nodeTimes_.remove(index);
+          onChanged();
+        } else {
+          nodeTimesBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder getNodeTimesBuilder(
+          int index) {
+        return getNodeTimesFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+          int index) {
+        if (nodeTimesBuilder_ == null) {
+          return nodeTimes_.get(index);  } else {
+          return nodeTimesBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+           getNodeTimesOrBuilderList() {
+        if (nodeTimesBuilder_ != null) {
+          return nodeTimesBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(nodeTimes_);
+        }
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder addNodeTimesBuilder() {
+        return getNodeTimesFieldBuilder().addBuilder(
+            org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder addNodeTimesBuilder(
+          int index) {
+        return getNodeTimesFieldBuilder().addBuilder(
+            index, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * timestamps from each clock on master
+       * </pre>
+       *
+       * <code>repeated .hbase.pb.NodeTime nodeTimes = 6;</code>
+       */
+      public java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder> 
+           getNodeTimesBuilderList() {
+        return getNodeTimesFieldBuilder().getBuilderList();
+      }
+      private org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
           org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
-          getNodeTimeFieldBuilder() {
-        if (nodeTimeBuilder_ == null) {
-          nodeTimeBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+          getNodeTimesFieldBuilder() {
+        if (nodeTimesBuilder_ == null) {
+          nodeTimesBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
               org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder, org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder>(
-                  getNodeTime(),
+                  nodeTimes_,
+                  ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
                   isClean());
-          nodeTime_ = null;
+          nodeTimes_ = null;
         }
-        return nodeTimeBuilder_;
+        return nodeTimesBuilder_;
       }
       public final Builder setUnknownFields(
           final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -10185,28 +10842,47 @@ public final class AdminProtos {
 
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+     */
+    java.util.List<org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime> 
+        getNodeTimesList();
+    /**
+     * <pre>
+     * timestamps from each clock on region server
+     * </pre>
+     *
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
+     */
+    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTimes(int index);
+    /**
+     * <pre>
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    boolean hasNodeTime();
+    int getNodeTimesCount();
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime getNodeTime();
+    java.util.List<? extends org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder> 
+        getNodeTimesOrBuilderList();
     /**
      * <pre>
-     * physical or hybrid timestamp from region server clock
+     * timestamps from each clock on region server
      * </pre>
      *
-     * <code>optional .hbase.pb.NodeTime nodeTime = 2;</code>
+     * <code>repeated .hbase.pb.NodeTime nodeTimes = 2;</code>
      */
-    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimeOrBuilder();
+    org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder getNodeTimesOrBuilder(
+        int index);
   }
   /**
    * Protobuf type {@code hbase.pb.CloseRegionResponse}
@@ -10221,6 +10897,7 @@ public final class AdminProtos {
     }
     private CloseRegionResponse() {
       closed_ = false;
+      nodeTimes_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -10257,16 +10934,12 @@ public final class AdminProtos {
               break;
             }
             case 18: {
-              org.apache.hadoop.hbase.shaded

<TRUNCATED>

Mime
View raw message