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 #1304 from coreos/logging

Browse Source 
etcdserver: better logging
This commit is contained in:
Xiang Li 2014-10-15 13:36:32 +08:00
commit f62d4908b0
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
if !wal.Exist(cfg.WALDir()) {
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() {
d, err := discovery.New(cfg.DiscoveryURL, cfg.ID(), cfg.Cluster.String())
if err != nil {
log.Fatalf("etcd: cannot init discovery %v", err)
log.Fatalf("etcdserver: cannot init discovery %v", err)
}
s, err := d.Discover()
if err != nil {
log.Fatalf("etcd: %v", err)
log.Fatalf("etcdserver: %v", err)
}
if err = cfg.Cluster.Set(s); err != nil {
log.Fatalf("etcd: %v", err)
log.Fatalf("etcdserver: %v", err)
}
}
n, w = startNode(cfg)
} else {
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
snapshot, err := ss.Load()
@ -153,7 +153,7 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
log.Fatal(err)
}
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)
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}
}
log.Printf("etcdserver: start node %d", cfg.ID())
n = raft.StartNode(cfg.ID(), peers, 10, 1)
return
}
@ -565,7 +566,7 @@ func restartNode(cfg *ServerConfig, index uint64, snapshot *raftpb.Snapshot) (n
var metadata pb.Metadata
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)
return
}

4
main.go
View File

@ -135,10 +135,10 @@ func startEtcd() {
if *dir == "" {
*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 {
log.Fatalf("main: cannot create data directory: %v", err)
log.Fatalf("etcd: cannot create data directory: %v", err)
}
pt, err := transport.NewTransport(peerTLSInfo)