Don't flush data during bootstrapping

storage/bootstrap.go

@@ -72,12 +72,10 @@ type bootstrapManager struct {
 	newBootstrapFn NewBootstrapFn
 	state          bootstrapState
 	hasPending     bool
-	fsManager      databaseFileSystemManager
 }
 
 func newBootstrapManager(
 	database database,
-	fsManager databaseFileSystemManager,
 ) databaseBootstrapManager {
 	opts := database.Options()
 	return &bootstrapManager{
@@ -86,7 +84,6 @@ func newBootstrapManager(
 		log:            opts.InstrumentOptions().Logger(),
 		nowFn:          opts.ClockOptions().NowFn(),
 		newBootstrapFn: opts.NewBootstrapFn(),
-		fsManager:      fsManager,
 	}
 }
 
@@ -187,14 +184,5 @@ func (m *bootstrapManager) bootstrap() error {
 			xlog.NewLogField("duration", end.Sub(start).String()),
 		).Info("bootstrap finished")
 	}
-
-	// At this point we have bootstrapped everything between now - retentionPeriod
-	// and now, so we should run the filesystem manager to clean up files and flush
-	// all the data we bootstrapped.
-	rateLimitOpts := m.fsManager.RateLimitOptions()
-	m.fsManager.SetRateLimitOptions(rateLimitOpts.SetLimitEnabled(false))
-	m.fsManager.Run(m.nowFn(), false)
-	m.fsManager.SetRateLimitOptions(rateLimitOpts)
-
 	return multiErr.FinalError()
 }

storage/bootstrap_test.go

@@ -25,7 +25,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/m3db/m3db/ratelimit"
 	"github.com/m3db/m3db/storage/bootstrap"
 	"github.com/m3db/m3db/ts"
 
@@ -55,12 +54,7 @@ func TestDatabaseBootstrapWithBootstrapError(t *testing.T) {
 	}
 
 	db := &mockDatabase{namespaces: namespaces, opts: opts}
-	rateLimitOpts := ratelimit.NewOptions()
-	fsm := NewMockdatabaseFileSystemManager(ctrl)
-	fsm.EXPECT().RateLimitOptions().Return(rateLimitOpts)
-	fsm.EXPECT().Run(now, false)
-	fsm.EXPECT().SetRateLimitOptions(gomock.Any()).Times(2)
-	bsm := newBootstrapManager(db, fsm).(*bootstrapManager)
+	bsm := newBootstrapManager(db).(*bootstrapManager)
 	err := bsm.Bootstrap()
 
 	require.NotNil(t, err)
@@ -89,7 +83,7 @@ func TestDatabaseBootstrapTargetRanges(t *testing.T) {
 
 	db := &mockDatabase{opts: opts}
 
-	bsm := newBootstrapManager(db, nil).(*bootstrapManager)
+	bsm := newBootstrapManager(db).(*bootstrapManager)
 	ranges := bsm.targetRanges(now)
 
 	var all [][]time.Time

storage/database.go

@@ -206,7 +206,7 @@ func NewDatabase(
 	}
 	d.fsm = fsm
 
-	d.bsm = newBootstrapManager(d, d.fsm)
+	d.bsm = newBootstrapManager(d)
 
 	if opts.RepairEnabled() {
 		d.repairer, err = newDatabaseRepairer(d)

storage/database_test.go

@@ -113,7 +113,7 @@ func newTestDatabase(t *testing.T, bs bootstrapState) *db {
 	database, err := NewDatabase(nil, nil, opts)
 	require.NoError(t, err)
 	d := database.(*db)
-	bsm := newBootstrapManager(d, nil).(*bootstrapManager)
+	bsm := newBootstrapManager(d).(*bootstrapManager)
 	bsm.state = bs
 	d.bsm = bsm
 	return d