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

Merge pull request #2074 from yichengq/289

Browse Source 
make `go test ./...` work
This commit is contained in:
Yicheng Qin 2015-01-12 12:25:20 -08:00
commit 2d8f5e1250
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
migrate/cmd/etcd-dump-logs/main.go
View File

@ -12,6 +12,7 @@ import (
"github.com/coreos/etcd/pkg/types"
raftpb "github.com/coreos/etcd/raft/raftpb"
"github.com/coreos/etcd/wal"
"github.com/coreos/etcd/wal/walpb"
)
func walDir5(dataDir string) string {
@ -77,7 +78,7 @@ func dump4(dataDir string) ([]raftpb.Entry, error) {
return nil, err
}
return migrate.Entries4To5(ents)
return migrate.Entries4To2(ents)
}
func dump5(dataDir string) ([]raftpb.Entry, error) {
@ -86,7 +87,7 @@ func dump5(dataDir string) ([]raftpb.Entry, error) {
return nil, fmt.Errorf("No wal exists at %s", wd5)
}
w, err := wal.OpenAtIndex(wd5, 0)
w, err := wal.Open(wd5, walpb.Snapshot{})
if err != nil {
return nil, err
}