S2AStub uses withWaitForReady.

rmehta19 · rmehta19 · commit 655f0bd89362 · 2024-09-09T13:02:29.000-07:00
diff --git a/s2a/src/main/java/io/grpc/s2a/handshaker/S2AStub.java b/s2a/src/main/java/io/grpc/s2a/handshaker/S2AStub.java
@@ -142,7 +142,10 @@ public void close() {
   private void createWriterIfNull() {
     if (writer == null) {
       writer =
-          serviceStub.withDeadlineAfter(HANDSHAKE_RPC_DEADLINE_SECS, SECONDS).setUpSession(reader);
+          serviceStub
+              .withWaitForReady()
+              .withDeadlineAfter(HANDSHAKE_RPC_DEADLINE_SECS, SECONDS)
+              .setUpSession(reader);
     }
   }
 
diff --git a/s2a/src/test/java/io/grpc/s2a/handshaker/S2AStubTest.java b/s2a/src/test/java/io/grpc/s2a/handshaker/S2AStubTest.java
@@ -62,7 +62,7 @@ public void send_receiveOkStatus() throws Exception {
     IOException expected =
         assertThrows(IOException.class, () -> newStub.send(SessionReq.getDefaultInstance()));
 
-    assertThat(expected).hasMessageThat().contains("UNAVAILABLE");
+    assertThat(expected).hasMessageThat().contains("DEADLINE_EXCEEDED");
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,10 @@ public void close() {`
`142`	`142`	`private void createWriterIfNull() {`
`143`	`143`	`if (writer == null) {`
`144`	`144`	`writer =`
`145`		`- serviceStub.withDeadlineAfter(HANDSHAKE_RPC_DEADLINE_SECS, SECONDS).setUpSession(reader);`
	`145`	`+ serviceStub`
	`146`	`+ .withWaitForReady()`
	`147`	`+ .withDeadlineAfter(HANDSHAKE_RPC_DEADLINE_SECS, SECONDS)`
	`148`	`+ .setUpSession(reader);`
`146`	`149`	`}`
`147`	`150`	`}`
`148`	`151`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void send_receiveOkStatus() throws Exception {`
`62`	`62`	`IOException expected =`
`63`	`63`	`assertThrows(IOException.class, () -> newStub.send(SessionReq.getDefaultInstance()));`
`64`	`64`
`65`		`- assertThat(expected).hasMessageThat().contains("UNAVAILABLE");`
	`65`	`+ assertThat(expected).hasMessageThat().contains("DEADLINE_EXCEEDED");`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Test`