github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update dependency shift from etcd3 changes in latest release.

pull/6/head
Timothy St. Clair 2016-07-22 13:51:08 -05:00
parent 5f008faa8b
commit 4adb23c8cc
4 changed files with 689 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1004
pkg/kubelet/api/v1alpha1/runtime/api.pb.go
View File

File diff suppressed because it is too large Load Diff

2
pkg/storage/etcd3/compact.go
View File

@ -153,7 +153,7 @@ func compact(ctx context.Context, client *clientv3.Client, t, rev int64) (int64,
// We don't compact on bootstrap.
return curTime, curRev, nil
}
if err = client.Compact(ctx, rev); err != nil {
if _, err = client.Compact(ctx, rev); err != nil {
return curTime, curRev, err
}
glog.Infof("etcd: compacted rev (%d), endpoints (%v)", rev, client.Endpoints())

11
pkg/storage/etcd3/compact_test.go
View File

@ -36,14 +36,19 @@ func TestCompact(t *testing.T) {
t.Fatalf("Put failed: %v", err)
}
_, _, err = compact(ctx, client, 0, putResp.Header.Revision)
putResp1, err := client.Put(ctx, "/somekey", "data2")
if err != nil {
t.Fatalf("Put failed: %v", err)
}
_, _, err = compact(ctx, client, 0, putResp1.Header.Revision)
if err != nil {
t.Fatalf("compact failed: %v", err)
}
_, err = client.Get(ctx, "/somekey", clientv3.WithRev(putResp.Header.Revision))
obj, err := client.Get(ctx, "/somekey", clientv3.WithRev(putResp.Header.Revision))
if err != etcdrpc.ErrCompacted {
t.Errorf("Expecting ErrCompacted, but get=%v", err)
t.Errorf("Expecting ErrCompacted, but get=%v err=%v", obj, err)
}
}

4
pkg/storage/etcd3/event.go
View File

@ -18,7 +18,7 @@ package etcd3
import (
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/storage/storagepb"
"github.com/coreos/etcd/mvcc/mvccpb"
)
type event struct {
@ -29,7 +29,7 @@ type event struct {
isCreated bool
}
func parseKV(kv *storagepb.KeyValue) *event {
func parseKV(kv *mvccpb.KeyValue) *event {
return &event{
key: string(kv.Key),
value: kv.Value,