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