@@ -218,7 +218,6 @@ func (r *raftNode) start(rh *raftReadyHandler) {
218
218
// Must save the snapshot file and WAL snapshot entry before saving any other entries or hardstate to
219
219
// ensure that recovery after a snapshot restore is possible.
220
220
if m .Snapshot != nil {
221
- r .lg .Info ("Save snap" , zap .Any ("snap" , m .Snapshot ))
222
221
// gofail: var raftBeforeSaveSnap struct{}
223
222
if err := r .storage .SaveSnap (* m .Snapshot ); err != nil {
224
223
r .lg .Fatal ("failed to save Raft snapshot" , zap .Error (err ))
@@ -227,17 +226,15 @@ func (r *raftNode) start(rh *raftReadyHandler) {
227
226
}
228
227
229
228
// gofail: var raftBeforeSave struct{}
230
- r .lg .Info ("Save entries" , zap .Any ("entries" , m .Entries ))
231
229
if err := r .storage .Save (messageHardState .hardState , m .Entries ); err != nil {
232
230
r .lg .Fatal ("failed to save Raft hard state and entries" , zap .Error (err ))
233
231
}
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
+ }
237
235
// gofail: var raftAfterSave struct{}
238
236
239
237
if m .Snapshot != nil {
240
- r .lg .Info ("Sync wal" )
241
238
// Force WAL to fsync its hard state before Release() releases
242
239
// old data from the WAL. Otherwise could get an error like:
243
240
// 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) {
249
246
// etcdserver now claim the snapshot has been persisted onto the disk
250
247
// gofail: var raftBeforeApplySnap struct{}
251
248
r .raftStorage .ApplySnapshot (* m .Snapshot )
252
- r .lg .Info ("applied incoming Raft snapshot" , zap .Uint64 ("snapshot-index" , m .Snapshot .Metadata .Index ))
253
249
// gofail: var raftAfterApplySnap struct{}
254
250
255
251
if err := r .storage .Release (* m .Snapshot ); err != nil {
256
252
r .lg .Fatal ("failed to release Raft wal" , zap .Error (err ))
257
253
}
258
254
// gofail: var raftAfterWALRelease struct{}
259
255
}
260
- r .lg .Info ("Append entries" , zap .Any ("entries" , m .Entries ))
261
256
r .raftStorage .Append (m .Entries )
262
- r .lg .Info ("Append sent responses" , zap .Any ("entries" , m .Responses ))
263
257
r .transport .Send (m .Responses )
264
258
case <- r .stopped :
265
259
return
@@ -302,33 +296,24 @@ func (r *raftNode) start(rh *raftReadyHandler) {
302
296
case <- r .ticker .C :
303
297
r .tick ()
304
298
case rd := <- r .Ready ():
305
- r .lg .Info ("Ready" )
306
299
if rd .SoftState != nil {
307
- r .lg .Info ("SoftState" , zap .Any ("soft-state" , rd .SoftState ))
308
300
r .handleSoftState (rh , rd .SoftState , rd .RaftState )
309
301
}
310
302
if len (rd .ReadStates ) != 0 {
311
- r .lg .Info ("ReadyStates" , zap .Any ("ready-state" , rd .ReadStates ))
312
303
if r .handleReadyStates (rd .ReadStates ) {
313
304
return
314
305
}
315
306
}
316
- if ! raft .IsEmptyHardState (rd .HardState ) {
317
- r .lg .Info ("HardState" , zap .Any ("hard-state" , rd .HardState ))
318
- }
319
307
for _ , m := range rd .Messages {
320
308
switch m .To {
321
309
case raft .LocalApplyThread :
322
- r .lg .Info ("Message apply" , zap .Any ("message" , m ))
323
310
toApply <- m
324
311
case raft .LocalAppendThread :
325
- r .lg .Info ("Message append" , zap .Any ("message" , m ))
326
312
toAppend <- hardStateMessage {
327
313
hardState : rd .HardState ,
328
314
message : m ,
329
315
}
330
316
default :
331
- r .lg .Info ("Message sent" , zap .Any ("message" , m ))
332
317
r .transport .Send ([]raftpb.Message {m })
333
318
}
334
319
}
0 commit comments