Fix build after rebase.

Author: zhangkun83

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

@@ -57,9 +57,8 @@
  * Transports for a single {@link SocketAddress}.
  */
 @ThreadSafe
-final class TransportSet {
+final class TransportSet implements WithLogId {
   private static final Logger log = Logger.getLogger(TransportSet.class.getName());
-
   private static final ClientTransport SHUTDOWN_TRANSPORT =
       new FailingClientTransport(Status.UNAVAILABLE.withDescription("TransportSet is shutdown"));
 
@@ -192,7 +191,10 @@ public void run() {
           }
           ManagedClientTransport transport =
               transportFactory.newClientTransport(address, authority);
-          log.log(Level.FINE, "Created transport {0} for {1}", new Object[] {transport, address});
+          if (log.isLoggable(Level.FINE)) {
+            log.log(Level.FINE, "[{0}] Created {1} for {2}",
+                new Object[] {getLogId(), transport.getLogId(), address});
+          }
           transports.add(transport);
           transport.start(new TransportListener(transport, delayedTransport, address));
         }
@@ -211,6 +213,10 @@ public void run() {
       }
     }
     firstAttempt = false;
+    if (log.isLoggable(Level.FINE)) {
+      log.log(Level.FINE, "[{0}] Scheduling connection after {1} ms for {2}",
+          new Object[]{getLogId(), delayMillis, address});
+    }
     if (delayMillis <= 0) {
       reconnectTask = null;
       // No back-off this time.
@@ -257,6 +263,11 @@ private void cancelReconnectTask() {
     }
   }
 
+  @Override
+  public String getLogId() {
+    return GrpcUtil.getLogId(this);
+  }
+
   /** Shared base for both delayed and real transports. */
   private class BaseTransportListener implements ManagedClientTransport.Listener {
     protected final ManagedClientTransport transport;
@@ -277,6 +288,9 @@ public void transportTerminated() {
       synchronized (lock) {
         transports.remove(transport);
         if (shutdown && transports.isEmpty()) {
+          if (log.isLoggable(Level.FINE)) {
+            log.log(Level.FINE, "[{0}] Terminated", getLogId());
+          }
           runCallback = true;
           cancelReconnectTask();
         }
@@ -301,7 +315,10 @@ public TransportListener(ManagedClientTransport transport,
 
     @Override
     public void transportReady() {
-      log.log(Level.FINE, "Transport {0} for {1} is ready", new Object[] {transport, address});
+      if (log.isLoggable(Level.FINE)) {
+        log.log(Level.FINE, "[{0}] {1} for {2} is ready",
+            new Object[] {getLogId(), transport.getLogId(), address});
+      }
       super.transportReady();
       boolean savedShutdown;
       synchronized (lock) {
@@ -330,8 +347,10 @@ public void transportReady() {
 
     @Override
     public void transportShutdown(Status s) {
-      log.log(Level.FINE, "Transport {0} for {1} is being shutdown with {2}",
-          new Object[] {transport, address, s});
+      if (log.isLoggable(Level.FINE)) {
+        log.log(Level.FINE, "[{0}] {1} for {2} is being shutdown with status {3}",
+            new Object[] {getLogId(), transport.getLogId(), address, s});
+      }
       super.transportShutdown(s);
       synchronized (lock) {
         if (activeTransport == transport) {
@@ -353,8 +372,10 @@ public void transportShutdown(Status s) {
 
     @Override
     public void transportTerminated() {
-      log.log(Level.FINE, "Transport {0} for {1} is terminated",
-          new Object[] {transport, address});
+      if (log.isLoggable(Level.FINE)) {
+        log.log(Level.FINE, "[{0}] {1} for {2} is terminated",
+            new Object[] {getLogId(), transport.getLogId(), address});
+      }
       super.transportTerminated();
       Preconditions.checkState(activeTransport != transport,
           "activeTransport still points to the delayedTransport. "

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

@@ -200,7 +200,6 @@ public void twoCallsAndGracefulShutdown() {
     transportListener.transportReady();
     verify(mockTransport, timeout(1000)).newStream(same(method), same(headers));
     verify(mockStream).start(streamListenerCaptor.capture());
-    verify(mockStream).setMessageCompression(anyBoolean());
     verify(mockStream).setCompressor(isA(Compressor.class));
     // Depends on how quick the real transport is created, ClientCallImpl may start on mockStream
     // directly, or on a DelayedStream which later starts mockStream. In the former case,

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

@@ -165,13 +165,12 @@ public void createAndReuseTransport() throws Exception {
     ClientTransport t1 = tm.getTransport(addressGroup);
     verify(mockTransportFactory, timeout(1000)).newClientTransport(addr, authority);
     // The real transport
-    ClientTransport rt = transports.poll(1, TimeUnit.SECONDS).transport;
+    MockClientTransportInfo transportInfo = transports.poll(1, TimeUnit.SECONDS);
+    transportInfo.listener.transportReady();
     ClientTransport t2 = tm.getTransport(addressGroup);
-    // Make sure the first transport is always a real transport. This promise is especially made for
-    // InProcessTransport, because it may run into deadlock if it works under a delayed transport
-    // (https://github.com/grpc/grpc-java/issues/1510).
-    assertSame(rt, t1);
-    assertSame(rt, t2);
+    assertTrue(t1 instanceof DelayedClientTransport);
+    assertFalse(t2 instanceof DelayedClientTransport);
+    assertSame(transportInfo.transport, t2);
     verify(mockBackoffPolicyProvider).get();
     verify(mockBackoffPolicy, times(0)).nextBackoffMillis();
     verifyNoMoreInteractions(mockTransportFactory);