Merge branch 'master' into hanfei/join

pingcap · Apr 8, 2020 · a1b88cb · a1b88cb
2 parents 8545e16 + b4034bc
commit a1b88cb
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 67 deletions.
diff --git a/pkg/replicate_mode/replicate_mode.pb.go b/pkg/replicate_mode/replicate_mode.pb.go
diff --git a/proto/replicate_mode.proto b/proto/replicate_mode.proto
@@ -20,16 +20,17 @@ message DRAutoSync {
     }
     string label_key = 1; // the key of the label that used for distinguish different DC.
     State state = 2;
-    uint64 recover_id = 3; // Unique ID for a recovery
+    uint64 state_id = 3; // Unique ID of the state, it increases after each state transfer.
     int32 wait_sync_timeout_hint = 4; // Duration to wait before switching to SYNC by force (in seconds)
 }
 
 // The replicate status sync from TiKV to PD.
 message RegionReplicateStatus {
     enum State {
-        MAJORITY = 0; // Logs sync to majority peers
-        INTEGRITY_OVER_LABEL = 1; // Logs sync to different DCs
+        UNKNOWN = 0; // The region's state is unknown
+        MAJORITY = 1; // Logs sync to majority peers
+        INTEGRITY_OVER_LABEL = 2; // Logs sync to different DCs
     }
     State state = 1;
-    uint64 recover_id = 2; // Unique ID for a recovery
+    uint64 state_id = 2; // Unique ID of the state, it increases after each state transfer.
 }