Fix Merge pull request #319

This commit is contained in:
Jae Kwon
2016-12-06 01:16:13 -08:00
parent dc436e72f9
commit 4202c4bf20
5 changed files with 7 additions and 5 deletions
+3 -1
View File
@@ -100,7 +100,9 @@ func (cs *ConsensusState) catchupReplay(csHeight int) error {
// Search for height marker
gr, found, err = cs.wal.group.Search("#HEIGHT: ", makeHeightSearchFunc(csHeight))
if err != nil {
if err == io.EOF {
return nil
} else if err != nil {
return err
}
if !found {
+1 -1
View File
@@ -116,7 +116,7 @@ func toPV(pv PrivValidator) *types.PrivValidator {
func setupReplayTest(thisCase *testCase, nLines int, crashAfter bool) (*ConsensusState, chan interface{}, string, string) {
fmt.Println("-------------------------------------")
log.Notice(Fmt("Starting replay test of %d lines of WAL. Crash after = %v", nLines, crashAfter))
log.Notice(Fmt("Starting replay test %v (of %d lines of WAL). Crash after = %v", thisCase.name, nLines, crashAfter))
lineStep := nLines
if crashAfter {