Skip to content

release-25.1: kvserver: skip test on failed re-listen #146546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release-25.1
Choose a base branch
from
Open

release-25.1: kvserver: skip test on failed re-listen #146546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pkg/kv/kvserver/raft_transport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/rpc/nodedialer"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/util"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
Expand Down Expand Up @@ -111,6 +112,8 @@ type raftTransportTestContext struct {
nodeRPCContext *rpc.Context
gossip *gossip.Gossip
st *cluster.Settings

skipOnListenErr bool // if true, calls Skip on error from net.Listen
}

// clockWithManualSource is a pair of clocks: a manual clock and a clock that
Expand Down Expand Up @@ -202,8 +205,12 @@ func (rttc *raftTransportTestContext) AddNodeWithoutGossip(
knobs,
)
rttc.transports[nodeID] = transport
ln, err := netutil.ListenAndServeGRPC(stopper, grpcServer, addr)
ln, err := net.Listen(addr.Network(), addr.String())
if err != nil && rttc.skipOnListenErr {
skip.IgnoreLintf(rttc.t, "skipping test due to listen error: %s", err)
}
require.NoError(rttc.t, err)
require.NoError(rttc.t, netutil.ServeGRPC(stopper, grpcServer, ln))
return transport, ln.Addr()
}

Expand Down Expand Up @@ -577,6 +584,11 @@ func TestReopenConnection(t *testing.T) {
StoreID: 2,
ReplicaID: 2,
}

// We're re-listening on an old address here, but the port may be
// in use. In the very rare case of this happening, skip the test.
// See: https://github.com/cockroachdb/cockroach/issues/146175.
rttc.skipOnListenErr = true
serverTransport, serverAddr :=
rttc.AddNodeWithoutGossip(
serverReplica.NodeID,
Expand Down
15 changes: 9 additions & 6 deletions pkg/util/netutil/net.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ func ListenAndServeGRPC(
if err != nil {
return ln, err
}
if err := ServeGRPC(stopper, server, ln); err != nil {
return nil, err
}
return ln, nil
}

func ServeGRPC(stopper *stop.Stopper, server *grpc.Server, ln net.Listener) error {
ctx := context.TODO()

stopper.AddCloser(stop.CloserFn(server.Stop))
Expand All @@ -44,15 +50,12 @@ func ListenAndServeGRPC(
}
if err := stopper.RunAsyncTask(ctx, "listen-quiesce", waitQuiesce); err != nil {
waitQuiesce(ctx)
return nil, err
return err
}

if err := stopper.RunAsyncTask(ctx, "serve", func(context.Context) {
return stopper.RunAsyncTask(ctx, "serve", func(context.Context) {
FatalIfUnexpected(server.Serve(ln))
}); err != nil {
return nil, err
}
return ln, nil
})
}

var httpLogger = log.NewStdLogger(severity.ERROR, "net/http")
Expand Down