Merge #75735

75735: Revert "vendor: bump Pebble to b958d9a7760b" r=nicktrav a=ajwerner This reverts commit 51d9f70. That pebble bump exposed flakes like #75717 and #75687. Fixes #75687 Fixes #75717 Co-authored-by: Andrew Werner <[email protected]>
cockroachdb · Jan 31, 2022 · baeba80 · baeba80
2 parents a5158c4 + 84bdba8
commit baeba80
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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/[email protected]20220127212634-b958d9a7760b",
+        sha256 = "0018bcef357bf7bba06d5e3eb35277709b5fd98ee437924001531fa935d8c76d",
+        strip_prefix = "github.com/cockroachdb/[email protected]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
@@ -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
@@ -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
+0 −5		github.com/cockroachdb/pebble/internal/rangekey/coalescer.go
+4 −5		github.com/cockroachdb/pebble/internal/rangekey/iter.go
+0 −111		github.com/cockroachdb/pebble/sstable/write_queue.go
+44 −76		github.com/cockroachdb/pebble/sstable/writer.go
+1 −1		modules.txt