Skip to content

Commit

Permalink
Fix prop test
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard Artoul committed Sep 10, 2018
1 parent 129cfa5 commit b2d0753
Showing 1 changed file with 23 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ import (
"github.com/m3db/m3/src/dbnode/persist/fs/commitlog"
"github.com/m3db/m3/src/dbnode/storage/bootstrap/result"
"github.com/m3db/m3/src/dbnode/storage/namespace"
topotestutils "github.com/m3db/m3/src/dbnode/topology/testutil"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3cluster/shard"
"github.com/m3db/m3x/checked"
"github.com/m3db/m3x/context"
"github.com/m3db/m3x/ident"
Expand Down Expand Up @@ -306,19 +308,35 @@ func TestCommitLogSourcePropCorrectlyBootstrapsFromCommitlog(t *testing.T) {

// Determine which shards we need to bootstrap (based on the randomly
// generated data)
allShards := map[uint32]bool{}
var (
allShardsMap = map[uint32]bool{}
allShardsSlice = []uint32{}
)
for _, write := range input.writes {
allShards[write.series.Shard] = true
shard := write.series.Shard
if _, ok := allShardsMap[shard]; !ok {
allShardsSlice = append(allShardsSlice, shard)
}
allShardsMap[shard] = true
}

// Assign the previously-determined bootstrap range to each known shard
shardTimeRanges := result.ShardTimeRanges{}
for shard := range allShards {
for shard := range allShardsMap {
shardTimeRanges[shard] = ranges
}

// Perform the bootstrap
runOpts := testDefaultRunOpts
var (
initialTopoState = topotestutils.SourceAvailableHosts{
topotestutils.SourceAvailableHost{
Name: topotestutils.SelfID,
Shards: allShardsSlice,
ShardStates: shard.Available,
},
}.TopologyState(1)
runOpts = testDefaultRunOpts.SetInitialTopologyState(initialTopoState)
)
dataResult, err := source.BootstrapData(nsMeta, shardTimeRanges, runOpts)
if err != nil {
return false, err
Expand All @@ -341,7 +359,7 @@ func TestCommitLogSourcePropCorrectlyBootstrapsFromCommitlog(t *testing.T) {
return false, err
}

indexResult, err := source.BootstrapIndex(nsMeta, shardTimeRanges, testDefaultRunOpts)
indexResult, err := source.BootstrapIndex(nsMeta, shardTimeRanges, runOpts)
if err != nil {
return false, err
}
Expand Down

0 comments on commit b2d0753

Please sign in to comment.