github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

file rename; refactor

Browse Source
This commit is contained in:
Hongchao Deng 2016-04-16 01:51:29 +08:00
parent ab9ac70e56
commit 9f43a110d9
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/storage/etcd3/util.go → pkg/storage/etcd3/compact.go
View File

@ -30,6 +30,7 @@ import (
// interval: the interval between each compaction. The first compaction happens after "interval".
func compactor(ctx context.Context, client *clientv3.Client, interval time.Duration) {
var curRev int64
var err error
for {
select {
case <-time.After(interval):
@ -37,21 +38,29 @@ func compactor(ctx context.Context, client *clientv3.Client, interval time.Durat
return
}
resp, err := client.Get(ctx, "/")
curRev, err = compact(ctx, client, curRev)
if err != nil {
glog.Errorf("compactor: Get failed: %v", err)
glog.Error(err)
continue
}
oldRev := curRev
curRev = resp.Header.Revision
if oldRev == 0 {
continue
}
err = client.Compact(ctx, oldRev)
if err != nil {
glog.Errorf("compactor: Compact failed: %v", err)
continue
}
glog.V(4).Infof("compactor: Compacted rev %d", oldRev)
glog.Infof("compactor: Compacted rev %d", curRev)
}
}
// compact compacts etcd store and returns current rev.
// If it couldn't get current revision, the old rev will be returned.
func compact(ctx context.Context, client *clientv3.Client, oldRev int64) (int64, error) {
resp, err := client.Get(ctx, "/")
if err != nil {
return oldRev, err
}
curRev := resp.Header.Revision
if oldRev == 0 {
return curRev, nil
}
err = client.Compact(ctx, oldRev)
if err != nil {
return curRev, err
}
return curRev, nil
}

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

@ -18,7 +18,6 @@ package etcd3
import (
"testing"
"time"
"github.com/coreos/etcd/clientv3"
etcdrpc "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
@ -26,21 +25,21 @@ import (
"golang.org/x/net/context"
)
func TestCompactor(t *testing.T) {
func TestCompact(t *testing.T) {
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
defer cluster.Terminate(t)
client := cluster.RandClient()
ctx := context.Background()
cancelableCtx, cancel := context.WithCancel(ctx)
putResp, err := client.Put(ctx, "/somekey", "data")
if err != nil {
t.Fatalf("Put failed: %v", err)
}
go compactor(cancelableCtx, client, 500*time.Millisecond)
time.Sleep(2 * time.Second)
cancel()
_, err = compact(ctx, client, putResp.Header.Revision)
if err != nil {
t.Fatalf("compact failed: %v", err)
}
_, err = client.Get(ctx, "/somekey", clientv3.WithRev(putResp.Header.Revision))
if err != etcdrpc.ErrCompacted {