Skip to content

Commit 0a3ffc0

Browse files
committed
Review comments.
1 parent 1fdfa0b commit 0a3ffc0

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

rls/src/main/java/io/grpc/rls/CachingRlsLbClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ private CachingRlsLbClient(Builder builder) {
230230
// TODO(creamsoup) wait until lb is ready
231231
String defaultTarget = lbPolicyConfig.getRouteLookupConfig().defaultTarget();
232232
if (defaultTarget != null && !defaultTarget.isEmpty()) {
233-
logger.log(ChannelLogLevel.DEBUG, "starting fallback to {0}", defaultTarget);
234233
fallbackChildPolicyWrapper = refCountedChildPolicyWrapperFactory.createOrGet(defaultTarget);
235234
} else {
236235
fallbackChildPolicyWrapper = null;

rls/src/test/java/io/grpc/rls/CachingRlsLbClientTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ public void uncaughtException(Thread t, Throwable e) {
169169
private CachingRlsLbClient rlsLbClient;
170170
private Map<String, ?> rlsChannelServiceConfig;
171171
private String rlsChannelOverriddenAuthority;
172-
private boolean isAlreadyClosed = false;
173172

174173
private void setUpRlsLbClient() {
175174
fakeThrottler.resetCounts();
@@ -192,7 +191,7 @@ public void setUpMockMetricRecorder() {
192191

193192
@After
194193
public void tearDown() throws Exception {
195-
if (!isAlreadyClosed) {
194+
if (rlsLbClient != null) {
196195
rlsLbClient.close();
197196
}
198197
assertWithMessage(
@@ -704,8 +703,8 @@ public void metricGauges() throws ExecutionException, InterruptedException, Time
704703

705704
// Shutdown
706705
rlsLbClient.close();
706+
rlsLbClient = null;
707707
verify(mockGaugeRegistration).close();
708-
isAlreadyClosed = true;
709708
}
710709

711710
private static RouteLookupConfig getRouteLookupConfig() {

0 commit comments

Comments
 (0)