Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Handle V2Request when analysis WAL entries

Browse Source
This commit is contained in:
Marek Siarkowicz 2021-12-02 15:44:38 +01:00
parent d865bb96f1
commit 4bfcd84259
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/storage/wal/version.go
View File

@ -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 {