Skip to content

Commit c7a95fe

Browse files
committed
Remove logging
Signed-off-by: Marek Siarkowicz <[email protected]>
1 parent 8b4d990 commit c7a95fe

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

server/etcdserver/api/rafthttp/transport.go

+1-6
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,12 @@ func (t *Transport) Get(id types.ID) Peer {
174174

175175
func (t *Transport) Send(msgs []raftpb.Message) {
176176
for _, m := range msgs {
177-
t.Logger.Info("Got message to send", zap.Any("to", m.To))
178177
if m.To == 0 {
179-
t.Logger.Info("Drop")
180178
// ignore intentionally dropped message
181179
continue
182180
}
183181
to := types.ID(m.To)
184182
if to == t.ID {
185-
t.Logger.Info("Sending message to self", zap.Any("to", m.To))
186183
t.Raft.Process(context.Background(), m)
187184
continue
188185
}
@@ -193,7 +190,6 @@ func (t *Transport) Send(msgs []raftpb.Message) {
193190
t.mu.RUnlock()
194191

195192
if pok {
196-
t.Logger.Info("Send to peer", zap.Any("peer", p))
197193
if isMsgApp(m) {
198194
t.ServerStats.SendAppendReq(m.Size())
199195
}
@@ -202,13 +198,12 @@ func (t *Transport) Send(msgs []raftpb.Message) {
202198
}
203199

204200
if rok {
205-
t.Logger.Info("Send to remote", zap.Any("remote", g))
206201
g.send(m)
207202
continue
208203
}
209204

210205
if t.Logger != nil {
211-
t.Logger.Info(
206+
t.Logger.Debug(
212207
"ignored message send request; unknown remote peer target",
213208
zap.String("type", m.Type.String()),
214209
zap.String("unknown-target-peer-id", to.String()),

server/etcdserver/raft.go

+3-18
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ func (r *raftNode) start(rh *raftReadyHandler) {
218218
// Must save the snapshot file and WAL snapshot entry before saving any other entries or hardstate to
219219
// ensure that recovery after a snapshot restore is possible.
220220
if m.Snapshot != nil {
221-
r.lg.Info("Save snap", zap.Any("snap", m.Snapshot))
222221
// gofail: var raftBeforeSaveSnap struct{}
223222
if err := r.storage.SaveSnap(*m.Snapshot); err != nil {
224223
r.lg.Fatal("failed to save Raft snapshot", zap.Error(err))
@@ -227,17 +226,15 @@ func (r *raftNode) start(rh *raftReadyHandler) {
227226
}
228227

229228
// gofail: var raftBeforeSave struct{}
230-
r.lg.Info("Save entries", zap.Any("entries", m.Entries))
231229
if err := r.storage.Save(messageHardState.hardState, m.Entries); err != nil {
232230
r.lg.Fatal("failed to save Raft hard state and entries", zap.Error(err))
233231
}
234-
//if !raft.IsEmptyHardState(hardState) {
235-
// proposalsCommitted.Set(float64(hardState.Commit))
236-
//}
232+
if !raft.IsEmptyHardState(messageHardState.hardState) {
233+
proposalsCommitted.Set(float64(messageHardState.hardState.Commit))
234+
}
237235
// gofail: var raftAfterSave struct{}
238236

239237
if m.Snapshot != nil {
240-
r.lg.Info("Sync wal")
241238
// Force WAL to fsync its hard state before Release() releases
242239
// old data from the WAL. Otherwise could get an error like:
243240
// panic: tocommit(107) is out of range [lastIndex(84)]. Was the raft log corrupted, truncated, or lost?
@@ -249,17 +246,14 @@ func (r *raftNode) start(rh *raftReadyHandler) {
249246
// etcdserver now claim the snapshot has been persisted onto the disk
250247
// gofail: var raftBeforeApplySnap struct{}
251248
r.raftStorage.ApplySnapshot(*m.Snapshot)
252-
r.lg.Info("applied incoming Raft snapshot", zap.Uint64("snapshot-index", m.Snapshot.Metadata.Index))
253249
// gofail: var raftAfterApplySnap struct{}
254250

255251
if err := r.storage.Release(*m.Snapshot); err != nil {
256252
r.lg.Fatal("failed to release Raft wal", zap.Error(err))
257253
}
258254
// gofail: var raftAfterWALRelease struct{}
259255
}
260-
r.lg.Info("Append entries", zap.Any("entries", m.Entries))
261256
r.raftStorage.Append(m.Entries)
262-
r.lg.Info("Append sent responses", zap.Any("entries", m.Responses))
263257
r.transport.Send(m.Responses)
264258
case <-r.stopped:
265259
return
@@ -302,33 +296,24 @@ func (r *raftNode) start(rh *raftReadyHandler) {
302296
case <-r.ticker.C:
303297
r.tick()
304298
case rd := <-r.Ready():
305-
r.lg.Info("Ready")
306299
if rd.SoftState != nil {
307-
r.lg.Info("SoftState", zap.Any("soft-state", rd.SoftState))
308300
r.handleSoftState(rh, rd.SoftState, rd.RaftState)
309301
}
310302
if len(rd.ReadStates) != 0 {
311-
r.lg.Info("ReadyStates", zap.Any("ready-state", rd.ReadStates))
312303
if r.handleReadyStates(rd.ReadStates) {
313304
return
314305
}
315306
}
316-
if !raft.IsEmptyHardState(rd.HardState) {
317-
r.lg.Info("HardState", zap.Any("hard-state", rd.HardState))
318-
}
319307
for _, m := range rd.Messages {
320308
switch m.To {
321309
case raft.LocalApplyThread:
322-
r.lg.Info("Message apply", zap.Any("message", m))
323310
toApply <- m
324311
case raft.LocalAppendThread:
325-
r.lg.Info("Message append", zap.Any("message", m))
326312
toAppend <- hardStateMessage{
327313
hardState: rd.HardState,
328314
message: m,
329315
}
330316
default:
331-
r.lg.Info("Message sent", zap.Any("message", m))
332317
r.transport.Send([]raftpb.Message{m})
333318
}
334319
}

0 commit comments

Comments
 (0)