Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

embed: fix wrong compactor imports

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-03-06 23:26:45 -08:00
parent 146ed08052
commit 462ba8bb09
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
embed/config.go
View File

@ -26,6 +26,7 @@ import (
"strings"
"time"
"github.com/coreos/etcd/compactor"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/pkg/cors"
"github.com/coreos/etcd/pkg/netutil"
@ -458,7 +459,7 @@ func (cfg *Config) Validate() error {
switch cfg.AutoCompactionMode {
case "":
case CompactorModeRevision, CompactorModePeriodic:
case compactor.ModeRevision, compactor.ModePeriodic:
default:
return fmt.Errorf("unknown auto-compaction-mode %q", cfg.AutoCompactionMode)
}

5
embed/etcd.go
View File

@ -27,6 +27,7 @@ import (
"sync"
"time"
"github.com/coreos/etcd/compactor"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/etcdhttp"
"github.com/coreos/etcd/etcdserver/api/v2http"
@ -558,9 +559,9 @@ func parseCompactionRetention(mode, retention string) (ret time.Duration, err er
h, err := strconv.Atoi(retention)
if err == nil {
switch mode {
case CompactorModeRevision:
case compactor.ModeRevision:
ret = time.Duration(int64(h))
case CompactorModePeriodic:
case compactor.ModePeriodic:
ret = time.Duration(int64(h)) * time.Hour
}
} else {