config: cswal_light, mempool_broadcast, mempool_reap

consensus/replay_test.go

@@ -63,7 +63,7 @@ func TestReplayCatchup(t *testing.T) {
 
 func openWAL(t *testing.T, cs *ConsensusState, file string) {
 	// open the wal
-	wal, err := NewWAL(file)
+	wal, err := NewWAL(file, config.GetBool("cswal_light"))
 	if err != nil {
 		t.Fatal(err)
 	}

consensus/state.go

@@ -328,7 +328,7 @@ func (cs *ConsensusState) OnStop() {
 func (cs *ConsensusState) OpenWAL(file string) (err error) {
 	cs.mtx.Lock()
 	defer cs.mtx.Unlock()
-	wal, err := NewWAL(file)
+	wal, err := NewWAL(file, config.GetBool("cswal_light"))
 	if err != nil {
 		return err
 	}
@@ -655,7 +655,6 @@ func (cs *ConsensusState) handleMsg(mi msgInfo, rs RoundState) {
 		err = cs.setProposal(msg.Proposal)
 	case *BlockPartMessage:
 		// if the proposal is complete, we'll enterPrevote or tryFinalizeCommit
-		// if we're the only validator, the enterPrevote may take us through to the next round
 		_, err = cs.addProposalBlockPart(msg.Height, msg.Part)
 	case *VoteMessage:
 		// attempt to add the vote and dupeout the validator if its a duplicate signature
@@ -675,7 +674,7 @@ func (cs *ConsensusState) handleMsg(mi msgInfo, rs RoundState) {
 		log.Warn("Unknown msg type", reflect.TypeOf(msg))
 	}
 	if err != nil {
-		log.Error("Error with msg", "type", reflect.TypeOf(msg), "error", err, "msg", msg)
+		log.Error("Error with msg", "type", reflect.TypeOf(msg), "peer", peerKey, "error", err, "msg", msg)
 	}
 }
 

consensus/wal.go

@@ -39,9 +39,11 @@ type WAL struct {
 	exists bool // if the file already existed (restarted process)
 
 	done chan struct{}
+
+	light bool // ignore block parts
 }
 
-func NewWAL(file string) (*WAL, error) {
+func NewWAL(file string, light bool) (*WAL, error) {
 	var walExists bool
 	if _, err := os.Stat(file); err == nil {
 		walExists = true
@@ -54,12 +56,20 @@ func NewWAL(file string) (*WAL, error) {
 		fp:     fp,
 		exists: walExists,
 		done:   make(chan struct{}),
+		light:  light,
 	}, nil
 }
 
 // called in newStep and for each pass in receiveRoutine
 func (wal *WAL) Save(msg ConsensusLogMessageInterface) {
 	if wal != nil {
+		if wal.light {
+			if m, ok := msg.(msgInfo); ok {
+				if _, ok := m.Msg.(*BlockPartMessage); ok {
+					return
+				}
+			}
+		}
 		var n int
 		var err error
 		wire.WriteJSON(ConsensusLogMessage{time.Now(), msg}, wal.fp, &n, &err)

consensus/wal_test.go

@@ -30,7 +30,7 @@ func TestSeek(t *testing.T) {
 	}
 	f.Close()
 
-	wal, err := NewWAL(path.Join(os.TempDir(), name))
+	wal, err := NewWAL(path.Join(os.TempDir(), name), config.GetBool("cswal_light"))
 	if err != nil {
 		t.Fatal(err)
 	}