Skip to content

Commit

Permalink
Make test cases more complicated
Browse files Browse the repository at this point in the history 
Signed-off-by: Kemal Akkoyun <[email protected]>
  • Loading branch information
@kakkoyun
kakkoyun committed Mar 17, 2020
1 parent 1545714 commit 77a4b81
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 11 deletions.
75 changes: 67 additions & 8 deletions test/e2e/compact_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,21 @@ func TestCompact(t *testing.T) {
blocks: []blockDesc{
{
series: []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
extLset: labels.FromStrings("ext1", "value1", "replica", "1"),
extLset: labels.FromStrings("ext1", "value1", "ext2", "value2", "replica", "1"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 120,
},
{
series: []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
extLset: labels.FromStrings("ext1", "value1", "replica", "2"),
extLset: labels.FromStrings("ext2", "value2", "ext1", "value1", "replica", "2"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 120,
},
{
series: []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
extLset: labels.FromStrings("ext1", "value1", "rule_replica", "1"),
extLset: labels.FromStrings("ext1", "value1", "rule_replica", "1", "ext2", "value2"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 120,
Expand All @@ -142,6 +142,7 @@ func TestCompact(t *testing.T) {
"a": "1",
"b": "2",
"ext1": "value1",
"ext2": "value2",
},
},
expectOfModBlocks: 3,
Expand All @@ -150,19 +151,76 @@ func TestCompact(t *testing.T) {
expectOfSeries: 1,
expectOfChunks: 2,
},
{
name: "(full) vertically overlapping blocks with replica labels, downsampling disabled and extra blocks",
blocks: []blockDesc{
{
series: []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
extLset: labels.FromStrings("ext1", "value1", "ext2", "value2", "replica", "1"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 120,
},
{
series: []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
extLset: labels.FromStrings("ext2", "value2", "ext1", "value1", "replica", "2"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 120,
},
{
series: []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
extLset: labels.FromStrings("ext1", "value1", "rule_replica", "1", "ext2", "value2"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 120,
},
{
series: []labels.Labels{labels.FromStrings("c", "1", "d", "2")},
extLset: labels.FromStrings("ext1", "value1", "ext2", "value2"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 120,
},
{
series: []labels.Labels{labels.FromStrings("c", "1", "d", "2")},
extLset: labels.FromStrings("ext3", "value3"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 120,
},
},
replicaLabels: []string{"replica", "rule_replica"},
downsamplingEnabled: false,
query: "{a=\"1\"}",

expected: []model.Metric{
{
"a": "1",
"b": "2",
"ext1": "value1",
"ext2": "value2",
},
},
expectOfModBlocks: 3,
expectOfBlocks: 2,
expectOfSamples: 360,
expectOfSeries: 3,
expectOfChunks: 6,
},
{
name: "(partial) vertically overlapping blocks with replica labels",
blocks: []blockDesc{
{
series: []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
extLset: labels.FromStrings("ext1", "value1", "replica", "1"),
extLset: labels.FromStrings("ext1", "value1", "ext2", "value2", "replica", "1"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(2 * time.Hour)),
samplesPerSeries: 119,
},
{
series: []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
extLset: labels.FromStrings("ext1", "value1", "replica", "2"),
extLset: labels.FromStrings("ext2", "value2", "ext1", "value1", "replica", "2"),
mint: timestamp.FromTime(now),
maxt: timestamp.FromTime(now.Add(1 * time.Hour)),
samplesPerSeries: 59,
Expand All @@ -177,6 +235,7 @@ func TestCompact(t *testing.T) {
"a": "1",
"b": "2",
"ext1": "value1",
"ext2": "value2",
},
},
expectOfModBlocks: 2,
Expand Down Expand Up @@ -314,7 +373,7 @@ func TestCompact(t *testing.T) {

s, err := e2e.NewScenario("e2e_test_compact_" + strconv.Itoa(i))
testutil.Ok(t, err)
defer s.Close() // TODO(kakkoyun): Change with t.CleanUp after go .1.14 update.
defer s.Close() // TODO(kakkoyun): Change with t.CleanUp after go 1.14 update.

dir := filepath.Join(s.SharedDir(), "tmp_"+strconv.Itoa(i))
testutil.Ok(t, os.MkdirAll(filepath.Join(s.SharedDir(), dir), os.ModePerm))
Expand All @@ -334,7 +393,7 @@ func TestCompact(t *testing.T) {
testutil.Ok(t, err)

ctx, cancel := context.WithTimeout(context.Background(), 90*time.Second)
defer cancel() // TODO(kakkoyun): Change with t.CleanUp after go .1.14 update.
defer cancel() // TODO(kakkoyun): Change with t.CleanUp after go 1.14 update.

var rawBlockIds []ulid.ULID
for _, b := range tcase.blocks {
Expand Down Expand Up @@ -444,7 +503,7 @@ func TestCompact(t *testing.T) {
testutil.Equals(t, tcase.expectOfSeries, actualOfSeries)
testutil.Equals(t, tcase.expectOfSamples, actualOfSamples)

s.Close() // TODO(kakkoyun): Change with t.CleanUp after go .1.14 update.
s.Close() // TODO(kakkoyun): Change with t.CleanUp after go 1.14 update.
})
}
}
6 changes: 3 additions & 3 deletions test/e2e/receive_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestReceive(t *testing.T) {
},
})

s.Close() // TODO(kakkoyun): Change with t.CleanUp after go .1.14 update.
s.Close() // TODO(kakkoyun): Change with t.CleanUp after go 1.14 update.
})

t.Run("replication", func(t *testing.T) {
Expand Down Expand Up @@ -170,7 +170,7 @@ func TestReceive(t *testing.T) {
},
})

s.Close() // TODO(kakkoyun): Change with t.CleanUp after go .1.14 update.
s.Close() // TODO(kakkoyun): Change with t.CleanUp after go 1.14 update.
})

t.Run("replication_with_outage", func(t *testing.T) {
Expand Down Expand Up @@ -235,6 +235,6 @@ func TestReceive(t *testing.T) {
},
})

s.Close() // TODO(kakkoyun): Change with t.CleanUp after go .1.14 update.
s.Close() // TODO(kakkoyun): Change with t.CleanUp after go 1.14 update.
})
}

0 comments on commit 77a4b81

Please sign in to comment.