Updated TSDB to include atomic delete fix.

Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
thanos-io · Aug 11, 2020 · 4cab9aa · 4cab9aa
1 parent 626f248
commit 4cab9aa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -70,12 +70,9 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 )
 
-// We want to replace the client-go version with a specific commit hash,
-// so that we don't get errors about being incompatible with the Go proxies.
-// See https://github.com/thanos-io/thanos/issues/1415
 replace (
 	// Make sure Prometheus version is pinned as Prometheus semver does not include Go APIs.
-	github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20200807135816-2899773b0159
+	github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20200811145323-f16cbc20d6f8
 	google.golang.org/grpc => google.golang.org/grpc v1.29.1
 	k8s.io/klog => k8s.io/klog v0.3.1
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30

diff --git a/go.sum b/go.sum
@@ -875,8 +875,8 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/prometheus v1.8.2-0.20200807135816-2899773b0159 h1:mT66e//l/+QugUat5A42YvIPxlsS6O/yr9UtjlDhPYw=
-github.com/prometheus/prometheus v1.8.2-0.20200807135816-2899773b0159/go.mod h1:zfAqy/MwhMFajB9E2n12/9gG2fvofIE9uKDtlZCDxqs=
+github.com/prometheus/prometheus v1.8.2-0.20200811145323-f16cbc20d6f8 h1:vfZ3abKEezjgxrbdHepzHI5iIHB3bzJxvXnmfKf+Or8=
+github.com/prometheus/prometheus v1.8.2-0.20200811145323-f16cbc20d6f8/go.mod h1:zfAqy/MwhMFajB9E2n12/9gG2fvofIE9uKDtlZCDxqs=
 github.com/rafaeljusto/redigomock v0.0.0-20190202135759-257e089e14a1/go.mod h1:JaY6n2sDr+z2WTsXkOmNRUfDy6FN0L6Nk7x06ndm4tY=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=

diff --git a/pkg/store/bucket_test.go b/pkg/store/bucket_test.go
@@ -1826,8 +1826,7 @@ func createBlockWithLargeChunk(t testutil.TB, dir string, lbls labels.Labels, ra
 	testutil.Ok(t, err)
 
 	for _, b := range blocksToCompact {
-		err := os.RemoveAll(b)
-		testutil.Ok(t, err)
+		testutil.Ok(t, os.RemoveAll(b))
 	}
 
 	db, err := tsdb.Open(dir, nil, nil, tsdb.DefaultOptions())