server: Handle V2Request when analysis WAL entries

etcd-io · Dec 2, 2021 · 5021629 · 5021629
1 parent 2777fd3
commit 5021629
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/server/storage/wal/version.go b/server/storage/wal/version.go
@@ -97,9 +97,15 @@ func visitEntryData(entryType raftpb.EntryType, data []byte, visitor Visitor) er
 	switch entryType {
 	case raftpb.EntryNormal:
 		var raftReq etcdserverpb.InternalRaftRequest
-		err := pbutil.Unmarshaler(&raftReq).Unmarshal(data)
-		if err != nil {
-			return err
+		if err := pbutil.Unmarshaler(&raftReq).Unmarshal(data); err != nil {
+			// try V2 Request
+			var r etcdserverpb.Request
+			if pbutil.Unmarshaler(&r).Unmarshal(data) != nil {
+				// return original error
+				return err
+			}
+			msg = proto.MessageReflect(&r)
+			break
 		}
 		msg = proto.MessageReflect(&raftReq)
 		if raftReq.ClusterVersionSet != nil {