Skip to content
2 changes: 1 addition & 1 deletion internal/idle/idle.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func (m *Manager) ExitIdleMode() error {
m.resetIdleTimerLocked(m.timeout)

if err != nil {
return fmt.Errorf("failed to exit idle mode: %w", err)
return fmt.Errorf("failed to exit idle mode: %v", err)
}
return nil
}
Expand Down
16 changes: 9 additions & 7 deletions resolver_balancer_ext_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func (s) TestResolverBuildFailure(t *testing.T) {

// Tests the case where the resolver reports an error to the channel before
// reporting an update. Verifies that the channel eventually moves to
// TransientFailure and a subsequent RPC returns the error reported by the
// TransientFailure and a subsequent RPCs returns the error reported by the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/ a / /

// resolver to the user.
func (s) TestResolverReportError(t *testing.T) {
const resolverErr = "test resolver error"
Expand All @@ -156,12 +156,14 @@ func (s) TestResolverReportError(t *testing.T) {
testutils.AwaitState(ctx, t, cc, connectivity.TransientFailure)

client := testgrpc.NewTestServiceClient(cc)
_, err = client.EmptyCall(ctx, &testpb.Empty{})
if code := status.Code(err); code != codes.Unavailable {
t.Fatalf("EmptyCall() = %v, want %v", err, codes.Unavailable)
}
if err == nil || !strings.Contains(err.Error(), resolverErr) {
t.Fatalf("EmptyCall() = %q, want %q", err, resolverErr)
for range 5 {
_, err = client.EmptyCall(ctx, &testpb.Empty{})
if code := status.Code(err); code != codes.Unavailable {
t.Fatalf("EmptyCall() = %v, want %v", err, codes.Unavailable)
}
if err == nil || !strings.Contains(err.Error(), resolverErr) {
t.Fatalf("EmptyCall() = %q, want %q", err, resolverErr)
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
// created for both streaming and unary RPCs, and hence is a good place to
// track active RPC count.
if err := cc.idlenessMgr.OnCallBegin(); err != nil {
return nil, err
return nil, status.Error(codes.Unavailable, err.Error())
}
// Add a calloption, to decrement the active call count, that gets executed
// when the RPC completes.
Expand Down