Skip to content

Commit f79ab2f

Browse files
committed
api: Remove deprecated SubchannelPicker.requestConnection()
It has been deprecated since cec9ee3, six years ago. It was replaced with LoadBalancer.requestConnection().
1 parent a6aec27 commit f79ab2f

File tree

4 files changed

+1
-30
lines changed

4 files changed

+1
-30
lines changed

api/src/main/java/io/grpc/LoadBalancer.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -452,18 +452,6 @@ public abstract static class SubchannelPicker {
452452
* @since 1.3.0
453453
*/
454454
public abstract PickResult pickSubchannel(PickSubchannelArgs args);
455-
456-
/**
457-
* Tries to establish connections now so that the upcoming RPC may then just pick a ready
458-
* connection without having to connect first.
459-
*
460-
* <p>No-op if unsupported.
461-
*
462-
* @deprecated override {@link LoadBalancer#requestConnection} instead.
463-
* @since 1.11.0
464-
*/
465-
@Deprecated
466-
public void requestConnection() {}
467455
}
468456

469457
/**

core/src/main/java/io/grpc/internal/ManagedChannelImpl.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,6 @@ public void uncaughtException(Thread t, Throwable e) {
228228
@Nullable
229229
private LbHelperImpl lbHelper;
230230

231-
// Must ONLY be assigned from updateSubchannelPicker(), which is called from syncContext.
232-
// null if channel is in idle mode.
233-
@Nullable
234-
private volatile SubchannelPicker subchannelPicker;
235-
236231
// Must be accessed from the syncContext
237232
private boolean panicMode;
238233

@@ -259,8 +254,7 @@ public void uncaughtException(Thread t, Throwable e) {
259254
// Channel's shutdown process:
260255
// 1. shutdown(): stop accepting new calls from applications
261256
// 1a shutdown <- true
262-
// 1b subchannelPicker <- null
263-
// 1c delayedTransport.shutdown()
257+
// 1b delayedTransport.shutdown()
264258
// 2. delayedTransport terminated: stop stream-creation functionality
265259
// 2a terminating <- true
266260
// 2b loadBalancer.shutdown()
@@ -393,7 +387,6 @@ private void shutdownNameResolverAndLoadBalancer(boolean channelIsActive) {
393387
lbHelper.lb.shutdown();
394388
lbHelper = null;
395389
}
396-
subchannelPicker = null;
397390
}
398391

399392
/**
@@ -804,7 +797,6 @@ boolean isInPanicMode() {
804797

805798
// Called from syncContext
806799
private void updateSubchannelPicker(SubchannelPicker newPicker) {
807-
subchannelPicker = newPicker;
808800
delayedTransport.reprocess(newPicker);
809801
}
810802

@@ -1228,9 +1220,6 @@ final class RequestConnection implements Runnable {
12281220
@Override
12291221
public void run() {
12301222
exitIdleMode();
1231-
if (subchannelPicker != null) {
1232-
subchannelPicker.requestConnection();
1233-
}
12341223
if (lbHelper != null) {
12351224
lbHelper.lb.requestConnection();
12361225
}

core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2590,7 +2590,6 @@ public void getState_withRequestConnect_IdleWithLbRunning() {
25902590

25912591
assertEquals(IDLE, channel.getState(true));
25922592
verify(mockLoadBalancerProvider).newLoadBalancer(any(Helper.class));
2593-
verify(mockPicker).requestConnection();
25942593
verify(mockLoadBalancer).requestConnection();
25952594
}
25962595

xds/src/main/java/io/grpc/xds/LazyLoadBalancer.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@ public PickResult pickSubchannel(PickSubchannelArgs args) {
107107
helper.getSynchronizationContext().execute(LazyDelegate.this::activate);
108108
return PickResult.withNoResult();
109109
}
110-
111-
@Override
112-
public void requestConnection() {
113-
helper.getSynchronizationContext().execute(LazyDelegate.this::requestConnection);
114-
}
115110
}
116111
}
117112

0 commit comments

Comments
 (0)