Skip to content

Commit

Permalink
Merge #131107 #131286
Browse files Browse the repository at this point in the history 
131107: (replica_)rac2: add misc vlog statements on transitions r=sumeerbhola a=kvoli

Part of: #130187
Release note: None

131286: go.mod: bump Pebble to 785dc8d817a4 r=RaduBerinde a=RaduBerinde

Changes:

 * [`785dc8d8`](cockroachdb/pebble@785dc8d8) sstable: refactor suffix-rewriting logic
 * [`5b8552f6`](cockroachdb/pebble@5b8552f6) db: modernize merging iterator tests
 * [`85602f46`](cockroachdb/pebble@85602f46) testutils: add indenttree
 * [`3831e2ba`](cockroachdb/pebble@3831e2ba) sstable: integrate columnar blocks into Reader
 * [`65c3ae12`](cockroachdb/pebble@65c3ae12) wal: improve reader_test log
 * [`29f8fea4`](cockroachdb/pebble@29f8fea4) colblk: implement block.DataBlockIterator
 * [`2138e806`](cockroachdb/pebble@2138e806) block: refactor FirstUserKey to CompareFirstUserKey
 * [`9d69d204`](cockroachdb/pebble@9d69d204) colblk: add NewKeyspanIter, object pooling
 * [`aba5868b`](cockroachdb/pebble@aba5868b) block: clarify the SyntheticPrefix IterTransform documentation
 * [`7348ce5f`](cockroachdb/pebble@7348ce5f) Makefile: bump crossversion-meta release branches
 * [`17c7a7ee`](cockroachdb/pebble@17c7a7ee) testkeys: fix assertion panic message

Release note: none.
Epic: none.

Co-authored-by: Austen McClernon <[email protected]>
Co-authored-by: Radu Berinde <[email protected]>
  • Loading branch information
@kvoli @RaduBerinde
3 people committed Sep 24, 2024
3 parents 311c0d5 + b2af1b6 + 170d5fb commit 56e2eb3
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1848,10 +1848,10 @@ def go_deps():
patches = [
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
],
sha256 = "95d5b020636d314f7fae6221a21afcee17ec5c1c55c368ec7d409ba238ffc5f6",
strip_prefix = "github.com/cockroachdb/[email protected]20240917211111-c826c0a21671",
sha256 = "23f265df2d72be18f8f4f7b770a1b893c323590f904dee8faa1343376aa5d195",
strip_prefix = "github.com/cockroachdb/[email protected]20240923205819-785dc8d817a4",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240917211111-c826c0a21671.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240923205819-785dc8d817a4.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240917211111-c826c0a21671.zip": "95d5b020636d314f7fae6221a21afcee17ec5c1c55c368ec7d409ba238ffc5f6",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240923205819-785dc8d817a4.zip": "23f265df2d72be18f8f4f7b770a1b893c323590f904dee8faa1343376aa5d195",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ require (
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
github.com/cockroachdb/gostdlib v1.19.0
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b
github.com/cockroachdb/pebble v0.0.0-20240917211111-c826c0a21671
github.com/cockroachdb/pebble v0.0.0-20240923205819-785dc8d817a4
github.com/cockroachdb/redact v1.1.5
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
github.com/cockroachdb/pebble v0.0.0-20240917211111-c826c0a21671 h1:CJrNNft8BOIke5WtJX0WzwSEq0GM0TaQbUozObb3veg=
github.com/cockroachdb/pebble v0.0.0-20240917211111-c826c0a21671/go.mod h1:LaF8D6p4Ko4EWprBmrcDs7FrmZYgDExF7dJyPvbq3Y4=
github.com/cockroachdb/pebble v0.0.0-20240923205819-785dc8d817a4 h1:oGsvcWxbx8fKwTOICX5g16XvXMAQ8YFAfsxxeHXbGrg=
github.com/cockroachdb/pebble v0.0.0-20240923205819-785dc8d817a4/go.mod h1:LaF8D6p4Ko4EWprBmrcDs7FrmZYgDExF7dJyPvbq3Y4=
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
Expand Down
2 changes: 2 additions & 0 deletions pkg/kv/kvserver/kvflowcontrol/rac2/range_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,8 @@ func (rss *replicaSendStream) closeLocked(ctx context.Context) {
}

func (rss *replicaSendStream) changeToProbeLocked(ctx context.Context, now time.Time) {
log.VEventf(ctx, 1, "r%v:%v stream %v changing to probe",
rss.parent.parent.opts.RangeID, rss.parent.desc, rss.parent.stream)
// This is the first time we've seen the replica change to StateProbe,
// update the connected state and start time. If the state doesn't
// change within probeRecentlyReplicateDuration, we will close the
Expand Down
1 change: 1 addition & 0 deletions pkg/kv/kvserver/kvflowcontrol/replica_rac2/processor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ func (p *processorImpl) SetEnabledWhenLeaderRaftMuLocked(
p.desc.replicas == nil {
return
}
log.VEventf(ctx, 1, "enabled v2 protocol using v1 priority encoding")
// May need to create RangeController.
var leaderID roachpb.ReplicaID
var term uint64
Expand Down

0 comments on commit 56e2eb3

Please sign in to comment.