Skip to content

Commit

Permalink
release 1.11: cherry-pick disable SSE tests and go-kit update; bump t…
Browse files Browse the repository at this point in the history 
…o rc.1 (#4548)

* Disable S3 SSE integration tests (#4545)

Signed-off-by: Marco Pracucci <[email protected]>

* Update go-kit/kit to 0.12.0 to fix spurious debug logs

This version of go-kit/kit/log is just a pass-through to go-kit/log.

Also updates the following:
* github.com/go-kit/log from v0.1.0 to v0.2.0
* github.com/json-iterator/go from  v1.1.11 to v1.1.12
* golang.org/x/net from ad29c8ab022f to 978cfadd31cf

Pinned aws-sdk to previous version, to reduce the amount of change.

Signed-off-by: Bryan Boreham <[email protected]>

* compactor unit tests: make log messages consistent

Apparently updating go-kit has made our log lines more consistent

Signed-off-by: Bryan Boreham <[email protected]>

* Bump to rc.1

Signed-off-by: Bryan Boreham <[email protected]>

Co-authored-by: Marco Pracucci <[email protected]>
  • Loading branch information
@bboreham @pracucci
bboreham and pracucci authored Nov 4, 2021
1 parent 919d028 commit 2e5ac2a
Show file tree
Hide file tree
Showing 189 changed files with 3,563 additions and 10,943 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
## master / unreleased


## 1.11.0-rc.1 in progress
* [BUGFIX] Update go-kit package to fix spurious log messages #4544

## 1.11.0-rc.0 in progress

* [CHANGE] Memberlist: Expose default configuration values to the command line options. Note that setting these explicitly to zero will no longer cause the default to be used. If the default is desired, then do set the option. The following are affected: #4276
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.0-rc.0
1.11.0-rc.1
13 changes: 9 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ require (
github.com/NYTimes/gziphandler v1.1.1
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15
github.com/alicebob/miniredis/v2 v2.14.3
github.com/aws/aws-sdk-go v1.40.37
github.com/aws/aws-sdk-go v1.40.45
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
github.com/cespare/xxhash v1.1.0
github.com/dustin/go-humanize v1.0.0
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
github.com/felixge/fgprof v0.9.1
github.com/fsouza/fake-gcs-server v1.7.0
github.com/go-kit/log v0.1.0
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.0
github.com/go-openapi/strfmt v0.20.2
github.com/go-openapi/swag v0.19.15
github.com/go-redis/redis/v8 v8.9.0
Expand All @@ -31,7 +32,7 @@ require (
github.com/gorilla/mux v1.8.0
github.com/grafana/dskit v0.0.0-20210908150159-fcf48cb19aa4
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/json-iterator/go v1.1.11
github.com/json-iterator/go v1.1.12
github.com/lib/pq v1.3.0
github.com/minio/minio-go/v7 v7.0.10
github.com/mitchellh/go-wordwrap v1.0.0
Expand All @@ -55,7 +56,7 @@ require (
github.com/weaveworks/common v0.0.0-20210901124008-1fa3f9fa874c
go.etcd.io/bbolt v1.3.6
go.uber.org/atomic v1.9.0
golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/api v0.56.0
Expand All @@ -82,3 +83,7 @@ replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-
replace google.golang.org/grpc => google.golang.org/grpc v1.38.0

replace github.com/thanos-io/thanos v0.22.0 => github.com/thanos-io/thanos v0.19.1-0.20210923155558-c15594a03c45

// Pin aws-sdk to version prior to go-kit update, to reduce the bulk of change.
// Un-pin once Cortex 1.11 is released.
replace github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.40.37
117 changes: 67 additions & 50 deletions go.sum
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions integration/s3_storage_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ func TestS3Client(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
switch tt.name {
case "config-with-deprecated-sse", "config-with-sse-s3":
t.Skip("TODO: Issue #4543")
}

client, err := s3.NewS3ObjectClient(tt.cfg)

require.NoError(t, err)
Expand Down
48 changes: 24 additions & 24 deletions pkg/compactor/compactor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,16 +509,16 @@ func TestCompactor_ShouldIterateOverUsersAndRunCompaction(t *testing.T) {
`level=info component=compactor msg="discovering users from bucket"`,
`level=info component=compactor msg="discovered users from bucket" users=2`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-1`,
`component=compactor org_id=user-1 level=info msg="start sync of metas"`,
`component=compactor org_id=user-1 level=info msg="start of GC"`,
`component=compactor org_id=user-1 level=info msg="start of compactions"`,
`component=compactor org_id=user-1 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-1 msg="start sync of metas"`,
`level=info component=compactor org_id=user-1 msg="start of GC"`,
`level=info component=compactor org_id=user-1 msg="start of compactions"`,
`level=info component=compactor org_id=user-1 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-1`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-2`,
`component=compactor org_id=user-2 level=info msg="start sync of metas"`,
`component=compactor org_id=user-2 level=info msg="start of GC"`,
`component=compactor org_id=user-2 level=info msg="start of compactions"`,
`component=compactor org_id=user-2 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-2 msg="start sync of metas"`,
`level=info component=compactor org_id=user-2 msg="start of GC"`,
`level=info component=compactor org_id=user-2 msg="start of compactions"`,
`level=info component=compactor org_id=user-2 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-2`,
}, removeIgnoredLogs(strings.Split(strings.TrimSpace(logs.String()), "\n")))

Expand Down Expand Up @@ -625,18 +625,18 @@ func TestCompactor_ShouldNotCompactBlocksMarkedForDeletion(t *testing.T) {
assert.ElementsMatch(t, []string{
`level=info component=cleaner msg="started blocks cleanup and maintenance"`,
`level=info component=cleaner org_id=user-1 msg="started blocks cleanup and maintenance"`,
`component=cleaner org_id=user-1 level=debug msg="deleted file" file=01DTW0ZCPDDNV4BV83Q2SV4QAZ/meta.json bucket=mock`,
`component=cleaner org_id=user-1 level=debug msg="deleted file" file=01DTW0ZCPDDNV4BV83Q2SV4QAZ/deletion-mark.json bucket=mock`,
`level=debug component=cleaner org_id=user-1 msg="deleted file" file=01DTW0ZCPDDNV4BV83Q2SV4QAZ/meta.json bucket=mock`,
`level=debug component=cleaner org_id=user-1 msg="deleted file" file=01DTW0ZCPDDNV4BV83Q2SV4QAZ/deletion-mark.json bucket=mock`,
`level=info component=cleaner org_id=user-1 msg="deleted block marked for deletion" block=01DTW0ZCPDDNV4BV83Q2SV4QAZ`,
`level=info component=cleaner org_id=user-1 msg="completed blocks cleanup and maintenance"`,
`level=info component=cleaner msg="successfully completed blocks cleanup and maintenance"`,
`level=info component=compactor msg="discovering users from bucket"`,
`level=info component=compactor msg="discovered users from bucket" users=1`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-1`,
`component=compactor org_id=user-1 level=info msg="start sync of metas"`,
`component=compactor org_id=user-1 level=info msg="start of GC"`,
`component=compactor org_id=user-1 level=info msg="start of compactions"`,
`component=compactor org_id=user-1 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-1 msg="start sync of metas"`,
`level=info component=compactor org_id=user-1 msg="start of GC"`,
`level=info component=compactor org_id=user-1 msg="start of compactions"`,
`level=info component=compactor org_id=user-1 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-1`,
}, removeIgnoredLogs(strings.Split(strings.TrimSpace(logs.String()), "\n")))

Expand Down Expand Up @@ -733,8 +733,8 @@ func TestCompactor_ShouldNotCompactBlocksForUsersMarkedForDeletion(t *testing.T)
assert.ElementsMatch(t, []string{
`level=info component=cleaner msg="started blocks cleanup and maintenance"`,
`level=info component=cleaner org_id=user-1 msg="deleting blocks for tenant marked for deletion"`,
`component=cleaner org_id=user-1 level=debug msg="deleted file" file=01DTVP434PA9VFXSW2JKB3392D/meta.json bucket=mock`,
`component=cleaner org_id=user-1 level=debug msg="deleted file" file=01DTVP434PA9VFXSW2JKB3392D/index bucket=mock`,
`level=debug component=cleaner org_id=user-1 msg="deleted file" file=01DTVP434PA9VFXSW2JKB3392D/meta.json bucket=mock`,
`level=debug component=cleaner org_id=user-1 msg="deleted file" file=01DTVP434PA9VFXSW2JKB3392D/index bucket=mock`,
`level=info component=cleaner org_id=user-1 msg="deleted block" block=01DTVP434PA9VFXSW2JKB3392D`,
`level=info component=cleaner org_id=user-1 msg="deleted blocks for tenant marked for deletion" deletedBlocks=1`,
`level=info component=cleaner org_id=user-1 msg="updating finished time in tenant deletion mark"`,
Expand Down Expand Up @@ -854,16 +854,16 @@ func TestCompactor_ShouldCompactAllUsersOnShardingEnabledButOnlyOneInstanceRunni
`level=info component=compactor msg="discovering users from bucket"`,
`level=info component=compactor msg="discovered users from bucket" users=2`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-1`,
`component=compactor org_id=user-1 level=info msg="start sync of metas"`,
`component=compactor org_id=user-1 level=info msg="start of GC"`,
`component=compactor org_id=user-1 level=info msg="start of compactions"`,
`component=compactor org_id=user-1 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-1 msg="start sync of metas"`,
`level=info component=compactor org_id=user-1 msg="start of GC"`,
`level=info component=compactor org_id=user-1 msg="start of compactions"`,
`level=info component=compactor org_id=user-1 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-1`,
`level=info component=compactor msg="starting compaction of user blocks" user=user-2`,
`component=compactor org_id=user-2 level=info msg="start sync of metas"`,
`component=compactor org_id=user-2 level=info msg="start of GC"`,
`component=compactor org_id=user-2 level=info msg="start of compactions"`,
`component=compactor org_id=user-2 level=info msg="compaction iterations done"`,
`level=info component=compactor org_id=user-2 msg="start sync of metas"`,
`level=info component=compactor org_id=user-2 msg="start of GC"`,
`level=info component=compactor org_id=user-2 msg="start of compactions"`,
`level=info component=compactor org_id=user-2 msg="compaction iterations done"`,
`level=info component=compactor msg="successfully compacted user blocks" user=user-2`,
}, removeIgnoredLogs(strings.Split(strings.TrimSpace(logs.String()), "\n")))
}
Expand Down
44 changes: 24 additions & 20 deletions vendor/github.com/armon/go-metrics/inmem.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 32 additions & 1 deletion vendor/github.com/armon/go-metrics/inmem_endpoint.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 16 additions & 18 deletions vendor/github.com/armon/go-metrics/prometheus/prometheus.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2e5ac2a

Please sign in to comment.