[xds_interop_client_rpc_metadata] unarycall also checks hostname from…

… response
grpc · Jul 22, 2020 · 5eff640 · 5eff640
1 parent 7bb7e8a
commit 5eff640
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/interop/xds/client/client.go b/interop/xds/client/client.go
@@ -243,19 +243,25 @@ func makeOneRPC(c testpb.TestServiceClient, cfg *rpcConfig) (*peer.Peer, *rpcInf
 	if len(cfg.md) != 0 {
 		ctx = metadata.NewOutgoingContext(ctx, cfg.md)
 	}
+	info := rpcInfo{typ: cfg.typ}
 
 	var err error
 	switch cfg.typ {
 	case unaryCall:
-		_, err = c.UnaryCall(ctx, &testpb.SimpleRequest{FillServerId: true}, grpc.Peer(&p), grpc.Header(&header))
+		var resp *testpb.SimpleResponse
+		resp, err = c.UnaryCall(ctx, &testpb.SimpleRequest{FillServerId: true}, grpc.Peer(&p), grpc.Header(&header))
+		// For UnaryCall, also read hostname from response, in case the server
+		// isn't updated to send headers.
+		if resp != nil {
+			info.hostname = resp.Hostname
+		}
 	case emptyCall:
 		_, err = c.EmptyCall(ctx, &testpb.Empty{}, grpc.Peer(&p), grpc.Header(&header))
 	}
 	if err != nil {
 		return nil, nil, err
 	}
 
-	info := rpcInfo{typ: cfg.typ}
 	hosts := header["hostname"]
 	if len(hosts) > 0 {
 		info.hostname = hosts[0]