apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-06 00:17:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lift some message from the cluster to info

Browse Source
This commit is contained in:
Ingo Oppermann
2024-04-10 10:39:34 +02:00
parent 29fa94ed52
commit 4bc08d2b1e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/cluster.go
View File

@@ -348,7 +348,7 @@ func New(config Config) (Cluster, error) {
Store: store, Store: store,
LeadershipNotifyCh: c.raftNotifyCh, LeadershipNotifyCh: c.raftNotifyCh,
LeaderObservationCh: c.raftLeaderObservationCh, LeaderObservationCh: c.raftLeaderObservationCh,
Logger: c.logger.WithComponent("Raft"), Logger: c.logger.WithComponent("Raft").WithField("address", config.Address),
}) })
if err != nil { if err != nil {
c.Shutdown() c.Shutdown()

14
cluster/raft/raft.go
View File

@@ -146,6 +146,8 @@ func (r *raft) Shutdown() {
return return
} }
r.logger.Info().Log("Stopping ...")
r.shutdown = true r.shutdown = true
close(r.shutdownCh) close(r.shutdownCh)
@@ -154,6 +156,8 @@ func (r *raft) Shutdown() {
future := r.raft.Shutdown() future := r.raft.Shutdown()
if err := future.Error(); err != nil { if err := future.Error(); err != nil {
r.logger.Warn().WithError(err).Log("Shutting down raft") r.logger.Warn().WithError(err).Log("Shutting down raft")
} else {
r.logger.Info().Log("Server exited")
} }
if r.raftStore != nil { if r.raftStore != nil {
r.raftStore.Close() r.raftStore.Close()
@@ -454,7 +458,7 @@ func (r *raft) start(fsm hcraft.FSM, peers []Peer, inmem bool) error {
return fmt.Errorf("bootstrapping cluster: %w", err) return fmt.Errorf("bootstrapping cluster: %w", err)
} }
r.logger.Debug().Log("Raft node bootstrapped") r.logger.Info().Log("Raft node bootstrapped")
} else { } else {
// Recover cluster // Recover cluster
fsm, err := store.NewStore(store.Config{}) fsm, err := store.NewStore(store.Config{})
@@ -486,7 +490,7 @@ func (r *raft) start(fsm hcraft.FSM, peers []Peer, inmem bool) error {
return fmt.Errorf("recovering cluster: %w", err) return fmt.Errorf("recovering cluster: %w", err)
} }
r.logger.Debug().Log("Raft node recoverd") r.logger.Info().Log("Raft node recoverd")
} }
// Set up a channel for reliable leader notifications. // Set up a channel for reliable leader notifications.
@@ -504,7 +508,7 @@ func (r *raft) start(fsm hcraft.FSM, peers []Peer, inmem bool) error {
go r.trackLeaderChanges() go r.trackLeaderChanges()
go r.monitorLeadership() go r.monitorLeadership()
r.logger.Debug().Log("Raft started") r.logger.Info().Log("Raft started")
return nil return nil
} }
@@ -524,7 +528,7 @@ func (r *raft) monitorLeadership() {
} }
} }
r.logger.Debug().WithField("leader", isLeader).Log("leader notification") r.logger.Info().WithField("leader", isLeader).Log("Leader notification")
case <-r.shutdownCh: case <-r.shutdownCh:
return return
} }
@@ -544,7 +548,7 @@ func (r *raft) trackLeaderChanges() {
select { select {
case obs := <-obsCh: case obs := <-obsCh:
if leaderObs, ok := obs.Data.(hcraft.LeaderObservation); ok { if leaderObs, ok := obs.Data.(hcraft.LeaderObservation); ok {
r.logger.Debug().WithFields(log.Fields{ r.logger.Info().WithFields(log.Fields{
"id": leaderObs.LeaderID, "id": leaderObs.LeaderID,
"address": leaderObs.LeaderAddr, "address": leaderObs.LeaderAddr,
}).Log("New leader observation") }).Log("New leader observation")