From e2c166e0591e10c2308adf687c6542b14a4a3b3b Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Wed, 29 Jan 2025 09:05:16 -0800 Subject: [PATCH] [XdsInteropClient] Remove incorrect behavior around keep-open (#38613) Based on the [spec](https://github.com/grpc/grpc/blob/master/doc/xds-test-descriptions.md#server) and the [reference Java implementation](https://github.com/grpc/grpc-java/blob/master/interop-testing/src/main/java/io/grpc/testing/integration/XdsTestClient.java), it's the server that needs to honor the "keep-open" behavior and not the client. (I'm not changing the server's behavior in this PR, since we are not using C++ servers and instead using Java servers for the concerned tests.) Closes #38613 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/38613 from yashykt:FixXdsInteropClientBehavior 99556ba8f7d3e5481750fb91eee9683d838cf182 PiperOrigin-RevId: 720999079 --- test/cpp/interop/xds_interop_client.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/test/cpp/interop/xds_interop_client.cc b/test/cpp/interop/xds_interop_client.cc index c76aac186e0ff..33b2221c48794 100644 --- a/test/cpp/interop/xds_interop_client.cc +++ b/test/cpp/interop/xds_interop_client.cc @@ -158,11 +158,6 @@ class TestClient { AsyncClientCall* call = new AsyncClientCall; for (const auto& data : config.metadata) { call->context.AddMetadata(data.first, data.second); - // TODO(@donnadionne): move deadline to separate proto. - if (data.first == "rpc-behavior" && data.second == "keep-open") { - deadline = - std::chrono::system_clock::now() + std::chrono::seconds(INT_MAX); - } } SimpleRequest request; request.set_response_size(config.response_payload_size); @@ -197,11 +192,6 @@ class TestClient { AsyncClientCall* call = new AsyncClientCall; for (const auto& data : config.metadata) { call->context.AddMetadata(data.first, data.second); - // TODO(@donnadionne): move deadline to separate proto. - if (data.first == "rpc-behavior" && data.second == "keep-open") { - deadline = - std::chrono::system_clock::now() + std::chrono::seconds(INT_MAX); - } } call->context.set_deadline(deadline); call->result.saved_request_id = saved_request_id;