Revert "[dbnode] Properly rebuild index segments if they fail verific…

…ation. (#2879)" (#2944)

This reverts commit c6fe28d.

src/dbnode/persist/fs/index_read.go

@@ -22,7 +22,6 @@ package fs
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -42,9 +41,6 @@ const (
 	mmapPersistFsIndexName = "mmap.persist.fs.index"
 )
 
-// ErrIndexReaderValidationFailed is returned for corrupt index segemnts.
-var ErrIndexReaderValidationFailed = errors.New("validation failed")
-
 type indexReader struct {
 	opts           Options
 	filePathPrefix string
@@ -309,54 +305,52 @@ func (r *indexReader) Validate() error {
 
 func (r *indexReader) validateDigestsFileDigest() error {
 	if r.readDigests.digestsFileDigest != r.expectedDigestOfDigest {
-		return fmt.Errorf("(%w) read digests file checksum bad: expected=%d, actual=%d",
-			ErrIndexReaderValidationFailed, r.expectedDigestOfDigest, r.readDigests.digestsFileDigest)
+		return fmt.Errorf("read digests file checksum bad: expected=%d, actual=%d",
+			r.expectedDigestOfDigest, r.readDigests.digestsFileDigest)
 	}
 	return nil
 }
 
 func (r *indexReader) validateInfoFileDigest() error {
 	if r.readDigests.infoFileDigest != r.expectedDigest.InfoDigest {
-		return fmt.Errorf("(%w) read info file checksum bad: expected=%d, actual=%d",
-			ErrIndexReaderValidationFailed, r.expectedDigest.InfoDigest, r.readDigests.infoFileDigest)
+		return fmt.Errorf("read info file checksum bad: expected=%d, actual=%d",
+			r.expectedDigest.InfoDigest, r.readDigests.infoFileDigest)
 	}
 	return nil
 }
 
 func (r *indexReader) validateSegmentFileDigest(segmentIdx, fileIdx int) error {
 	if segmentIdx >= len(r.readDigests.segments) {
 		return fmt.Errorf(
-			"(%w) have not read correct number of segments to validate segment %d checksums: "+
+			"have not read correct number of segments to validate segment %d checksums: "+
 				"need=%d, actual=%d",
-			ErrIndexReaderValidationFailed, segmentIdx, segmentIdx+1, len(r.readDigests.segments))
+			segmentIdx, segmentIdx+1, len(r.readDigests.segments))
 	}
 	if segmentIdx >= len(r.expectedDigest.SegmentDigests) {
 		return fmt.Errorf(
-			"(%w) have not read digest files correctly to validate segment %d checksums: "+
+			"have not read digest files correctly to validate segment %d checksums: "+
 				"need=%d, actual=%d",
-			ErrIndexReaderValidationFailed, segmentIdx, segmentIdx+1, len(r.expectedDigest.SegmentDigests))
+			segmentIdx, segmentIdx+1, len(r.expectedDigest.SegmentDigests))
 	}
 
 	if fileIdx >= len(r.readDigests.segments[segmentIdx].files) {
 		return fmt.Errorf(
-			"(%w) have not read correct number of segment files to validate segment %d checksums: "+
+			"have not read correct number of segment files to validate segment %d checksums: "+
 				"need=%d, actual=%d",
-			ErrIndexReaderValidationFailed, segmentIdx, fileIdx+1,
-			len(r.readDigests.segments[segmentIdx].files))
+			segmentIdx, fileIdx+1, len(r.readDigests.segments[segmentIdx].files))
 	}
 	if fileIdx >= len(r.expectedDigest.SegmentDigests[segmentIdx].Files) {
 		return fmt.Errorf(
-			"(%w) have not read correct number of segment files to validate segment %d checksums: "+
+			"have not read correct number of segment files to validate segment %d checksums: "+
 				"need=%d, actual=%d",
-			ErrIndexReaderValidationFailed, segmentIdx, fileIdx+1,
-			len(r.expectedDigest.SegmentDigests[segmentIdx].Files))
+			segmentIdx, fileIdx+1, len(r.expectedDigest.SegmentDigests[segmentIdx].Files))
 	}
 
 	expected := r.expectedDigest.SegmentDigests[segmentIdx].Files[fileIdx].Digest
 	actual := r.readDigests.segments[segmentIdx].files[fileIdx].digest
 	if actual != expected {
-		return fmt.Errorf("(%w) read segment file %d for segment %d checksum bad: expected=%d, actual=%d",
-			ErrIndexReaderValidationFailed, segmentIdx, fileIdx, expected, actual)
+		return fmt.Errorf("read segment file %d for segment %d checksum bad: expected=%d, actual=%d",
+			segmentIdx, fileIdx, expected, actual)
 	}
 	return nil
 }

src/dbnode/persist/fs/types.go

@@ -700,6 +700,3 @@ type IndexClaimsManager interface {
 		blockStart time.Time,
 	) (int, error)
 }
-
-// DeleteFilesFn deletes files passed in as arg.
-type DeleteFilesFn func(files []string) error

src/dbnode/storage/bootstrap/bootstrapper/README.md

@@ -6,7 +6,6 @@ The collection of bootstrappers comprise the task executed when bootstrapping a
 
 - `fs`: The filesystem bootstrapper, used to bootstrap as much data as possible from the local filesystem.
 - `peers`: The peers bootstrapper, used to bootstrap any remaining data from peers. This is used for a full node join too.
-  - *NOTE*: For the node leave case, the peers bs will persist default volume type index filesets to disk with non-overlapping shard time ranges to avoid re-building the entire index segment w/ new shards.
 - `commitlog`: The commit log bootstrapper, currently only used in the case that peers bootstrapping fails. Once the current block is being snapshotted frequently to disk it might be faster and make more sense to not actively use the peers bootstrapper and just use a combination of the filesystem bootstrapper and the minimal time range required from the commit log bootstrapper.
     - *NOTE*: the commitlog bootstrapper is special cased in that it runs for the *entire* bootstrappable range per shard whereas other bootstrappers fill in the unfulfilled gaps as bootstrapping progresses.