Skip to content

Commit af1e9a5

Browse files
committed
Remove logging
Signed-off-by: Marek Siarkowicz <[email protected]>
1 parent 93257e9 commit af1e9a5

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
@@ -208,7 +208,6 @@ func (r *raftNode) start(rh *raftReadyHandler) {
208208
// Must save the snapshot file and WAL snapshot entry before saving any other entries or hardstate to
209209
// ensure that recovery after a snapshot restore is possible.
210210
if m.Snapshot != nil {
211-
r.lg.Info("Save snap", zap.Any("snap", m.Snapshot))
212211
// gofail: var raftBeforeSaveSnap struct{}
213212
if err := r.storage.SaveSnap(*m.Snapshot); err != nil {
214213
r.lg.Fatal("failed to save Raft snapshot", zap.Error(err))
@@ -217,17 +216,15 @@ func (r *raftNode) start(rh *raftReadyHandler) {
217216
}
218217

219218
// gofail: var raftBeforeSave struct{}
220-
r.lg.Info("Save entries", zap.Any("entries", m.Entries))
221219
if err := r.storage.Save(messageHardState.hardState, m.Entries); err != nil {
222220
r.lg.Fatal("failed to save Raft hard state and entries", zap.Error(err))
223221
}
224-
//if !raft.IsEmptyHardState(hardState) {
225-
// proposalsCommitted.Set(float64(hardState.Commit))
226-
//}
222+
if !raft.IsEmptyHardState(messageHardState.hardState) {
223+
proposalsCommitted.Set(float64(messageHardState.hardState.Commit))
224+
}
227225
// gofail: var raftAfterSave struct{}
228226

229227
if m.Snapshot != nil {
230-
r.lg.Info("Sync wal")
231228
// Force WAL to fsync its hard state before Release() releases
232229
// old data from the WAL. Otherwise could get an error like:
233230
// panic: tocommit(107) is out of range [lastIndex(84)]. Was the raft log corrupted, truncated, or lost?
@@ -239,17 +236,14 @@ func (r *raftNode) start(rh *raftReadyHandler) {
239236
// etcdserver now claim the snapshot has been persisted onto the disk
240237
// gofail: var raftBeforeApplySnap struct{}
241238
r.raftStorage.ApplySnapshot(*m.Snapshot)
242-
r.lg.Info("applied incoming Raft snapshot", zap.Uint64("snapshot-index", m.Snapshot.Metadata.Index))
243239
// gofail: var raftAfterApplySnap struct{}
244240

245241
if err := r.storage.Release(*m.Snapshot); err != nil {
246242
r.lg.Fatal("failed to release Raft wal", zap.Error(err))
247243
}
248244
// gofail: var raftAfterWALRelease struct{}
249245
}
250-
r.lg.Info("Append entries", zap.Any("entries", m.Entries))
251246
r.raftStorage.Append(m.Entries)
252-
r.lg.Info("Append sent responses", zap.Any("entries", m.Responses))
253247
r.transport.Send(m.Responses)
254248
case <-r.stopped:
255249
return
@@ -292,33 +286,24 @@ func (r *raftNode) start(rh *raftReadyHandler) {
292286
case <-r.ticker.C:
293287
r.tick()
294288
case rd := <-r.Ready():
295-
r.lg.Info("Ready")
296289
if rd.SoftState != nil {
297-
r.lg.Info("SoftState", zap.Any("soft-state", rd.SoftState))
298290
r.handleSoftState(rh, rd.SoftState, rd.RaftState)
299291
}
300292
if len(rd.ReadStates) != 0 {
301-
r.lg.Info("ReadyStates", zap.Any("ready-state", rd.ReadStates))
302293
if r.handleReadyStates(rd.ReadStates) {
303294
return
304295
}
305296
}
306-
if !raft.IsEmptyHardState(rd.HardState) {
307-
r.lg.Info("HardState", zap.Any("hard-state", rd.HardState))
308-
}
309297
for _, m := range rd.Messages {
310298
switch m.To {
311299
case raft.LocalApplyThread:
312-
r.lg.Info("Message apply", zap.Any("message", m))
313300
toApply <- m
314301
case raft.LocalAppendThread:
315-
r.lg.Info("Message append", zap.Any("message", m))
316302
toAppend <- hardStateMessage{
317303
hardState: rd.HardState,
318304
message: m,
319305
}
320306
default:
321-
r.lg.Info("Message sent", zap.Any("message", m))
322307
r.transport.Send([]raftpb.Message{m})
323308
}
324309
}

0 commit comments

Comments
 (0)