[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - GPR_ASSERT (#36222)

Replacing GPR_ASSERT with absl CHECK

Will not be replacing CHECK with CHECK_EQ , CHECK_NE etc because there are too many callsites.

This could be done using Cider-V once these changes are submitted if we want to clean up later. Given that we have 4000+ instances of GPR_ASSERT to edit, Doing it manually is too much work for both the author and reviewer.

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #36222

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36222 from tanvi-jagtap:assert_interop adcc660e78
PiperOrigin-RevId: 623366969
pull/36270/head
Tanvi Jagtap 10 months ago committed by Copybara-Service
parent ece2c4dbaa
commit 259f0e7903
  1. 5
      CMakeLists.txt
  2. 5
      build_autogenerated.yaml
  3. 16
      test/cpp/interop/BUILD
  4. 3
      test/cpp/interop/backend_metrics_lb_policy.cc
  5. 3
      test/cpp/interop/client_helper.cc
  6. 18
      test/cpp/interop/grpclb_fallback_test.cc
  7. 24
      test/cpp/interop/http2_client.cc
  8. 158
      test/cpp/interop/interop_client.cc
  9. 7
      test/cpp/interop/interop_server.cc
  10. 13
      test/cpp/interop/reconnect_interop_client.cc
  11. 5
      test/cpp/interop/reconnect_interop_server.cc
  12. 3
      test/cpp/interop/rpc_behavior_lb_policy.cc
  13. 3
      test/cpp/interop/stress_interop_client.cc
  14. 3
      test/cpp/interop/stress_test.cc
  15. 7
      test/cpp/interop/xds_federation_client.cc
  16. 27
      test/cpp/interop/xds_interop_client.cc
  17. 3
      test/cpp/interop/xds_stats_watcher.cc

5
CMakeLists.txt generated

@ -7453,6 +7453,7 @@ target_include_directories(backend_metrics_lb_policy_test
target_link_libraries(backend_metrics_lb_policy_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc++
grpc_test_util
grpc++_test_config
@ -17013,6 +17014,7 @@ target_include_directories(http2_client
target_link_libraries(http2_client
${_gRPC_ALLTARGETS_LIBRARIES}
absl::check
grpc++_test_config
grpc++_test_util
)
@ -17851,6 +17853,7 @@ target_include_directories(interop_client
target_link_libraries(interop_client
${_gRPC_ALLTARGETS_LIBRARIES}
absl::check
grpc++_test_config
grpc++_test_util
)
@ -17905,6 +17908,7 @@ target_include_directories(interop_server
target_link_libraries(interop_server
${_gRPC_ALLTARGETS_LIBRARIES}
absl::check
grpc++_test_config
grpc++_test_util
)
@ -36388,6 +36392,7 @@ target_include_directories(xds_stats_watcher_test
target_link_libraries(xds_stats_watcher_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc++_reflection
grpcpp_channelz
grpc_test_util

@ -5793,6 +5793,7 @@ targets:
- test/cpp/interop/backend_metrics_lb_policy_test.cc
deps:
- gtest
- absl/log:check
- grpc++
- grpc_test_util
- grpc++_test_config
@ -11285,6 +11286,7 @@ targets:
- src/proto/grpc/testing/test.proto
- test/cpp/interop/http2_client.cc
deps:
- absl/log:check
- grpc++_test_config
- grpc++_test_util
- name: http2_settings_test
@ -11748,6 +11750,7 @@ targets:
- test/cpp/interop/client_helper.cc
- test/cpp/interop/interop_client.cc
deps:
- absl/log:check
- grpc++_test_config
- grpc++_test_util
- name: interop_server
@ -11765,6 +11768,7 @@ targets:
- test/cpp/interop/interop_server_bootstrap.cc
- test/cpp/interop/server_helper.cc
deps:
- absl/log:check
- grpc++_test_config
- grpc++_test_util
- name: invalid_call_argument_test
@ -21579,6 +21583,7 @@ targets:
- test/cpp/interop/xds_stats_watcher_test.cc
deps:
- gtest
- absl/log:check
- grpc++_reflection
- grpcpp_channelz
- grpc_test_util

@ -45,6 +45,7 @@ grpc_cc_binary(
],
external_deps = [
"absl/flags:flag",
"absl/log:check",
"absl/time:time",
],
language = "C++",
@ -66,6 +67,7 @@ grpc_cc_binary(
],
external_deps = [
"absl/flags:flag",
"absl/log:check",
],
language = "C++",
deps = [
@ -80,6 +82,9 @@ grpc_cc_library(
srcs = [
"interop_server.cc",
],
external_deps = [
"absl/log:check",
],
language = "C++",
deps = [
":server_helper_lib",
@ -103,6 +108,7 @@ grpc_cc_library(
],
external_deps = [
"absl/flags:flag",
"absl/log:check",
],
language = "C++",
deps = [
@ -161,6 +167,7 @@ grpc_cc_binary(
],
external_deps = [
"absl/flags:flag",
"absl/log:check",
],
deps = [
":client_helper_lib",
@ -176,6 +183,7 @@ grpc_cc_binary(
],
external_deps = [
"absl/flags:flag",
"absl/log:check",
],
language = "C++",
deps = [
@ -194,6 +202,7 @@ grpc_cc_binary(
],
external_deps = [
"absl/flags:flag",
"absl/log:check",
],
deps = [
":client_helper_lib",
@ -239,6 +248,9 @@ grpc_cc_library(
name = "xds_stats_watcher",
srcs = ["xds_stats_watcher.cc"],
hdrs = ["xds_stats_watcher.h"],
external_deps = [
"absl/log:check",
],
deps = [
":rpc_behavior_lb_policy",
"//:grpc++",
@ -413,6 +425,7 @@ grpc_cc_binary(
],
external_deps = [
"absl/flags:flag",
"absl/log:check",
],
deps = [
"//:grpc++",
@ -432,6 +445,7 @@ grpc_cc_binary(
],
external_deps = [
"absl/flags:flag",
"absl/log:check",
],
language = "C++",
deps = [
@ -522,6 +536,7 @@ grpc_cc_library(
"backend_metrics_lb_policy.h",
],
external_deps = [
"absl/log:check",
],
language = "C++",
tags = ["nobuilder"],
@ -557,6 +572,7 @@ grpc_cc_library(
"rpc_behavior_lb_policy.h",
],
external_deps = [
"absl/log:check",
],
language = "C++",
tags = ["nobuilder"],

@ -18,6 +18,7 @@
#include "test/cpp/interop/backend_metrics_lb_policy.h"
#include "absl/log/check.h"
#include "absl/strings/str_format.h"
#include <grpc/support/port_platform.h>
@ -66,7 +67,7 @@ class BackendMetricsLbPolicy : public LoadBalancingPolicy {
: LoadBalancingPolicy(std::move(args), /*initial_refcount=*/2) {
load_report_tracker_ =
channel_args().GetPointer<LoadReportTracker>(kMetricsTrackerArgument);
GPR_ASSERT(load_report_tracker_ != nullptr);
CHECK(load_report_tracker_ != nullptr);
Args delegate_args;
delegate_args.work_serializer = work_serializer();
delegate_args.args = channel_args();

@ -24,6 +24,7 @@
#include "absl/flags/declare.h"
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include "absl/strings/escaping.h"
#include "absl/strings/match.h"
@ -67,7 +68,7 @@ std::string GetServiceAccountJsonKey() {
std::string GetOauth2AccessToken() {
std::shared_ptr<CallCredentials> creds = GoogleComputeEngineCredentials();
char* token = grpc_test_fetch_oauth2_token_with_credentials(creds->c_creds_);
GPR_ASSERT(token != nullptr);
CHECK_NE(token, nullptr);
gpr_log(GPR_INFO, "Get raw oauth2 access token: %s", token);
std::string access_token(token + sizeof("Bearer ") - 1);
gpr_free(token);

@ -31,6 +31,7 @@
#include <thread>
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include "absl/strings/str_format.h"
#include "absl/time/time.h"
@ -104,10 +105,10 @@ GrpclbRouteType DoRPCAndGetPath(TestService::Stub* stub, int deadline_seconds,
s.error_message().c_str());
return GrpclbRouteType::GRPCLB_ROUTE_TYPE_UNKNOWN;
}
GPR_ASSERT(response.grpclb_route_type() ==
GrpclbRouteType::GRPCLB_ROUTE_TYPE_BACKEND ||
response.grpclb_route_type() ==
GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK);
CHECK(response.grpclb_route_type() ==
GrpclbRouteType::GRPCLB_ROUTE_TYPE_BACKEND ||
response.grpclb_route_type() ==
GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK);
gpr_log(GPR_INFO, "DoRPCAndGetPath done. grpclb_route_type:%d",
response.grpclb_route_type());
return response.grpclb_route_type();
@ -187,7 +188,7 @@ void WaitForFallbackAndDoRPCs(TestService::Stub* stub) {
gpr_log(GPR_ERROR,
"Got grpclb route type backend. Backends are "
"supposed to be unreachable, so this test is broken");
GPR_ASSERT(0);
CHECK(0);
}
if (grpclb_route_type == GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK) {
gpr_log(GPR_INFO,
@ -203,12 +204,11 @@ void WaitForFallbackAndDoRPCs(TestService::Stub* stub) {
}
if (!fallback) {
gpr_log(GPR_ERROR, "Didn't fall back within deadline");
GPR_ASSERT(0);
CHECK(0);
}
for (int i = 0; i < 30; i++) {
GrpclbRouteType grpclb_route_type = DoRPCAndGetPath(stub, 20);
GPR_ASSERT(grpclb_route_type ==
GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK);
CHECK(grpclb_route_type == GrpclbRouteType::GRPCLB_ROUTE_TYPE_FALLBACK);
std::this_thread::sleep_for(std::chrono::seconds(1));
}
}
@ -222,7 +222,7 @@ void DoFallbackBeforeStartupTest() {
void DoFallbackAfterStartupTest() {
std::unique_ptr<TestService::Stub> stub = CreateFallbackTestStub();
GrpclbRouteType grpclb_route_type = DoRPCAndGetPath(stub.get(), 20);
GPR_ASSERT(grpclb_route_type == GrpclbRouteType::GRPCLB_ROUTE_TYPE_BACKEND);
CHECK(grpclb_route_type == GrpclbRouteType::GRPCLB_ROUTE_TYPE_BACKEND);
RunCommand(absl::GetFlag(FLAGS_induce_fallback_cmd));
WaitForFallbackAndDoRPCs(stub.get());
}

@ -21,6 +21,7 @@
#include <thread>
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include "absl/strings/str_format.h"
#include <grpc/support/alloc.h>
@ -84,7 +85,7 @@ bool Http2Client::DoRstAfterHeader() {
SimpleResponse response;
AssertStatusCode(SendUnaryCall(&response), grpc::StatusCode::INTERNAL);
GPR_ASSERT(!response.has_payload()); // no data should be received
CHECK(!response.has_payload()); // no data should be received
gpr_log(GPR_DEBUG, "Done testing reset stream after header");
return true;
@ -106,7 +107,7 @@ bool Http2Client::DoRstDuringData() {
SimpleResponse response;
AssertStatusCode(SendUnaryCall(&response), grpc::StatusCode::INTERNAL);
GPR_ASSERT(!response.has_payload()); // no data should be received
CHECK(!response.has_payload()); // no data should be received
gpr_log(GPR_DEBUG, "Done testing reset stream during data");
return true;
@ -116,8 +117,7 @@ bool Http2Client::DoGoaway() {
gpr_log(GPR_DEBUG, "Sending two RPCs and expecting goaway");
SimpleResponse response;
AssertStatusCode(SendUnaryCall(&response), grpc::StatusCode::OK);
GPR_ASSERT(response.payload().body() ==
std::string(kLargeResponseSize, '\0'));
CHECK(response.payload().body() == std::string(kLargeResponseSize, '\0'));
// Sleep for one second to give time for client to receive goaway frame.
gpr_timespec sleep_time = gpr_time_add(
@ -126,8 +126,7 @@ bool Http2Client::DoGoaway() {
response.Clear();
AssertStatusCode(SendUnaryCall(&response), grpc::StatusCode::OK);
GPR_ASSERT(response.payload().body() ==
std::string(kLargeResponseSize, '\0'));
CHECK(response.payload().body() == std::string(kLargeResponseSize, '\0'));
gpr_log(GPR_DEBUG, "Done testing goaway");
return true;
}
@ -136,8 +135,7 @@ bool Http2Client::DoPing() {
gpr_log(GPR_DEBUG, "Sending RPC and expecting ping");
SimpleResponse response;
AssertStatusCode(SendUnaryCall(&response), grpc::StatusCode::OK);
GPR_ASSERT(response.payload().body() ==
std::string(kLargeResponseSize, '\0'));
CHECK(response.payload().body() == std::string(kLargeResponseSize, '\0'));
gpr_log(GPR_DEBUG, "Done testing ping");
return true;
}
@ -146,8 +144,7 @@ void Http2Client::MaxStreamsWorker(
const std::shared_ptr<grpc::Channel>& /*channel*/) {
SimpleResponse response;
AssertStatusCode(SendUnaryCall(&response), grpc::StatusCode::OK);
GPR_ASSERT(response.payload().body() ==
std::string(kLargeResponseSize, '\0'));
CHECK(response.payload().body() == std::string(kLargeResponseSize, '\0'));
}
bool Http2Client::DoMaxStreams() {
@ -157,8 +154,7 @@ bool Http2Client::DoMaxStreams() {
// setting is received
SimpleResponse response;
AssertStatusCode(SendUnaryCall(&response), grpc::StatusCode::OK);
GPR_ASSERT(response.payload().body() ==
std::string(kLargeResponseSize, '\0'));
CHECK(response.payload().body() == std::string(kLargeResponseSize, '\0'));
std::vector<std::thread> test_threads;
test_threads.reserve(10);
@ -191,7 +187,7 @@ ABSL_FLAG(std::string, test_case, "rst_after_header",
int main(int argc, char** argv) {
grpc::testing::InitTest(&argc, &argv, true);
GPR_ASSERT(absl::GetFlag(FLAGS_server_port));
CHECK(absl::GetFlag(FLAGS_server_port));
const int host_port_buf_size = 1024;
char host_port[host_port_buf_size];
snprintf(host_port, host_port_buf_size, "%s:%d",
@ -199,7 +195,7 @@ int main(int argc, char** argv) {
absl::GetFlag(FLAGS_server_port));
std::shared_ptr<grpc::Channel> channel =
grpc::CreateTestChannel(host_port, grpc::testing::INSECURE);
GPR_ASSERT(channel->WaitForConnected(gpr_time_add(
CHECK(channel->WaitForConnected(gpr_time_add(
gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(300, GPR_TIMESPAN))));
grpc::testing::Http2Client client(channel);
gpr_log(GPR_INFO, "Testing case: %s", absl::GetFlag(FLAGS_test_case).c_str());

@ -26,6 +26,7 @@
#include <utility>
#include "absl/cleanup/cleanup.h"
#include "absl/log/check.h"
#include "absl/strings/match.h"
#include "absl/strings/str_format.h"
#include "absl/strings/str_join.h"
@ -79,10 +80,10 @@ void UnaryCompressionChecks(const InteropClientContextInspector& inspector,
"Failure: Requested compression but got uncompressed response "
"from server.");
}
GPR_ASSERT(inspector.WasCompressed());
CHECK(inspector.WasCompressed());
} else {
// Didn't request compression -> make sure the response is uncompressed
GPR_ASSERT(!(inspector.WasCompressed()));
CHECK(!(inspector.WasCompressed()));
}
}
@ -265,8 +266,7 @@ bool InteropClient::PerformLargeUnary(SimpleRequest* request,
custom_checks_fn(inspector, request, response);
// Payload related checks.
GPR_ASSERT(response->payload().body() ==
std::string(kLargeResponseSize, '\0'));
CHECK(response->payload().body() == std::string(kLargeResponseSize, '\0'));
return true;
}
@ -286,11 +286,11 @@ bool InteropClient::DoComputeEngineCreds(
gpr_log(GPR_DEBUG, "Got username %s", response.username().c_str());
gpr_log(GPR_DEBUG, "Got oauth_scope %s", response.oauth_scope().c_str());
GPR_ASSERT(!response.username().empty());
GPR_ASSERT(response.username() == default_service_account);
GPR_ASSERT(!response.oauth_scope().empty());
CHECK(!response.username().empty());
CHECK(response.username() == default_service_account);
CHECK(!response.oauth_scope().empty());
const char* oauth_scope_str = response.oauth_scope().c_str();
GPR_ASSERT(absl::StrContains(oauth_scope, oauth_scope_str));
CHECK(absl::StrContains(oauth_scope, oauth_scope_str));
gpr_log(GPR_DEBUG, "Large unary with compute engine creds done.");
return true;
}
@ -312,11 +312,11 @@ bool InteropClient::DoOauth2AuthToken(const std::string& username,
return false;
}
GPR_ASSERT(!response.username().empty());
GPR_ASSERT(!response.oauth_scope().empty());
GPR_ASSERT(username == response.username());
CHECK(!response.username().empty());
CHECK(!response.oauth_scope().empty());
CHECK(username == response.username());
const char* oauth_scope_str = response.oauth_scope().c_str();
GPR_ASSERT(absl::StrContains(oauth_scope, oauth_scope_str));
CHECK(absl::StrContains(oauth_scope, oauth_scope_str));
gpr_log(GPR_DEBUG, "Unary with oauth2 access token credentials done.");
return true;
}
@ -340,8 +340,8 @@ bool InteropClient::DoPerRpcCreds(const std::string& json_key) {
return false;
}
GPR_ASSERT(!response.username().empty());
GPR_ASSERT(json_key.find(response.username()) != std::string::npos);
CHECK(!response.username().empty());
CHECK(json_key.find(response.username()) != std::string::npos);
gpr_log(GPR_DEBUG, "Unary with per-rpc JWT access token done.");
return true;
}
@ -357,8 +357,8 @@ bool InteropClient::DoJwtTokenCreds(const std::string& username) {
return false;
}
GPR_ASSERT(!response.username().empty());
GPR_ASSERT(username.find(response.username()) != std::string::npos);
CHECK(!response.username().empty());
CHECK(username.find(response.username()) != std::string::npos);
gpr_log(GPR_DEBUG, "Large unary with JWT token creds done.");
return true;
}
@ -376,8 +376,8 @@ bool InteropClient::DoGoogleDefaultCredentials(
}
gpr_log(GPR_DEBUG, "Got username %s", response.username().c_str());
GPR_ASSERT(!response.username().empty());
GPR_ASSERT(response.username() == default_service_account);
CHECK(!response.username().empty());
CHECK(response.username() == default_service_account);
gpr_log(GPR_DEBUG, "Large unary rpc with GoogleDefaultCredentials done.");
return true;
}
@ -494,14 +494,14 @@ bool InteropClient::DoRequestStreaming() {
}
aggregated_payload_size += request_stream_sizes[i];
}
GPR_ASSERT(stream->WritesDone());
CHECK(stream->WritesDone());
Status s = stream->Finish();
if (!AssertStatusOk(s, context.debug_error_string())) {
return false;
}
GPR_ASSERT(response.aggregated_payload_size() == aggregated_payload_size);
CHECK(response.aggregated_payload_size() == aggregated_payload_size);
return true;
}
@ -520,8 +520,8 @@ bool InteropClient::DoResponseStreaming() {
unsigned int i = 0;
while (stream->Read(&response)) {
GPR_ASSERT(response.payload().body() ==
std::string(response_stream_sizes[i], '\0'));
CHECK(response.payload().body() ==
std::string(response_stream_sizes[i], '\0'));
++i;
}
@ -598,7 +598,7 @@ bool InteropClient::DoClientCompressedStreaming() {
gpr_log(GPR_ERROR, "%s(): stream->Write() failed", __func__);
return TransientFailureOrAbort();
}
GPR_ASSERT(stream->WritesDone());
CHECK(stream->WritesDone());
s = stream->Finish();
return AssertStatusOk(s, context.debug_error_string());
@ -612,7 +612,7 @@ bool InteropClient::DoServerCompressedStreaming() {
InteropClientContextInspector inspector(context);
StreamingOutputCallRequest request;
GPR_ASSERT(compressions.size() == sizes.size());
CHECK(compressions.size() == sizes.size());
for (size_t i = 0; i < sizes.size(); i++) {
std::string log_suffix =
absl::StrFormat("(compression=%s; size=%d)",
@ -632,17 +632,17 @@ bool InteropClient::DoServerCompressedStreaming() {
StreamingOutputCallResponse response;
while (stream->Read(&response)) {
// Payload size checks.
GPR_ASSERT(response.payload().body() ==
std::string(request.response_parameters(k).size(), '\0'));
CHECK(response.payload().body() ==
std::string(request.response_parameters(k).size(), '\0'));
// Compression checks.
GPR_ASSERT(request.response_parameters(k).has_compressed());
CHECK(request.response_parameters(k).has_compressed());
if (request.response_parameters(k).compressed().value()) {
GPR_ASSERT(inspector.GetCallCompressionAlgorithm() > GRPC_COMPRESS_NONE);
GPR_ASSERT(inspector.WasCompressed());
CHECK(inspector.GetCallCompressionAlgorithm() > GRPC_COMPRESS_NONE);
CHECK(inspector.WasCompressed());
} else {
// requested *no* compression.
GPR_ASSERT(!(inspector.WasCompressed()));
CHECK(!(inspector.WasCompressed()));
}
++k;
}
@ -677,8 +677,7 @@ bool InteropClient::DoResponseStreamingWithSlowConsumer() {
int i = 0;
while (stream->Read(&response)) {
GPR_ASSERT(response.payload().body() ==
std::string(kResponseMessageSize, '\0'));
CHECK(response.payload().body() == std::string(kResponseMessageSize, '\0'));
gpr_log(GPR_DEBUG, "received message %d", i);
gpr_sleep_until(gpr_time_add(
gpr_now(GPR_CLOCK_REALTIME),
@ -727,8 +726,8 @@ bool InteropClient::DoHalfDuplex() {
unsigned int i = 0;
StreamingOutputCallResponse response;
while (stream->Read(&response)) {
GPR_ASSERT(response.payload().body() ==
std::string(response_stream_sizes[i], '\0'));
CHECK(response.payload().body() ==
std::string(response_stream_sizes[i], '\0'));
++i;
}
@ -778,13 +777,13 @@ bool InteropClient::DoPingPong() {
return TransientFailureOrAbort();
}
GPR_ASSERT(response.payload().body() ==
std::string(response_stream_sizes[i], '\0'));
CHECK(response.payload().body() ==
std::string(response_stream_sizes[i], '\0'));
}
stream->WritesDone();
GPR_ASSERT(!stream->Read(&response));
CHECK(!stream->Read(&response));
Status s = stream->Finish();
if (!AssertStatusOk(s, context.debug_error_string())) {
@ -841,7 +840,7 @@ bool InteropClient::DoCancelAfterFirstResponse() {
gpr_log(GPR_ERROR, "DoCancelAfterFirstResponse(): stream->Read failed");
return TransientFailureOrAbort();
}
GPR_ASSERT(response.payload().body() == std::string(31415, '\0'));
CHECK(response.payload().body() == std::string(31415, '\0'));
gpr_log(GPR_DEBUG, "Trying to cancel...");
context.TryCancel();
@ -886,7 +885,7 @@ bool InteropClient::DoEmptyStream() {
stream(serviceStub_.Get()->FullDuplexCall(&context));
stream->WritesDone();
StreamingOutputCallResponse response;
GPR_ASSERT(stream->Read(&response) == false);
CHECK(stream->Read(&response) == false);
Status s = stream->Finish();
if (!AssertStatusOk(s, context.debug_error_string())) {
@ -916,7 +915,7 @@ bool InteropClient::DoStatusWithMessage() {
context.debug_error_string())) {
return false;
}
GPR_ASSERT(s.error_message() == test_msg);
CHECK(s.error_message() == test_msg);
// Test FullDuplexCall.
ClientContext stream_context;
@ -937,7 +936,7 @@ bool InteropClient::DoStatusWithMessage() {
context.debug_error_string())) {
return false;
}
GPR_ASSERT(s.error_message() == test_msg);
CHECK(s.error_message() == test_msg);
gpr_log(GPR_DEBUG, "Done testing Status and Message");
return true;
@ -962,7 +961,7 @@ bool InteropClient::DoSpecialStatusMessage() {
context.debug_error_string())) {
return false;
}
GPR_ASSERT(s.error_message() == test_msg);
CHECK(s.error_message() == test_msg);
gpr_log(GPR_DEBUG, "Done testing Special Status Message");
return true;
}
@ -1010,13 +1009,13 @@ bool InteropClient::DoOrcaPerRpc() {
return false;
}
auto report = load_report_tracker_.GetNextLoadReport();
GPR_ASSERT(report.has_value());
GPR_ASSERT(report->has_value());
CHECK(report.has_value());
CHECK(report->has_value());
auto comparison_result = OrcaLoadReportsDiff(report->value(), *orca_report);
if (comparison_result.has_value()) {
gpr_assertion_failed(__FILE__, __LINE__, comparison_result->c_str());
}
GPR_ASSERT(!load_report_tracker_.GetNextLoadReport().has_value());
CHECK(!load_report_tracker_.GetNextLoadReport().has_value());
gpr_log(GPR_DEBUG, "orca per rpc successfully finished");
return true;
}
@ -1036,8 +1035,8 @@ bool InteropClient::DoOrcaOob() {
StreamingOutputCallResponse>>
stream(serviceStub_.Get()->FullDuplexCall(&context));
auto stream_cleanup = absl::MakeCleanup([&]() {
GPR_ASSERT(stream->WritesDone());
GPR_ASSERT(stream->Finish().ok());
CHECK(stream->WritesDone());
CHECK(stream->Finish().ok());
});
{
StreamingOutputCallRequest request;
@ -1055,19 +1054,19 @@ bool InteropClient::DoOrcaOob() {
gpr_log(GPR_ERROR, "DoOrcaOob(): stream->Read failed");
return TransientFailureOrAbort();
}
GPR_ASSERT(load_report_tracker_
.WaitForOobLoadReport(
[orca_report](const auto& actual) {
auto value = OrcaLoadReportsDiff(*orca_report, actual);
if (value.has_value()) {
gpr_log(GPR_DEBUG, "Reports mismatch: %s",
value->c_str());
return false;
}
return true;
},
kTimeout, 10)
.has_value());
CHECK(load_report_tracker_
.WaitForOobLoadReport(
[orca_report](const auto& actual) {
auto value = OrcaLoadReportsDiff(*orca_report, actual);
if (value.has_value()) {
gpr_log(GPR_DEBUG, "Reports mismatch: %s",
value->c_str());
return false;
}
return true;
},
kTimeout, 10)
.has_value());
}
{
StreamingOutputCallRequest request;
@ -1085,7 +1084,7 @@ bool InteropClient::DoOrcaOob() {
gpr_log(GPR_ERROR, "DoOrcaOob(): stream->Read failed");
return TransientFailureOrAbort();
}
GPR_ASSERT(
CHECK(
load_report_tracker_
.WaitForOobLoadReport(
[orca_report](const auto& report) {
@ -1123,13 +1122,13 @@ bool InteropClient::DoCustomMetadata() {
const auto& server_initial_metadata = context.GetServerInitialMetadata();
auto iter = server_initial_metadata.find(kEchoInitialMetadataKey);
GPR_ASSERT(iter != server_initial_metadata.end());
GPR_ASSERT(iter->second == kInitialMetadataValue);
CHECK(iter != server_initial_metadata.end());
CHECK(iter->second == kInitialMetadataValue);
const auto& server_trailing_metadata = context.GetServerTrailingMetadata();
iter = server_trailing_metadata.find(kEchoTrailingBinMetadataKey);
GPR_ASSERT(iter != server_trailing_metadata.end());
GPR_ASSERT(std::string(iter->second.begin(), iter->second.end()) ==
kTrailingBinValue);
CHECK(iter != server_trailing_metadata.end());
CHECK(std::string(iter->second.begin(), iter->second.end()) ==
kTrailingBinValue);
gpr_log(GPR_DEBUG, "Done testing RPC with custom metadata");
}
@ -1162,10 +1161,9 @@ bool InteropClient::DoCustomMetadata() {
return TransientFailureOrAbort();
}
GPR_ASSERT(response.payload().body() ==
std::string(kLargeResponseSize, '\0'));
CHECK(response.payload().body() == std::string(kLargeResponseSize, '\0'));
GPR_ASSERT(!stream->Read(&response));
CHECK(!stream->Read(&response));
Status s = stream->Finish();
if (!AssertStatusOk(s, context.debug_error_string())) {
@ -1174,13 +1172,13 @@ bool InteropClient::DoCustomMetadata() {
const auto& server_initial_metadata = context.GetServerInitialMetadata();
auto iter = server_initial_metadata.find(kEchoInitialMetadataKey);
GPR_ASSERT(iter != server_initial_metadata.end());
GPR_ASSERT(iter->second == kInitialMetadataValue);
CHECK(iter != server_initial_metadata.end());
CHECK(iter->second == kInitialMetadataValue);
const auto& server_trailing_metadata = context.GetServerTrailingMetadata();
iter = server_trailing_metadata.find(kEchoTrailingBinMetadataKey);
GPR_ASSERT(iter != server_trailing_metadata.end());
GPR_ASSERT(std::string(iter->second.begin(), iter->second.end()) ==
kTrailingBinValue);
CHECK(iter != server_trailing_metadata.end());
CHECK(std::string(iter->second.begin(), iter->second.end()) ==
kTrailingBinValue);
gpr_log(GPR_DEBUG, "Done testing stream with custom metadata");
}
@ -1295,7 +1293,7 @@ void InteropClient::PerformSoakTest(
server_uri.c_str(), overall_timeout_seconds, iterations_ran,
soak_iterations, total_failures, max_failures, latency_ms_median,
latency_ms_90th, latency_ms_worst);
GPR_ASSERT(0);
CHECK(0);
} else if (total_failures > max_failures) {
gpr_log(GPR_ERROR,
"(server_uri: %s) soak test ran: %d iterations. total_failures: %d "
@ -1308,7 +1306,7 @@ void InteropClient::PerformSoakTest(
"why for more info.",
server_uri.c_str(), soak_iterations, total_failures, max_failures,
latency_ms_median, latency_ms_90th, latency_ms_worst);
GPR_ASSERT(0);
CHECK(0);
} else {
gpr_log(GPR_INFO,
"(server_uri: %s) soak test ran: %d iterations. total_failures: %d "
@ -1330,7 +1328,7 @@ bool InteropClient::DoRpcSoakTest(
int32_t soak_min_time_ms_between_rpcs, int32_t overall_timeout_seconds,
int32_t request_size, int32_t response_size) {
gpr_log(GPR_DEBUG, "Sending %d RPCs...", soak_iterations);
GPR_ASSERT(soak_iterations > 0);
CHECK(soak_iterations > 0);
PerformSoakTest(server_uri, false /* reset channel per iteration */,
soak_iterations, max_failures,
max_acceptable_per_iteration_latency_ms,
@ -1347,7 +1345,7 @@ bool InteropClient::DoChannelSoakTest(
int32_t request_size, int32_t response_size) {
gpr_log(GPR_DEBUG, "Sending %d RPCs, tearing down the channel each time...",
soak_iterations);
GPR_ASSERT(soak_iterations > 0);
CHECK(soak_iterations > 0);
PerformSoakTest(server_uri, true /* reset channel per iteration */,
soak_iterations, max_failures,
max_acceptable_per_iteration_latency_ms,
@ -1360,8 +1358,8 @@ bool InteropClient::DoChannelSoakTest(
bool InteropClient::DoLongLivedChannelTest(int32_t soak_iterations,
int32_t iteration_interval) {
gpr_log(GPR_DEBUG, "Sending %d RPCs...", soak_iterations);
GPR_ASSERT(soak_iterations > 0);
GPR_ASSERT(iteration_interval > 0);
CHECK(soak_iterations > 0);
CHECK(iteration_interval > 0);
SimpleRequest request;
SimpleResponse response;
int num_failures = 0;

@ -22,6 +22,7 @@
#include <thread>
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
@ -75,8 +76,8 @@ const char kEchoUserAgentKey[] = "x-grpc-test-echo-useragent";
void MaybeEchoMetadata(ServerContext* context) {
const auto& client_metadata = context->client_metadata();
GPR_ASSERT(client_metadata.count(kEchoInitialMetadataKey) <= 1);
GPR_ASSERT(client_metadata.count(kEchoTrailingBinMetadataKey) <= 1);
CHECK(client_metadata.count(kEchoInitialMetadataKey) <= 1);
CHECK(client_metadata.count(kEchoTrailingBinMetadataKey) <= 1);
auto iter = client_metadata.find(kEchoInitialMetadataKey);
if (iter != client_metadata.end()) {
@ -419,7 +420,7 @@ void grpc::testing::interop::RunServer(
ServerStartedCondition* server_started_condition,
std::unique_ptr<std::vector<std::unique_ptr<ServerBuilderOption>>>
server_options) {
GPR_ASSERT(port != 0);
CHECK(port != 0);
std::ostringstream server_address;
server_address << "0.0.0.0:" << port;
auto server_metric_recorder =

@ -20,6 +20,7 @@
#include <sstream>
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
@ -57,8 +58,8 @@ using grpc::testing::TLS;
int main(int argc, char** argv) {
grpc::testing::InitTest(&argc, &argv, true);
GPR_ASSERT(absl::GetFlag(FLAGS_server_control_port));
GPR_ASSERT(absl::GetFlag(FLAGS_server_retry_port));
CHECK(absl::GetFlag(FLAGS_server_control_port));
CHECK(absl::GetFlag(FLAGS_server_retry_port));
std::ostringstream server_address;
server_address << absl::GetFlag(FLAGS_server_host) << ':'
@ -73,7 +74,7 @@ int main(int argc, char** argv) {
Empty empty_response;
Status start_status =
control_stub->Start(&start_context, reconnect_params, &empty_response);
GPR_ASSERT(start_status.ok());
CHECK(start_status.ok());
gpr_log(GPR_INFO, "Starting connections with retries.");
server_address.str("");
@ -98,14 +99,14 @@ int main(int argc, char** argv) {
std::chrono::seconds(kDeadlineSeconds));
Status retry_status =
retry_stub->Start(&retry_context, reconnect_params, &empty_response);
GPR_ASSERT(retry_status.error_code() == grpc::StatusCode::DEADLINE_EXCEEDED);
CHECK(retry_status.error_code() == grpc::StatusCode::DEADLINE_EXCEEDED);
gpr_log(GPR_INFO, "Done retrying, getting final data from server");
ClientContext stop_context;
ReconnectInfo response;
Status stop_status = control_stub->Stop(&stop_context, Empty(), &response);
GPR_ASSERT(stop_status.ok());
GPR_ASSERT(response.passed() == true);
CHECK(stop_status.ok());
CHECK(response.passed() == true);
gpr_log(GPR_INFO, "Passed");
return 0;
}

@ -26,6 +26,7 @@
#include <sstream>
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
@ -179,8 +180,8 @@ int main(int argc, char** argv) {
grpc::testing::InitTest(&argc, &argv, true);
signal(SIGINT, sigint_handler);
GPR_ASSERT(absl::GetFlag(FLAGS_control_port) != 0);
GPR_ASSERT(absl::GetFlag(FLAGS_retry_port) != 0);
CHECK(absl::GetFlag(FLAGS_control_port) != 0);
CHECK(absl::GetFlag(FLAGS_retry_port) != 0);
RunServer();
return 0;

@ -18,6 +18,7 @@
#include "test/cpp/interop/rpc_behavior_lb_policy.h"
#include "absl/log/check.h"
#include "absl/strings/str_format.h"
#include <grpc/support/port_platform.h>
@ -92,7 +93,7 @@ class RpcBehaviorLbPolicy : public LoadBalancingPolicy {
grpc_core::Json::FromArray({grpc_core::Json::FromObject(
{{std::string(delegate_->name()),
grpc_core::Json::FromObject({})}})}));
GPR_ASSERT(delegate_config.ok());
CHECK(delegate_config.ok());
args.config = std::move(*delegate_config);
return delegate_->UpdateLocked(std::move(args));
}

@ -22,6 +22,7 @@
#include <string>
#include <vector>
#include "absl/log/check.h"
#include "absl/strings/str_format.h"
#include <grpc/support/log.h>
@ -65,7 +66,7 @@ TestCaseType WeightedRandomTestSelector::GetNextTest() const {
}
// It is a bug in the logic if no test is selected at this point
GPR_ASSERT(selected_test != UNKNOWN_TEST);
CHECK(selected_test != UNKNOWN_TEST);
return selected_test;
}

@ -23,6 +23,7 @@
#include <vector>
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include <grpc/support/log.h>
#include <grpc/support/time.h>
@ -324,7 +325,7 @@ int main(int argc, char** argv) {
metrics_service.CreateQpsGauge(buffer, &is_already_created)));
// The QpsGauge should not have been already created
GPR_ASSERT(!is_already_created);
CHECK(!is_already_created);
}
}
}

@ -20,6 +20,7 @@
#include <thread>
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include "absl/strings/str_split.h"
#include <grpc/grpc.h>
@ -86,11 +87,11 @@ int main(int argc, char** argv) {
"Number of entries in --server_uris %ld != number of entries in "
"--credentials_types %ld",
uris.size(), creds.size());
GPR_ASSERT(0);
CHECK(0);
}
if (uris.empty()) {
gpr_log(GPR_ERROR, "--server_uris has zero entries");
GPR_ASSERT(0);
CHECK(0);
}
// construct and start clients
std::vector<std::thread> threads;
@ -122,7 +123,7 @@ int main(int argc, char** argv) {
} else {
gpr_log(GPR_ERROR,
"Invalid test case, must be either rpc_soak or channel_soak");
GPR_ASSERT(0);
CHECK(0);
}
}));
}

@ -32,6 +32,7 @@
#include "absl/algorithm/container.h"
#include "absl/flags/flag.h"
#include "absl/log/check.h"
#include "absl/strings/str_split.h"
#include "opentelemetry/exporters/prometheus/exporter_factory.h"
#include "opentelemetry/exporters/prometheus/exporter_options.h"
@ -217,7 +218,7 @@ class TestClient {
bool ok = false;
while (cq_.Next(&got_tag, &ok)) {
AsyncClientCall* call = static_cast<AsyncClientCall*>(got_tag);
GPR_ASSERT(ok);
CHECK(ok);
{
std::lock_guard<std::mutex> lock(stats_watchers_->mu);
auto server_initial_metadata = call->context.GetServerInitialMetadata();
@ -269,7 +270,7 @@ class TestClient {
static bool RpcStatusCheckSuccess(AsyncClientCall* call) {
// Determine RPC success based on expected status.
grpc_status_code code;
GPR_ASSERT(grpc_status_code_from_string(
CHECK(grpc_status_code_from_string(
absl::GetFlag(FLAGS_expect_status).c_str(), &code));
return code ==
static_cast<grpc_status_code>(call->result.status.error_code());
@ -341,8 +342,8 @@ class XdsUpdateClientConfigureServiceImpl
std::vector<RpcConfig> configs;
int request_payload_size = absl::GetFlag(FLAGS_request_payload_size);
int response_payload_size = absl::GetFlag(FLAGS_response_payload_size);
GPR_ASSERT(request_payload_size >= 0);
GPR_ASSERT(response_payload_size >= 0);
CHECK(request_payload_size >= 0);
CHECK(response_payload_size >= 0);
for (const auto& rpc : request->types()) {
RpcConfig config;
config.timeout_sec = request->timeout_sec();
@ -419,7 +420,7 @@ void RunTestLoop(std::chrono::duration<double> duration_per_query,
} else if (config.type == ClientConfigureRequest::UNARY_CALL) {
client.AsyncUnaryCall(config);
} else {
GPR_ASSERT(0);
CHECK(0);
}
}
}
@ -447,7 +448,7 @@ grpc::CsmObservability EnableCsmObservability() {
void RunServer(const int port, StatsWatchers* stats_watchers,
RpcConfigurationsQueue* rpc_configs_queue) {
GPR_ASSERT(port != 0);
CHECK(port != 0);
std::ostringstream server_address;
server_address << "0.0.0.0:" << port;
@ -479,7 +480,7 @@ void BuildRpcConfigsFromFlags(RpcConfigurationsQueue* rpc_configs_queue) {
for (auto& data : rpc_metadata) {
std::vector<std::string> metadata =
absl::StrSplit(data, ':', absl::SkipEmpty());
GPR_ASSERT(metadata.size() == 3);
CHECK(metadata.size() == 3);
if (metadata[0] == "EmptyCall") {
metadata_map[ClientConfigureRequest::EMPTY_CALL].push_back(
{metadata[1], metadata[2]});
@ -487,7 +488,7 @@ void BuildRpcConfigsFromFlags(RpcConfigurationsQueue* rpc_configs_queue) {
metadata_map[ClientConfigureRequest::UNARY_CALL].push_back(
{metadata[1], metadata[2]});
} else {
GPR_ASSERT(0);
CHECK(0);
}
}
std::vector<RpcConfig> configs;
@ -495,8 +496,8 @@ void BuildRpcConfigsFromFlags(RpcConfigurationsQueue* rpc_configs_queue) {
absl::StrSplit(absl::GetFlag(FLAGS_rpc), ',', absl::SkipEmpty());
int request_payload_size = absl::GetFlag(FLAGS_request_payload_size);
int response_payload_size = absl::GetFlag(FLAGS_response_payload_size);
GPR_ASSERT(request_payload_size >= 0);
GPR_ASSERT(response_payload_size >= 0);
CHECK(request_payload_size >= 0);
CHECK(response_payload_size >= 0);
for (const std::string& rpc_method : rpc_methods) {
RpcConfig config;
if (rpc_method == "EmptyCall") {
@ -504,7 +505,7 @@ void BuildRpcConfigsFromFlags(RpcConfigurationsQueue* rpc_configs_queue) {
} else if (rpc_method == "UnaryCall") {
config.type = ClientConfigureRequest::UNARY_CALL;
} else {
GPR_ASSERT(0);
CHECK(0);
}
auto metadata_iter = metadata_map.find(config.type);
if (metadata_iter != metadata_map.end()) {
@ -541,8 +542,8 @@ int main(int argc, char** argv) {
grpc::testing::InitTest(&argc, &argv, true);
// Validate the expect_status flag.
grpc_status_code code;
GPR_ASSERT(grpc_status_code_from_string(
absl::GetFlag(FLAGS_expect_status).c_str(), &code));
CHECK(grpc_status_code_from_string(absl::GetFlag(FLAGS_expect_status).c_str(),
&code));
StatsWatchers stats_watchers;
RpcConfigurationsQueue rpc_config_queue;

@ -17,6 +17,7 @@
#include <map>
#include "absl/algorithm/container.h"
#include "absl/log/check.h"
#include "absl/strings/ascii.h"
namespace grpc {
@ -140,7 +141,7 @@ LoadBalancerStatsResponse XdsStatsWatcher::WaitForRpcStatsResponse(
} else if (rpc_by_type.first == ClientConfigureRequest::UNARY_CALL) {
method_name = "UnaryCall";
} else {
GPR_ASSERT(0);
CHECK(0);
}
// TODO(@donnadionne): When the test runner changes to accept EMPTY_CALL
// and UNARY_CALL we will just use the name of the enum instead of the

Loading…
Cancel
Save