From 0fdb77aea22dab2f41e7d3baca2e737838806056 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Thu, 13 Aug 2015 13:41:52 -0700 Subject: [PATCH] etcdserver: go back to marshal request in 2.1 way It fixes the problem that 2.1 cannot roll upgrade to 2.2 smoothly because 2.1 cannot understand the bytes marshalled at 2.2. --- etcdserver/server.go | 4 +--- etcdserver/server_test.go | 10 ++++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/etcdserver/server.go b/etcdserver/server.go index 0459a4e74..58da94c10 100644 --- a/etcdserver/server.go +++ b/etcdserver/server.go @@ -529,9 +529,7 @@ func (s *EtcdServer) Do(ctx context.Context, r pb.Request) (Response, error) { } switch r.Method { case "POST", "PUT", "DELETE", "QGET": - var raftReq pb.InternalRaftRequest - raftReq.V2 = &r - data, err := raftReq.Marshal() + data, err := r.Marshal() if err != nil { return Response{}, err } diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index f1cc36e01..b6efaebb9 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -989,11 +989,10 @@ func TestPublish(t *testing.T) { t.Fatalf("action = %s, want Propose", action[0].Name) } data := action[0].Params[0].([]byte) - var rr pb.InternalRaftRequest - if err := rr.Unmarshal(data); err != nil { + var r pb.Request + if err := r.Unmarshal(data); err != nil { t.Fatalf("unmarshal request error: %v", err) } - r := rr.V2 if r.Method != "PUT" { t.Errorf("method = %s, want PUT", r.Method) } @@ -1073,11 +1072,10 @@ func TestUpdateVersion(t *testing.T) { t.Fatalf("action = %s, want Propose", action[0].Name) } data := action[0].Params[0].([]byte) - var rr pb.InternalRaftRequest - if err := rr.Unmarshal(data); err != nil { + var r pb.Request + if err := r.Unmarshal(data); err != nil { t.Fatalf("unmarshal request error: %v", err) } - r := rr.V2 if r.Method != "PUT" { t.Errorf("method = %s, want PUT", r.Method) }