@@ -214,9 +214,11 @@ func TestCompactor_ShouldDoNothingOnNoUserBlocks(t *testing.T) {
214
214
assert .Equal (t , []string {
215
215
`level=info component=cleaner msg="started blocks cleanup and maintenance"` ,
216
216
`level=info component=cleaner msg="successfully completed blocks cleanup and maintenance"` ,
217
+ `level=info component=compactor msg="compactor started"` ,
217
218
`level=info component=compactor msg="discovering users from bucket"` ,
218
219
`level=info component=compactor msg="discovered users from bucket" users=0` ,
219
- }, strings .Split (strings .TrimSpace (logs .String ()), "\n " ))
220
+ `level=info component=compactor msg="compactor stopped"` ,
221
+ }, removeIgnoredLogs (strings .Split (strings .TrimSpace (logs .String ()), "\n " )))
220
222
221
223
assert .NoError (t , prom_testutil .GatherAndCompare (registry , strings .NewReader (`
222
224
# TYPE cortex_compactor_runs_started_total counter
@@ -365,9 +367,11 @@ func TestCompactor_ShouldRetryCompactionOnFailureWhileDiscoveringUsersFromBucket
365
367
assert .Equal (t , []string {
366
368
`level=info component=cleaner msg="started blocks cleanup and maintenance"` ,
367
369
`level=error component=cleaner msg="failed to run blocks cleanup and maintenance" err="failed to discover users from bucket: failed to iterate the bucket"` ,
370
+ `level=info component=compactor msg="compactor started"` ,
368
371
`level=info component=compactor msg="discovering users from bucket"` ,
369
372
`level=error component=compactor msg="failed to discover users from bucket" err="failed to iterate the bucket"` ,
370
- }, strings .Split (strings .TrimSpace (logs .String ()), "\n " ))
373
+ `level=info component=compactor msg="compactor stopped"` ,
374
+ }, removeIgnoredLogs (strings .Split (strings .TrimSpace (logs .String ()), "\n " )))
371
375
372
376
assert .NoError (t , prom_testutil .GatherAndCompare (registry , strings .NewReader (`
373
377
# TYPE cortex_compactor_runs_started_total counter
@@ -661,6 +665,7 @@ func TestCompactor_ShouldIterateOverUsersAndRunCompaction(t *testing.T) {
661
665
`level=info component=cleaner org_id=user-2 msg="started blocks cleanup and maintenance"` ,
662
666
`level=info component=cleaner org_id=user-2 msg="completed blocks cleanup and maintenance"` ,
663
667
`level=info component=cleaner msg="successfully completed blocks cleanup and maintenance"` ,
668
+ `level=info component=compactor msg="compactor started"` ,
664
669
`level=info component=compactor msg="discovering users from bucket"` ,
665
670
`level=info component=compactor msg="discovered users from bucket" users=2` ,
666
671
`level=info component=compactor msg="starting compaction of user blocks" user=user-1` ,
@@ -675,6 +680,7 @@ func TestCompactor_ShouldIterateOverUsersAndRunCompaction(t *testing.T) {
675
680
`level=info component=compactor org_id=user-2 msg="start of compactions"` ,
676
681
`level=info component=compactor org_id=user-2 msg="compaction iterations done"` ,
677
682
`level=info component=compactor msg="successfully compacted user blocks" user=user-2` ,
683
+ `level=info component=compactor msg="compactor stopped"` ,
678
684
}, removeIgnoredLogs (strings .Split (strings .TrimSpace (logs .String ()), "\n " )))
679
685
680
686
// Instead of testing for shipper metrics, we only check our metrics here.
@@ -794,6 +800,7 @@ func TestCompactor_ShouldNotCompactBlocksMarkedForDeletion(t *testing.T) {
794
800
`level=info component=cleaner org_id=user-1 msg="deleted block marked for deletion" block=01DTW0ZCPDDNV4BV83Q2SV4QAZ` ,
795
801
`level=info component=cleaner org_id=user-1 msg="completed blocks cleanup and maintenance"` ,
796
802
`level=info component=cleaner msg="successfully completed blocks cleanup and maintenance"` ,
803
+ `level=info component=compactor msg="compactor started"` ,
797
804
`level=info component=compactor msg="discovering users from bucket"` ,
798
805
`level=info component=compactor msg="discovered users from bucket" users=1` ,
799
806
`level=info component=compactor msg="starting compaction of user blocks" user=user-1` ,
@@ -802,6 +809,7 @@ func TestCompactor_ShouldNotCompactBlocksMarkedForDeletion(t *testing.T) {
802
809
`level=info component=compactor org_id=user-1 msg="start of compactions"` ,
803
810
`level=info component=compactor org_id=user-1 msg="compaction iterations done"` ,
804
811
`level=info component=compactor msg="successfully compacted user blocks" user=user-1` ,
812
+ `level=info component=compactor msg="compactor stopped"` ,
805
813
}, removeIgnoredLogs (strings .Split (strings .TrimSpace (logs .String ()), "\n " )))
806
814
807
815
// Instead of testing for shipper metrics, we only check our metrics here.
@@ -986,9 +994,11 @@ func TestCompactor_ShouldNotCompactBlocksForUsersMarkedForDeletion(t *testing.T)
986
994
`level=info component=cleaner org_id=user-1 msg="deleted blocks for tenant marked for deletion" deletedBlocks=1` ,
987
995
`level=info component=cleaner org_id=user-1 msg="updating finished time in tenant deletion mark"` ,
988
996
`level=info component=cleaner msg="successfully completed blocks cleanup and maintenance"` ,
997
+ `level=info component=compactor msg="compactor started"` ,
989
998
`level=info component=compactor msg="discovering users from bucket"` ,
990
999
`level=info component=compactor msg="discovered users from bucket" users=1` ,
991
1000
`level=debug component=compactor msg="skipping user because it is marked for deletion" user=user-1` ,
1001
+ `level=info component=compactor msg="compactor stopped"` ,
992
1002
}, removeIgnoredLogs (strings .Split (strings .TrimSpace (logs .String ()), "\n " )))
993
1003
994
1004
// Instead of testing for shipper metrics, we only check our metrics here.
@@ -1178,6 +1188,7 @@ func TestCompactor_ShouldCompactAllUsersOnShardingEnabledButOnlyOneInstanceRunni
1178
1188
`level=info component=cleaner org_id=user-2 msg="started blocks cleanup and maintenance"` ,
1179
1189
`level=info component=cleaner org_id=user-2 msg="completed blocks cleanup and maintenance"` ,
1180
1190
`level=info component=cleaner msg="successfully completed blocks cleanup and maintenance"` ,
1191
+ `level=info component=compactor msg="compactor started"` ,
1181
1192
`level=info component=compactor msg="discovering users from bucket"` ,
1182
1193
`level=info component=compactor msg="discovered users from bucket" users=2` ,
1183
1194
`level=info component=compactor msg="starting compaction of user blocks" user=user-1` ,
@@ -1192,6 +1203,7 @@ func TestCompactor_ShouldCompactAllUsersOnShardingEnabledButOnlyOneInstanceRunni
1192
1203
`level=info component=compactor org_id=user-2 msg="start of compactions"` ,
1193
1204
`level=info component=compactor org_id=user-2 msg="compaction iterations done"` ,
1194
1205
`level=info component=compactor msg="successfully compacted user blocks" user=user-2` ,
1206
+ `level=info component=compactor msg="compactor stopped"` ,
1195
1207
}, removeIgnoredLogs (strings .Split (strings .TrimSpace (logs .String ()), "\n " )))
1196
1208
}
1197
1209
@@ -1599,6 +1611,7 @@ func removeIgnoredLogs(input []string) []string {
1599
1611
1600
1612
out := make ([]string , 0 , len (input ))
1601
1613
durationRe := regexp .MustCompile (`\s?duration=\S+` )
1614
+ durationMsRe := regexp .MustCompile (`\s?duration_ms=\S+` )
1602
1615
1603
1616
for i := 0 ; i < len (input ); i ++ {
1604
1617
log := input [i ]
@@ -1612,6 +1625,7 @@ func removeIgnoredLogs(input []string) []string {
1612
1625
1613
1626
// Remove any duration from logs.
1614
1627
log = durationRe .ReplaceAllString (log , "" )
1628
+ log = durationMsRe .ReplaceAllString (log , "" )
1615
1629
1616
1630
out = append (out , log )
1617
1631
}
@@ -1941,6 +1955,7 @@ func TestCompactor_ShouldFailCompactionOnTimeout(t *testing.T) {
1941
1955
assert .Equal (t , context .DeadlineExceeded , err )
1942
1956
1943
1957
assert .ElementsMatch (t , []string {
1958
+ `level=info component=compactor msg="compactor started"` ,
1944
1959
`level=info component=compactor msg="waiting until compactor is ACTIVE in the ring"` ,
1945
1960
`level=error component=compactor msg="compactor failed to become ACTIVE in the ring" err="context deadline exceeded"` ,
1946
1961
}, removeIgnoredLogs (strings .Split (strings .TrimSpace (logs .String ()), "\n " )))
0 commit comments