Skip to content

Commit

Permalink
Merge #134922 #134943 #134954
Browse files Browse the repository at this point in the history 
134922: raft: don't step down to newer term while fortifying r=nvanbenschoten a=nvanbenschoten

Informs #132762.

This commit fixes a bug where a peer would step down to a newer term while fortifying a leader. This would break the leader fortification promise, which is critical for the leader lease disjointness property.

Instead, we now ignore the message as a follower and let the leader handle the process of stepping down, safely defortifying, and eventually stepping back up leader in the new term.

A subsequent commit will combine this logic with the other leader lease check for votes and pre-votes.

Release note: None

134943: go.mod: do not lie about googleproto version r=tbg a=tbg

It seems to "just work" after also upgrading `github.com/golang/protobuf`. The third commit optimistically upgrades `google.golang.org/protobuf` to the latest version v1.35.1.

Fixes #134941.

Epic: none

134954: kvserver/rangefeed: make r.disconnect a public method r=tbg,stevendanna a=wenyihu6

This patch renames `r.disconnect` to `r.Disconnect`, making it a public method. This
change allows other packages to call `r.Disconnect` at the node-level `MuxRangefeed`
in future commits.

Part of: #110432
Release note: none

Co-authored-by: Steven Danna [email protected]

Co-authored-by: Nathan VanBenschoten <[email protected]>
Co-authored-by: Tobias Grieger <[email protected]>
Co-authored-by: Wenyi Hu <[email protected]>
  • Loading branch information
@nvanbenschoten @tbg @wenyihu6
4 people committed Nov 12, 2024
4 parents 6d18a89 + eabb5cb + 76c1694 + fbb583d commit 096316f
Show file tree
Hide file tree
Showing 43 changed files with 1,383 additions and 204 deletions.
12 changes: 6 additions & 6 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3983,10 +3983,10 @@ def go_deps():
name = "com_github_golang_protobuf",
build_file_proto_mode = "disable_global",
importpath = "github.com/golang/protobuf",
sha256 = "93bda6e88d4a0a493a98b481de67a10000a755d15f16a800b49a6b96d1bd6f81",
strip_prefix = "github.com/golang/[email protected].3",
sha256 = "9a2f43d3eac8ceda506ebbeb4f229254b87235ce90346692a0e233614182190b",
strip_prefix = "github.com/golang/[email protected].4",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/protobuf/com_github_golang_protobuf-v1.5.3.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/protobuf/com_github_golang_protobuf-v1.5.4.zip",
],
)
go_repository(
Expand Down Expand Up @@ -11512,10 +11512,10 @@ def go_deps():
name = "org_golang_google_protobuf",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/protobuf",
sha256 = "08e7ac11587cc19448331b49e737c485911e472bad96bc5de3ae2021a0cb14d0",
strip_prefix = "google.golang.org/protobuf@v1.29.1",
sha256 = "5a27ed9bbe348c7435d91f699af976d0f7dc40c324542e4f41076a425d9e793e",
strip_prefix = "google.golang.org/protobuf@v1.35.1",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.29.1.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.1.zip",
],
)
go_repository(
Expand Down
4 changes: 2 additions & 2 deletions build/bazelutil/distdir_files.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/glog/com_github_golang_glog-v1.1.0.zip": "668beb5dd923378b00fda4ba0d965000f3f259be5ba05ebd341a2949e8f20db6",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/groupcache/com_github_golang_groupcache-v0.0.0-20210331224755-41bb18bfe9da.zip": "b27034e8fc013627543e1ad098cfc65329f2896df3da5cf3266cc9166f93f3a5",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/mock/com_github_golang_mock-v1.6.0.zip": "fa25916b546f90da49418f436e3a61e4c5dae898cf3c82b0007b5a6fab74261b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/protobuf/com_github_golang_protobuf-v1.5.3.zip": "93bda6e88d4a0a493a98b481de67a10000a755d15f16a800b49a6b96d1bd6f81",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/protobuf/com_github_golang_protobuf-v1.5.4.zip": "9a2f43d3eac8ceda506ebbeb4f229254b87235ce90346692a0e233614182190b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golang/snappy/com_github_golang_snappy-v0.0.5-0.20231225225746-43d5d4cd4e0e.zip": "a40a9145f6d7c1b2c356cf024f65e0f9cbf7efe2b89330ef4bb0763859b6fdc9",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/golangci/lint-1/com_github_golangci_lint_1-v0.0.0-20181222135242-d2cdd8c08219.zip": "2806ffd1a35b26a29b4cea86eb5ae421636b317e33e261fc1c20f9cf8fec2db5",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/gomodule/redigo/com_github_gomodule_redigo-v1.7.1-0.20190724094224-574c33c3df38.zip": "f665942b590c65e87284d681ea2784d0b9873c644756f4716a9972dc0d8e804e",
Expand Down Expand Up @@ -1117,7 +1117,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/cmd/protoc-gen-go-grpc/org_golang_google_grpc_cmd_protoc_gen_go_grpc-v1.1.0.zip": "13877d86cbfa30bde4d62fef2bc58dd56377dcb502c16cf78197f6934193009a",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/examples/org_golang_google_grpc_examples-v0.0.0-20210324172016-702608ffae4d.zip": "f5cad7b05a93557c91864a02890a35c6bc5c394897222978cff2b880a78f7a11",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.56.3.zip": "7f9b83cd9dbe99783061160583dae09dd8f64187d890c51be52cc8e3bd0dcb56",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.29.1.zip": "08e7ac11587cc19448331b49e737c485911e472bad96bc5de3ae2021a0cb14d0",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.35.1.zip": "5a27ed9bbe348c7435d91f699af976d0f7dc40c324542e4f41076a425d9e793e",
"https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/DataDog/dd-trace-go.v1/in_gopkg_datadog_dd_trace_go_v1-v1.17.0.zip": "2ebcc818df0b2d560a61037da4492ae7effbaed67de94339a1d3a72728d2cb09",
"https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/airbrake/gobrake.v2/in_gopkg_airbrake_gobrake_v2-v2.0.9.zip": "2db903664908e5a9afafefba94821b9579bbf271e2929c1f0b7b1fdd23f7bbcf",
"https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/alecthomas/kingpin.v2/in_gopkg_alecthomas_kingpin_v2-v2.2.6.zip": "638080591aefe7d2642f2575b627d534c692606f02ea54ba89f42db112ba8839",
Expand Down
6 changes: 2 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/golang/geo v0.0.0-20200319012246-673a6f80352d
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.3
github.com/golang/protobuf v1.5.4
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e
github.com/google/btree v1.0.1
github.com/google/pprof v0.0.0-20210827144239-02619b876842
github.com/google/uuid v1.5.0 // indirect
google.golang.org/api v0.114.0
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.33.0
google.golang.org/protobuf v1.35.1
)

