vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etcdserver: better logging

release-2.0
Xiang Li 2014-10-15 13:05:24 +08:00
parent 48c195fac7
commit 828accf07b
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etcdserver/server.go
View File

@ -127,25 +127,25 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
var n raft.Node var n raft.Node
if !wal.Exist(cfg.WALDir()) { if !wal.Exist(cfg.WALDir()) {
if !cfg.IsBootstrap() { if !cfg.IsBootstrap() {
log.Fatalf("etcd: initial cluster state unset and no wal or discovery URL found") log.Fatalf("etcdserver: initial cluster state unset and no wal or discovery URL found")
} }
if cfg.ShouldDiscover() { if cfg.ShouldDiscover() {
d, err := discovery.New(cfg.DiscoveryURL, cfg.ID(), cfg.Cluster.String()) d, err := discovery.New(cfg.DiscoveryURL, cfg.ID(), cfg.Cluster.String())
if err != nil { if err != nil {
log.Fatalf("etcd: cannot init discovery %v", err) log.Fatalf("etcdserver: cannot init discovery %v", err)
} }
s, err := d.Discover() s, err := d.Discover()
if err != nil { if err != nil {
log.Fatalf("etcd: %v", err) log.Fatalf("etcdserver: %v", err)
} }
if err = cfg.Cluster.Set(s); err != nil { if err = cfg.Cluster.Set(s); err != nil {
log.Fatalf("etcd: %v", err) log.Fatalf("etcdserver: %v", err)
} }
} }
n, w = startNode(cfg) n, w = startNode(cfg)
} else { } else {
if cfg.ShouldDiscover() { if cfg.ShouldDiscover() {
log.Printf("etcd: warn: ignoring discovery: etcd has already been initialized and has a valid log in %q", cfg.WALDir()) log.Printf("etcdserver: warn: ignoring discovery: etcd has already been initialized and has a valid log in %q", cfg.WALDir())
} }
var index uint64 var index uint64
snapshot, err := ss.Load() snapshot, err := ss.Load()
@ -153,7 +153,7 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
log.Fatal(err) log.Fatal(err)
} }
if snapshot != nil { if snapshot != nil {
log.Printf("etcdserver: restart from snapshot at index %d", snapshot.Index) log.Printf("etcdserver: recovering from snapshot at index %d", snapshot.Index)
st.Recovery(snapshot.Data) st.Recovery(snapshot.Data)
index = snapshot.Index index = snapshot.Index
} }
@ -548,6 +548,7 @@ func startNode(cfg *ServerConfig) (n raft.Node, w *wal.WAL) {
} }
peers[i] = raft.Peer{ID: id, Context: ctx} peers[i] = raft.Peer{ID: id, Context: ctx}
} }
log.Printf("etcdserver: start node %d", cfg.ID())
n = raft.StartNode(cfg.ID(), peers, 10, 1) n = raft.StartNode(cfg.ID(), peers, 10, 1)
return return
} }
@ -565,7 +566,7 @@ func restartNode(cfg *ServerConfig, index uint64, snapshot *raftpb.Snapshot) (n
var metadata pb.Metadata var metadata pb.Metadata
pbutil.MustUnmarshal(&metadata, wmetadata) pbutil.MustUnmarshal(&metadata, wmetadata)
log.Printf("etcdserver: restart node %d at commit index %d", metadata.NodeID, st.Commit)
n = raft.RestartNode(metadata.NodeID, 10, 1, snapshot, st, ents) n = raft.RestartNode(metadata.NodeID, 10, 1, snapshot, st, ents)
return return
} }

4
main.go
View File

@ -135,10 +135,10 @@ func startEtcd() {
if *dir == "" { if *dir == "" {
*dir = fmt.Sprintf("%v_etcd_data", self.ID) *dir = fmt.Sprintf("%v_etcd_data", self.ID)
log.Printf("main: no data-dir provided, using default data-dir ./%s", *dir) log.Printf("etcd: no data-dir provided, using default data-dir ./%s", *dir)
} }
if err := os.MkdirAll(*dir, privateDirMode); err != nil { if err := os.MkdirAll(*dir, privateDirMode); err != nil {
log.Fatalf("main: cannot create data directory: %v", err) log.Fatalf("etcd: cannot create data directory: %v", err)
} }
pt, err := transport.NewTransport(peerTLSInfo) pt, err := transport.NewTransport(peerTLSInfo)