This commit is contained in:
Blake Mizerany 2014-09-02 15:57:15 -07:00 committed by Yicheng Qin
parent 728690fa03
commit dcd64f2a59
2 changed files with 6 additions and 9 deletions

View File

@ -11,7 +11,6 @@ import (
"code.google.com/p/go.net/context"
etcdserver "github.com/coreos/etcd/etcdserver2"
"github.com/coreos/etcd/etcdserver2/etcdserverpb"
"github.com/coreos/etcd/raft"
"github.com/coreos/etcd/raft/raftpb"
"github.com/coreos/etcd/store"
@ -33,14 +32,7 @@ func TestSet(t *testing.T) {
Node: n,
Store: st,
Send: etcdserver.SendFunc(nopSend),
Save: func(st raftpb.State, ents []raftpb.Entry) {
for _, e := range ents {
var r etcdserverpb.Request
if err := r.Unmarshal(e.Data); err != nil {
t.Fatal(err)
}
}
},
Save: func(st raftpb.State, ents []raftpb.Entry) {},
}
etcdserver.Start(srv)
defer srv.Stop()

View File

@ -6,6 +6,7 @@ import (
"net/http"
"strconv"
"time"
"code.google.com/p/go.net/context"
etcdserver "github.com/coreos/etcd/etcdserver2"
"github.com/coreos/etcd/etcdserver2/etcdhttp"
@ -39,6 +40,10 @@ func main() {
}
n := raft.Start(id, peers.Ids())
ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
n.Campaign(ctx)
s := &etcdserver.Server{
Store: store.New(),
Node: n,