github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Hongchao Deng 2016-04-05 21:00:55 -07:00
parent 2f43fbc6c7
commit 71b46f3f57
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/storage/etcd/testing/utils.go
View File

@ -29,7 +29,7 @@ import (
etcd "github.com/coreos/etcd/client" etcd "github.com/coreos/etcd/client"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdhttp" "github.com/coreos/etcd/etcdserver/api/v2http"
"github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/transport"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"
@ -75,7 +75,11 @@ func newSecuredLocalListener(t *testing.T, certFile, keyFile, caFile string) net
KeyFile: keyFile, KeyFile: keyFile,
CAFile: caFile, CAFile: caFile,
} }
l, err = transport.NewKeepAliveListener(l, "https", tlsInfo) tlscfg, err := tlsInfo.ServerConfig()
if err != nil {
t.Fatalf("unexpected serverConfig error: %v", err)
}
l, err = transport.NewKeepAliveListener(l, "https", tlscfg)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -159,7 +163,7 @@ func (m *EtcdTestServer) launch(t *testing.T) error {
} }
m.s.SyncTicker = time.Tick(500 * time.Millisecond) m.s.SyncTicker = time.Tick(500 * time.Millisecond)
m.s.Start() m.s.Start()
m.raftHandler = &testutil.PauseableHandler{Next: etcdhttp.NewPeerHandler(m.s)} m.raftHandler = &testutil.PauseableHandler{Next: v2http.NewPeerHandler(m.s)}
for _, ln := range m.PeerListeners { for _, ln := range m.PeerListeners {
hs := &httptest.Server{ hs := &httptest.Server{
Listener: ln, Listener: ln,
@ -171,7 +175,7 @@ func (m *EtcdTestServer) launch(t *testing.T) error {
for _, ln := range m.ClientListeners { for _, ln := range m.ClientListeners {
hs := &httptest.Server{ hs := &httptest.Server{
Listener: ln, Listener: ln,
Config: &http.Server{Handler: etcdhttp.NewClientHandler(m.s, m.ServerConfig.ReqTimeout())}, Config: &http.Server{Handler: v2http.NewClientHandler(m.s, m.ServerConfig.ReqTimeout())},
} }
hs.Start() hs.Start()
m.hss = append(m.hss, hs) m.hss = append(m.hss, hs)

6
pkg/storage/etcd3/store.go
View File

@ -183,7 +183,7 @@ func (s *store) conditionalDelete(ctx context.Context, key string, out runtime.O
return err return err
} }
txnResp, err := s.client.KV.Txn(ctx).If( txnResp, err := s.client.KV.Txn(ctx).If(
clientv3.Compare(clientv3.ModifiedRevision(key), "=", origState.rev), clientv3.Compare(clientv3.ModRevision(key), "=", origState.rev),
).Then( ).Then(
clientv3.OpDelete(key), clientv3.OpDelete(key),
).Else( ).Else(
@ -236,7 +236,7 @@ func (s *store) GuaranteedUpdate(ctx context.Context, key string, out runtime.Ob
} }
txnResp, err := s.client.KV.Txn(ctx).If( txnResp, err := s.client.KV.Txn(ctx).If(
clientv3.Compare(clientv3.ModifiedRevision(key), "=", origState.rev), clientv3.Compare(clientv3.ModRevision(key), "=", origState.rev),
).Then( ).Then(
clientv3.OpPut(key, string(data)), clientv3.OpPut(key, string(data)),
).Else( ).Else(
@ -420,5 +420,5 @@ func checkPreconditions(key string, preconditions *storage.Preconditions, out ru
} }
func notFound(key string) clientv3.Cmp { func notFound(key string) clientv3.Cmp {
return clientv3.Compare(clientv3.ModifiedRevision(key), "=", 0) return clientv3.Compare(clientv3.ModRevision(key), "=", 0)
} }