etcdserver: populate HashRevision when responding to leader or client…

…'s HashKV request Signed-off-by: Benjamin Wang <[email protected]>
etcd-io · Sep 30, 2022 · c56485c · c56485c
1 parent 8b0181b
commit c56485c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/server/etcdserver/api/v3rpc/maintenance.go b/server/etcdserver/api/v3rpc/maintenance.go
@@ -208,7 +208,12 @@ func (ms *maintenanceServer) HashKV(ctx context.Context, r *pb.HashKVRequest) (*
 		return nil, togRPCError(err)
 	}
 
-	resp := &pb.HashKVResponse{Header: &pb.ResponseHeader{Revision: rev}, Hash: h.Hash, CompactRevision: h.CompactRevision}
+	resp := &pb.HashKVResponse{
+		Header:          &pb.ResponseHeader{Revision: rev},
+		Hash:            h.Hash,
+		CompactRevision: h.CompactRevision,
+		HashRevision:    h.Revision,
+	}
 	ms.hdr.fill(resp.Header)
 	return resp, nil
 }

diff --git a/server/etcdserver/corrupt.go b/server/etcdserver/corrupt.go
@@ -448,6 +448,7 @@ func (h *hashKVHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		Header:          &pb.ResponseHeader{Revision: rev},
 		Hash:            hash.Hash,
 		CompactRevision: hash.CompactRevision,
+		HashRevision:    hash.Revision,
 	}
 	respBytes, err := json.Marshal(resp)
 	if err != nil {