From 84bdba8285e9daaf73b98895147e44a956ea82ea Mon Sep 17 00:00:00 2001 From: Andrew Werner Date: Mon, 31 Jan 2022 11:16:34 -0500 Subject: [PATCH] Revert "vendor: bump Pebble to b958d9a7760b" This reverts commit 51d9f701d30e2f1ef8eaaf1743097160a499e0f2. That pebble bump exposed flakes like #75717 and #75687. Fixes #75687 Fixes #75717 Release note: None --- DEPS.bzl | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- vendor | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 633145761d87..7d4875a6aadd 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1218,10 +1218,10 @@ def go_deps(): name = "com_github_cockroachdb_pebble", build_file_proto_mode = "disable_global", importpath = "github.com/cockroachdb/pebble", - sha256 = "031a81b46b545212a1fb43587670ce99edff8f1e202d4ae1f0825b8263b2432f", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20220127212634-b958d9a7760b", + sha256 = "0018bcef357bf7bba06d5e3eb35277709b5fd98ee437924001531fa935d8c76d", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20220126162719-a5c1766b568a", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220127212634-b958d9a7760b.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220126162719-a5c1766b568a.zip", ], ) go_repository( diff --git a/go.mod b/go.mod index c661085138b5..bfc77d41a359 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 github.com/cockroachdb/gostdlib v1.13.0 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f - github.com/cockroachdb/pebble v0.0.0-20220127212634-b958d9a7760b + github.com/cockroachdb/pebble v0.0.0-20220126162719-a5c1766b568a github.com/cockroachdb/redact v1.1.3 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 diff --git a/go.sum b/go.sum index 500e0b65329c..48b87d963af3 100644 --- a/go.sum +++ b/go.sum @@ -416,8 +416,8 @@ github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0n github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/panicparse/v2 v2.0.0-20211103220158-604c82a44f1e h1:FrERdkPlRj+v7fc+PGpey3GUiDGuTR5CsmLCA54YJ8I= github.com/cockroachdb/panicparse/v2 v2.0.0-20211103220158-604c82a44f1e/go.mod h1:pMxsKyCewnV3xPaFvvT9NfwvDTcIx2Xqg0qL5Gq0SjM= -github.com/cockroachdb/pebble v0.0.0-20220127212634-b958d9a7760b h1:XE/19WfmSmq47fbhjSu5YIvcpVhDAn4FfaXaXWUV2Y0= -github.com/cockroachdb/pebble v0.0.0-20220127212634-b958d9a7760b/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU= +github.com/cockroachdb/pebble v0.0.0-20220126162719-a5c1766b568a h1:JY8MIjk2GyMHjCqmHkNBekLi2N/kNS3uAKheGe78huM= +github.com/cockroachdb/pebble v0.0.0-20220126162719-a5c1766b568a/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU= github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/redact v1.1.1/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= diff --git a/vendor b/vendor index d6dd37db96ab..ac23b5717db7 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit d6dd37db96ab0c612b37d10bd5cf6455e1ffb738 +Subproject commit ac23b5717db7ec2379e9d819e442b761715cc17b