// If any of the following dependencies get updated as a side-effect
Expand Down Expand Up @@ -483,5 +483,3 @@ replace gopkg.in/yaml.v2 => github.com/cockroachdb/yaml v0.0.0-20210825132133-2d
replace github.com/docker/docker => github.com/moby/moby v24.0.6+incompatible

replace golang.org/x/time => github.com/cockroachdb/x-time v0.3.1-0.20230525123634-71747adb5d5c

replace google.golang.org/protobuf => google.golang.org/protobuf v1.29.1
26 changes: 22 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1152,15 +1152,19 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
Expand Down Expand Up @@ -3170,8 +3174,22 @@ google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpX
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d h1:CJP00gEaaYNJuaTXEg456rWNC1oUOfiAiUjuwyAhEmM=
google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM=
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/DataDog/dd-trace-go.v1 v1.17.0/go.mod h1:DVp8HmDh8PuTu2Z0fVVlBsyWaC++fzwVCaGWylTe3tg=
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
Expand Down
6 changes: 3 additions & 3 deletions pkg/kv/kvserver/rangefeed/buffered_registration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ func (br *bufferedRegistration) publish(
}
}

// disconnect cancels the output loop context for the registration and passes an
// Disconnect cancels the output loop context for the registration and passes an
// error to the output error stream for the registration.
// Safe to run multiple times, but subsequent errors would be discarded.
func (br *bufferedRegistration) disconnect(pErr *kvpb.Error) {
func (br *bufferedRegistration) Disconnect(pErr *kvpb.Error) {
br.mu.Lock()
defer br.mu.Unlock()
if !br.mu.disconnected {
Expand Down Expand Up @@ -230,7 +230,7 @@ func (br *bufferedRegistration) runOutputLoop(ctx context.Context, _forStacks ro
ctx, br.mu.outputLoopCancelFn = context.WithCancel(ctx)
br.mu.Unlock()
err := br.outputLoop(ctx)
br.disconnect(kvpb.NewError(err))
br.Disconnect(kvpb.NewError(err))
}

// drainAllocations should be done after registration is disconnected from
Expand Down
6 changes: 3 additions & 3 deletions pkg/kv/kvserver/rangefeed/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ type registration interface {
// registration implementation to decide how to handle the event and how to
// prevent missing events.
publish(ctx context.Context, event *kvpb.RangeFeedEvent, alloc *SharedBudgetAllocation)
// disconnect disconnects the registration with the provided error. Safe to
// Disconnect disconnects the registration with the provided error. Safe to
// run multiple times, but subsequent errors would be discarded.
disconnect(pErr *kvpb.Error)
Disconnect(pErr *kvpb.Error)
// runOutputLoop runs the output loop for the registration. The output loop is
// meant to be run in a separate goroutine.
runOutputLoop(ctx context.Context, forStacks roachpb.RangeID)
Expand Down Expand Up @@ -380,7 +380,7 @@ func (reg *registry) forOverlappingRegs(
r := i.(registration)
dis, pErr := fn(r)
if dis {
r.disconnect(pErr)
r.Disconnect(pErr)
toDelete = append(toDelete, i)
}
return false
Expand Down
24 changes: 12 additions & 12 deletions pkg/kv/kvserver/rangefeed/registry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestRegistrationBasic(t *testing.T) {
go noCatchupReg.runOutputLoop(ctx, 0)
require.NoError(t, noCatchupReg.waitForCaughtUp(ctx))
require.Equal(t, []*kvpb.RangeFeedEvent{ev1, ev2}, noCatchupReg.GetAndClearEvents())
noCatchupReg.disconnect(nil)
noCatchupReg.Disconnect(nil)

// Registration with catchup scan.
catchupReg := newTestRegistration(spBC, hlc.Timestamp{WallTime: 1},
Expand All @@ -56,7 +56,7 @@ func TestRegistrationBasic(t *testing.T) {
events := catchupReg.GetAndClearEvents()
require.Equal(t, 5, len(events))
require.Equal(t, []*kvpb.RangeFeedEvent{ev1, ev2}, events[3:])
catchupReg.disconnect(nil)
catchupReg.Disconnect(nil)

// EXIT CONDITIONS
// External Disconnect.
Expand All @@ -67,7 +67,7 @@ func TestRegistrationBasic(t *testing.T) {
go disconnectReg.runOutputLoop(ctx, 0)
require.NoError(t, disconnectReg.waitForCaughtUp(ctx))
discErr := kvpb.NewError(fmt.Errorf("disconnection error"))
disconnectReg.disconnect(discErr)
disconnectReg.Disconnect(discErr)
require.Equal(t, discErr.GoError(), disconnectReg.WaitForError(t))
require.Equal(t, 2, len(disconnectReg.GetAndClearEvents()))

Expand All @@ -76,7 +76,7 @@ func TestRegistrationBasic(t *testing.T) {
false /* withDiff */, false /* withFiltering */, false /* withOmitRemote */)
disconnectEarlyReg.publish(ctx, ev1, nil /* alloc */)
disconnectEarlyReg.publish(ctx, ev2, nil /* alloc */)
disconnectEarlyReg.disconnect(discErr)
disconnectEarlyReg.Disconnect(discErr)
go disconnectEarlyReg.runOutputLoop(ctx, 0)
require.Equal(t, discErr.GoError(), disconnectEarlyReg.WaitForError(t))
require.Equal(t, 0, len(disconnectEarlyReg.GetAndClearEvents()))
Expand Down Expand Up @@ -156,8 +156,8 @@ func TestRegistryWithOmitOrigin(t *testing.T) {
go rAC.runOutputLoop(ctx, 0)
go originFiltering.runOutputLoop(ctx, 0)

defer rAC.disconnect(nil)
defer originFiltering.disconnect(nil)
defer rAC.Disconnect(nil)
defer originFiltering.Disconnect(nil)

reg.Register(ctx, rAC.bufferedRegistration)
reg.Register(ctx, originFiltering.bufferedRegistration)
Expand Down Expand Up @@ -208,11 +208,11 @@ func TestRegistryBasic(t *testing.T) {
go rCD.runOutputLoop(ctx, 0)
go rAC.runOutputLoop(ctx, 0)
go rACFiltering.runOutputLoop(ctx, 0)
defer rAB.disconnect(nil)
defer rBC.disconnect(nil)
defer rCD.disconnect(nil)
defer rAC.disconnect(nil)
defer rACFiltering.disconnect(nil)
defer rAB.Disconnect(nil)
defer rBC.Disconnect(nil)
defer rCD.Disconnect(nil)
defer rAC.Disconnect(nil)
defer rACFiltering.Disconnect(nil)

// Register 6 registrations.
reg.Register(ctx, rAB.bufferedRegistration)
Expand Down Expand Up @@ -355,7 +355,7 @@ func TestRegistryPublishBeneathStartTimestamp(t *testing.T) {
require.NoError(t, reg.waitForCaughtUp(ctx, all))
require.Equal(t, []*kvpb.RangeFeedEvent{ev}, r.GetAndClearEvents())

r.disconnect(nil)
r.Disconnect(nil)
}

func TestRegistrationString(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/rangefeed/scheduled_processor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ func (p *ScheduledProcessor) Register(
// If we can't schedule internally, processor is already stopped which
// could only happen on shutdown. Disconnect stream and just remove
// registration.
r.disconnect(kvpb.NewError(err))
r.Disconnect(kvpb.NewError(err))
p.reg.Unregister(ctx, r)
}
return f
Expand Down
1 change: 1 addition & 0 deletions pkg/raft/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ go_test(
"//pkg/raft/tracker",
"//pkg/settings/cluster",
"//pkg/testutils",
"//pkg/util/hlc",
"@com_github_cockroachdb_datadriven//:datadriven",
"@com_github_stretchr_testify//assert",
"@com_github_stretchr_testify//require",
Expand Down
Loading

0 comments on commit 096316f

Please sign in to comment.