Cancel retry timer on call cancellation (#25890)

pull/25956/head
Mark D. Roth 4 years ago committed by GitHub
parent c4b77ca0fe
commit d017ce5f25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      CMakeLists.txt
  2. 2
      build_autogenerated.yaml
  3. 1
      gRPC-Core.podspec
  4. 2
      grpc.gyp
  5. 98
      src/core/ext/filters/client_channel/retry_filter.cc
  6. 8
      test/core/end2end/end2end_nosec_tests.cc
  7. 8
      test/core/end2end/end2end_tests.cc
  8. 4
      test/core/end2end/generate_tests.bzl
  9. 288
      test/core/end2end/tests/retry_cancel_during_delay.cc
  10. 2
      test/core/end2end/tests/retry_cancellation.cc

@ -1110,6 +1110,7 @@ add_library(end2end_nosec_tests
test/core/end2end/tests/request_with_payload.cc
test/core/end2end/tests/resource_quota_server.cc
test/core/end2end/tests/retry.cc
test/core/end2end/tests/retry_cancel_during_delay.cc
test/core/end2end/tests/retry_cancellation.cc
test/core/end2end/tests/retry_disabled.cc
test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
@ -1243,6 +1244,7 @@ add_library(end2end_tests
test/core/end2end/tests/request_with_payload.cc
test/core/end2end/tests/resource_quota_server.cc
test/core/end2end/tests/retry.cc
test/core/end2end/tests/retry_cancel_during_delay.cc
test/core/end2end/tests/retry_cancellation.cc
test/core/end2end/tests/retry_disabled.cc
test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc

@ -84,6 +84,7 @@ libs:
- test/core/end2end/tests/request_with_payload.cc
- test/core/end2end/tests/resource_quota_server.cc
- test/core/end2end/tests/retry.cc
- test/core/end2end/tests/retry_cancel_during_delay.cc
- test/core/end2end/tests/retry_cancellation.cc
- test/core/end2end/tests/retry_disabled.cc
- test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc
@ -192,6 +193,7 @@ libs:
- test/core/end2end/tests/request_with_payload.cc
- test/core/end2end/tests/resource_quota_server.cc
- test/core/end2end/tests/retry.cc
- test/core/end2end/tests/retry_cancel_during_delay.cc
- test/core/end2end/tests/retry_cancellation.cc
- test/core/end2end/tests/retry_disabled.cc
- test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc

@ -2080,6 +2080,7 @@ Pod::Spec.new do |s|
'test/core/end2end/tests/request_with_payload.cc',
'test/core/end2end/tests/resource_quota_server.cc',
'test/core/end2end/tests/retry.cc',
'test/core/end2end/tests/retry_cancel_during_delay.cc',
'test/core/end2end/tests/retry_cancellation.cc',
'test/core/end2end/tests/retry_disabled.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',

@ -238,6 +238,7 @@
'test/core/end2end/tests/request_with_payload.cc',
'test/core/end2end/tests/resource_quota_server.cc',
'test/core/end2end/tests/retry.cc',
'test/core/end2end/tests/retry_cancel_during_delay.cc',
'test/core/end2end/tests/retry_cancellation.cc',
'test/core/end2end/tests/retry_disabled.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',
@ -339,6 +340,7 @@
'test/core/end2end/tests/request_with_payload.cc',
'test/core/end2end/tests/resource_quota_server.cc',
'test/core/end2end/tests/retry.cc',
'test/core/end2end/tests/retry_cancel_during_delay.cc',
'test/core/end2end/tests/retry_cancellation.cc',
'test/core/end2end/tests/retry_disabled.cc',
'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc',

@ -200,6 +200,8 @@ class RetryFilter::CallData {
static void SetPollent(grpc_call_element* elem, grpc_polling_entity* pollent);
private:
class Canceller;
// Pending batches stored in call data.
struct PendingBatch {
// The pending batch. If nullptr, this slot is empty.
@ -409,7 +411,7 @@ class RetryFilter::CallData {
void PendingBatchClear(PendingBatch* pending);
void MaybeClearPendingBatch(PendingBatch* pending);
static void FailPendingBatchInCallCombiner(void* arg, grpc_error* error);
// Fails all pending batches. Does NOT yeild call combiner.
// Fails all pending batches. Does NOT yield call combiner.
void PendingBatchesFail(grpc_error* error);
// Returns a pointer to the first pending batch for which predicate(batch)
// returns true, or null if not found.
@ -423,16 +425,18 @@ class RetryFilter::CallData {
// Frees cached send_message at index idx.
void FreeCachedSendMessage(size_t idx);
void FreeCachedSendTrailingMetadata();
void FreeAllCachedSendOpData();
// Commits the call so that no further retry attempts will be performed.
void RetryCommit(CallAttempt* call_attempt);
// Starts a retry after appropriate back-off.
void DoRetry(grpc_millis server_pushback_ms);
static void OnRetryTimer(void* arg, grpc_error* error);
RefCountedPtr<ClientChannel::LoadBalancedCall> CreateLoadBalancedCall();
static void CreateCallAttempt(void* arg, grpc_error* error);
void CreateCallAttempt();
// Adds a closure to closures that will execute batch in the call combiner.
void AddClosureForBatch(grpc_transport_stream_op_batch* batch,
@ -480,7 +484,9 @@ class RetryFilter::CallData {
bool retry_committed_ : 1;
bool last_attempt_got_server_pushback_ : 1;
int num_attempts_completed_ = 0;
grpc_timer retry_timer_;
Mutex timer_mu_;
Canceller* canceller_ ABSL_GUARDED_BY(timer_mu_);
grpc_timer retry_timer_ ABSL_GUARDED_BY(timer_mu_);
grpc_closure retry_closure_;
// The number of batches containing send ops that are currently in-flight
@ -519,6 +525,45 @@ class RetryFilter::CallData {
grpc_metadata_batch send_trailing_metadata_;
};
//
// RetryFilter::CallData::Canceller
//
class RetryFilter::CallData::Canceller {
public:
explicit Canceller(CallData* calld) : calld_(calld) {
GRPC_CALL_STACK_REF(calld_->owning_call_, "RetryCanceller");
GRPC_CLOSURE_INIT(&closure_, &Cancel, this, nullptr);
calld_->call_combiner_->SetNotifyOnCancel(&closure_);
}
private:
static void Cancel(void* arg, grpc_error* error) {
auto* self = static_cast<Canceller*>(arg);
auto* calld = self->calld_;
{
MutexLock lock(&calld->timer_mu_);
if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) {
gpr_log(GPR_INFO,
"calld=%p: cancelling retry timer: error=%s self=%p "
"calld->canceller_=%p",
calld, grpc_error_string(error), self, calld->canceller_);
}
if (calld->canceller_ == self && error != GRPC_ERROR_NONE) {
calld->canceller_ = nullptr; // Checked by OnRetryTimer().
grpc_timer_cancel(&calld->retry_timer_);
calld->FreeAllCachedSendOpData();
GRPC_CALL_COMBINER_STOP(calld->call_combiner_, "Canceller");
}
}
GRPC_CALL_STACK_UNREF(calld->owning_call_, "RetryCanceller");
delete self;
}
CallData* calld_;
grpc_closure closure_;
};
//
// RetryFilter::CallData::CallAttempt
//
@ -1694,8 +1739,6 @@ void RetryFilter::CallData::StartTransportStreamOpBatch(
call_attempt_->lb_call()->StartTransportStreamOpBatch(batch);
return;
}
// TODO(roth): If retry timer is pending, cancel it. The timer callback
// should be a no-op in this case.
// Fail pending batches.
PendingBatchesFail(GRPC_ERROR_REF(cancel_error));
// Note: This will release the call combiner.
@ -1723,13 +1766,12 @@ void RetryFilter::CallData::StartTransportStreamOpBatch(
committed_call_->StartTransportStreamOpBatch(batch);
return;
}
// TODO(roth): If retry timer is pending, return without doing anything.
// We do not yet have a call attempt, so create one.
if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) {
gpr_log(GPR_INFO, "chand=%p calld=%p: creating call attempt", chand_,
this);
}
CreateCallAttempt(this, GRPC_ERROR_NONE);
CreateCallAttempt();
return;
}
// Send batches to call attempt.
@ -1749,11 +1791,9 @@ RetryFilter::CallData::CreateLoadBalancedCall() {
return chand_->client_channel_->CreateLoadBalancedCall(args, pollent_);
}
void RetryFilter::CallData::CreateCallAttempt(void* arg,
grpc_error* /*error*/) {
auto* calld = static_cast<CallData*>(arg);
calld->call_attempt_.reset(calld->arena_->New<CallAttempt>(calld));
calld->call_attempt_->StartRetriableBatches();
void RetryFilter::CallData::CreateCallAttempt() {
call_attempt_.reset(arena_->New<CallAttempt>(this));
call_attempt_->StartRetriableBatches();
// TODO(roth): When implementing hedging, change this to start a timer
// for the next hedging attempt.
}
@ -1852,6 +1892,18 @@ void RetryFilter::CallData::FreeCachedSendTrailingMetadata() {
grpc_metadata_batch_destroy(&send_trailing_metadata_);
}
void RetryFilter::CallData::FreeAllCachedSendOpData() {
if (seen_send_initial_metadata_) {
FreeCachedSendInitialMetadata();
}
for (size_t i = 0; i < send_messages_.size(); ++i) {
FreeCachedSendMessage(i);
}
if (seen_send_trailing_metadata_) {
FreeCachedSendTrailingMetadata();
}
}
//
// pending_batches management
//
@ -2037,11 +2089,29 @@ void RetryFilter::CallData::DoRetry(grpc_millis server_pushback_ms) {
this, next_attempt_time - ExecCtx::Get()->Now());
}
// Schedule retry after computed delay.
GRPC_CLOSURE_INIT(&retry_closure_, CreateCallAttempt, this, nullptr);
// TODO(roth): Register a call combiner canceller for the timer.
GRPC_CLOSURE_INIT(&retry_closure_, OnRetryTimer, this, nullptr);
GRPC_CALL_STACK_REF(owning_call_, "OnRetryTimer");
MutexLock lock(&timer_mu_);
canceller_ = new Canceller(this);
grpc_timer_init(&retry_timer_, next_attempt_time, &retry_closure_);
}
void RetryFilter::CallData::OnRetryTimer(void* arg, grpc_error* error) {
auto* calld = static_cast<CallData*>(arg);
if (error == GRPC_ERROR_NONE) {
bool start_attempt = false;
{
MutexLock lock(&calld->timer_mu_);
if (calld->canceller_ != nullptr) {
calld->canceller_ = nullptr;
start_attempt = true;
}
}
if (start_attempt) calld->CreateCallAttempt();
}
GRPC_CALL_STACK_UNREF(calld->owning_call_, "OnRetryTimer");
}
} // namespace
const grpc_channel_filter kRetryFilterVtable = {

@ -125,6 +125,8 @@ extern void resource_quota_server(grpc_end2end_test_config config);
extern void resource_quota_server_pre_init(void);
extern void retry(grpc_end2end_test_config config);
extern void retry_pre_init(void);
extern void retry_cancel_during_delay(grpc_end2end_test_config config);
extern void retry_cancel_during_delay_pre_init(void);
extern void retry_cancellation(grpc_end2end_test_config config);
extern void retry_cancellation_pre_init(void);
extern void retry_disabled(grpc_end2end_test_config config);
@ -241,6 +243,7 @@ void grpc_end2end_tests_pre_init(void) {
request_with_payload_pre_init();
resource_quota_server_pre_init();
retry_pre_init();
retry_cancel_during_delay_pre_init();
retry_cancellation_pre_init();
retry_disabled_pre_init();
retry_exceeds_buffer_size_in_initial_batch_pre_init();
@ -330,6 +333,7 @@ void grpc_end2end_tests(int argc, char **argv,
request_with_payload(config);
resource_quota_server(config);
retry(config);
retry_cancel_during_delay(config);
retry_cancellation(config);
retry_disabled(config);
retry_exceeds_buffer_size_in_initial_batch(config);
@ -558,6 +562,10 @@ void grpc_end2end_tests(int argc, char **argv,
retry(config);
continue;
}
if (0 == strcmp("retry_cancel_during_delay", argv[i])) {
retry_cancel_during_delay(config);
continue;
}
if (0 == strcmp("retry_cancellation", argv[i])) {
retry_cancellation(config);
continue;

@ -127,6 +127,8 @@ extern void resource_quota_server(grpc_end2end_test_config config);
extern void resource_quota_server_pre_init(void);
extern void retry(grpc_end2end_test_config config);
extern void retry_pre_init(void);
extern void retry_cancel_during_delay(grpc_end2end_test_config config);
extern void retry_cancel_during_delay_pre_init(void);
extern void retry_cancellation(grpc_end2end_test_config config);
extern void retry_cancellation_pre_init(void);
extern void retry_disabled(grpc_end2end_test_config config);
@ -244,6 +246,7 @@ void grpc_end2end_tests_pre_init(void) {
request_with_payload_pre_init();
resource_quota_server_pre_init();
retry_pre_init();
retry_cancel_during_delay_pre_init();
retry_cancellation_pre_init();
retry_disabled_pre_init();
retry_exceeds_buffer_size_in_initial_batch_pre_init();
@ -334,6 +337,7 @@ void grpc_end2end_tests(int argc, char **argv,
request_with_payload(config);
resource_quota_server(config);
retry(config);
retry_cancel_during_delay(config);
retry_cancellation(config);
retry_disabled(config);
retry_exceeds_buffer_size_in_initial_batch(config);
@ -566,6 +570,10 @@ void grpc_end2end_tests(int argc, char **argv,
retry(config);
continue;
}
if (0 == strcmp("retry_cancel_during_delay", argv[i])) {
retry_cancel_during_delay(config);
continue;
}
if (0 == strcmp("retry_cancellation", argv[i])) {
retry_cancellation(config);
continue;

@ -281,6 +281,10 @@ END2END_TESTS = {
needs_client_channel = True,
proxyable = False,
),
"retry_cancel_during_delay": _test_options(
needs_client_channel = True,
proxyable = False,
),
"retry_disabled": _test_options(needs_client_channel = True, proxyable = False),
"retry_exceeds_buffer_size_in_initial_batch": _test_options(
needs_client_channel = True,

@ -0,0 +1,288 @@
//
// Copyright 2017 gRPC authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include "test/core/end2end/end2end_tests.h"
#include <stdio.h>
#include <string.h>
#include <string>
#include "absl/strings/str_cat.h"
#include <grpc/byte_buffer.h>
#include <grpc/grpc.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/time.h>
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/gpr/string.h"
#include "src/core/lib/gpr/useful.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/transport/static_metadata.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/end2end/tests/cancel_test_helpers.h"
static void* tag(intptr_t t) { return reinterpret_cast<void*>(t); }
static grpc_end2end_test_fixture begin_test(grpc_end2end_test_config config,
const char* test_name,
grpc_channel_args* client_args,
grpc_channel_args* server_args) {
grpc_end2end_test_fixture f;
gpr_log(GPR_INFO, "Running test: %s/%s", test_name, config.name);
f = config.create_fixture(client_args, server_args);
config.init_server(&f, server_args);
config.init_client(&f, client_args);
return f;
}
static gpr_timespec n_seconds_from_now(int n) {
return grpc_timeout_seconds_to_deadline(n);
}
static gpr_timespec five_seconds_from_now(void) {
return n_seconds_from_now(5);
}
static void drain_cq(grpc_completion_queue* cq) {
grpc_event ev;
do {
ev = grpc_completion_queue_next(cq, five_seconds_from_now(), nullptr);
} while (ev.type != GRPC_QUEUE_SHUTDOWN);
}
static void shutdown_server(grpc_end2end_test_fixture* f) {
if (!f->server) return;
grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000));
GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000),
grpc_timeout_seconds_to_deadline(5),
nullptr)
.type == GRPC_OP_COMPLETE);
grpc_server_destroy(f->server);
f->server = nullptr;
}
static void shutdown_client(grpc_end2end_test_fixture* f) {
if (!f->client) return;
grpc_channel_destroy(f->client);
f->client = nullptr;
}
static void end_test(grpc_end2end_test_fixture* f) {
shutdown_server(f);
shutdown_client(f);
grpc_completion_queue_shutdown(f->cq);
drain_cq(f->cq);
grpc_completion_queue_destroy(f->cq);
grpc_completion_queue_destroy(f->shutdown_cq);
}
// Tests retry cancellation during backoff.
static void test_retry_cancel_during_delay(grpc_end2end_test_config config,
cancellation_mode mode) {
grpc_call* c;
grpc_call* s;
grpc_op ops[6];
grpc_op* op;
grpc_metadata_array initial_metadata_recv;
grpc_metadata_array trailing_metadata_recv;
grpc_metadata_array request_metadata_recv;
grpc_call_details call_details;
grpc_slice request_payload_slice = grpc_slice_from_static_string("foo");
grpc_slice response_payload_slice = grpc_slice_from_static_string("bar");
grpc_byte_buffer* request_payload =
grpc_raw_byte_buffer_create(&request_payload_slice, 1);
grpc_byte_buffer* response_payload =
grpc_raw_byte_buffer_create(&response_payload_slice, 1);
grpc_byte_buffer* request_payload_recv = nullptr;
grpc_byte_buffer* response_payload_recv = nullptr;
grpc_status_code status;
grpc_call_error error;
grpc_slice details;
int was_cancelled = 2;
char* peer;
grpc_arg args[] = {
grpc_channel_arg_integer_create(
const_cast<char*>(GRPC_ARG_ENABLE_RETRIES), 1),
grpc_channel_arg_string_create(
const_cast<char*>(GRPC_ARG_SERVICE_CONFIG),
const_cast<char*>(
"{\n"
" \"methodConfig\": [ {\n"
" \"name\": [\n"
" { \"service\": \"service\", \"method\": \"method\" }\n"
" ],\n"
" \"retryPolicy\": {\n"
" \"maxAttempts\": 3,\n"
" \"initialBackoff\": \"10s\",\n"
" \"maxBackoff\": \"120s\",\n"
" \"backoffMultiplier\": 1.6,\n"
" \"retryableStatusCodes\": [ \"ABORTED\" ]\n"
" },\n"
" \"timeout\": \"5s\"\n"
" } ]\n"
"}")),
};
grpc_channel_args client_args = {GPR_ARRAY_SIZE(args), args};
std::string name = absl::StrCat("retry_cancel_during_delay/", mode.name);
grpc_end2end_test_fixture f =
begin_test(config, name.c_str(), &client_args, nullptr);
cq_verifier* cqv = cq_verifier_create(f.cq);
gpr_timespec expect_finish_before = n_seconds_from_now(10);
gpr_timespec deadline = five_seconds_from_now();
c = grpc_channel_create_call(f.client, nullptr, GRPC_PROPAGATE_DEFAULTS, f.cq,
grpc_slice_from_static_string("/service/method"),
nullptr, deadline, nullptr);
GPR_ASSERT(c);
peer = grpc_call_get_peer(c);
GPR_ASSERT(peer != nullptr);
gpr_log(GPR_DEBUG, "client_peer_before_call=%s", peer);
gpr_free(peer);
grpc_metadata_array_init(&initial_metadata_recv);
grpc_metadata_array_init(&trailing_metadata_recv);
grpc_metadata_array_init(&request_metadata_recv);
grpc_call_details_init(&call_details);
grpc_slice status_details = grpc_slice_from_static_string("xyz");
// Client starts a batch with all 6 ops.
memset(ops, 0, sizeof(ops));
op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0;
op++;
op->op = GRPC_OP_SEND_MESSAGE;
op->data.send_message.send_message = request_payload;
op++;
op->op = GRPC_OP_RECV_MESSAGE;
op->data.recv_message.recv_message = &response_payload_recv;
op++;
op->op = GRPC_OP_SEND_CLOSE_FROM_CLIENT;
op++;
op->op = GRPC_OP_RECV_INITIAL_METADATA;
op->data.recv_initial_metadata.recv_initial_metadata = &initial_metadata_recv;
op++;
op->op = GRPC_OP_RECV_STATUS_ON_CLIENT;
op->data.recv_status_on_client.trailing_metadata = &trailing_metadata_recv;
op->data.recv_status_on_client.status = &status;
op->data.recv_status_on_client.status_details = &details;
op++;
error = grpc_call_start_batch(c, ops, static_cast<size_t>(op - ops), tag(1),
nullptr);
GPR_ASSERT(GRPC_CALL_OK == error);
// Server gets a call and fails with retryable status.
error =
grpc_server_request_call(f.server, &s, &call_details,
&request_metadata_recv, f.cq, f.cq, tag(101));
GPR_ASSERT(GRPC_CALL_OK == error);
CQ_EXPECT_COMPLETION(cqv, tag(101), true);
cq_verify(cqv);
peer = grpc_call_get_peer(s);
GPR_ASSERT(peer != nullptr);
gpr_log(GPR_DEBUG, "server_peer=%s", peer);
gpr_free(peer);
peer = grpc_call_get_peer(c);
GPR_ASSERT(peer != nullptr);
gpr_log(GPR_DEBUG, "client_peer=%s", peer);
gpr_free(peer);
memset(ops, 0, sizeof(ops));
op = ops;
op->op = GRPC_OP_SEND_INITIAL_METADATA;
op->data.send_initial_metadata.count = 0;
op++;
op->op = GRPC_OP_SEND_STATUS_FROM_SERVER;
op->data.send_status_from_server.trailing_metadata_count = 0;
op->data.send_status_from_server.status = GRPC_STATUS_ABORTED;
op->data.send_status_from_server.status_details = &status_details;
op++;
op->op = GRPC_OP_RECV_CLOSE_ON_SERVER;
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
error = grpc_call_start_batch(s, ops, static_cast<size_t>(op - ops), tag(102),
nullptr);
GPR_ASSERT(GRPC_CALL_OK == error);
CQ_EXPECT_COMPLETION(cqv, tag(102), true);
cq_verify(cqv);
grpc_call_unref(s);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_metadata_array_init(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_call_details_init(&call_details);
// Server should never get a second call, because the initial retry
// delay is longer than the call's deadline.
error =
grpc_server_request_call(f.server, &s, &call_details,
&request_metadata_recv, f.cq, f.cq, tag(201));
GPR_ASSERT(GRPC_CALL_OK == error);
cq_verify_empty(cqv);
// Initiate cancellation.
GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, nullptr));
CQ_EXPECT_COMPLETION(cqv, tag(1), true);
cq_verify(cqv);
// Make sure we didn't wait the full deadline before failing.
gpr_log(
GPR_INFO, "Expect completion before: %s",
absl::FormatTime(grpc_core::ToAbslTime(expect_finish_before)).c_str());
GPR_ASSERT(gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), expect_finish_before) <
0);
gpr_log(GPR_INFO, "status=%d expected=%d", status, mode.expect_status);
GPR_ASSERT(status == mode.expect_status);
GPR_ASSERT(was_cancelled == 0);
grpc_slice_unref(details);
grpc_metadata_array_destroy(&initial_metadata_recv);
grpc_metadata_array_destroy(&trailing_metadata_recv);
grpc_metadata_array_destroy(&request_metadata_recv);
grpc_call_details_destroy(&call_details);
grpc_byte_buffer_destroy(request_payload);
grpc_byte_buffer_destroy(response_payload);
grpc_byte_buffer_destroy(request_payload_recv);
grpc_byte_buffer_destroy(response_payload_recv);
grpc_call_unref(c);
cq_verifier_destroy(cqv);
end_test(&f);
config.tear_down_data(&f);
}
void retry_cancel_during_delay(grpc_end2end_test_config config) {
GPR_ASSERT(config.feature_mask & FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL);
for (size_t i = 0; i < GPR_ARRAY_SIZE(cancellation_modes); ++i) {
test_retry_cancel_during_delay(config, cancellation_modes[i]);
}
}
void retry_cancel_during_delay_pre_init(void) {}

@ -144,7 +144,7 @@ static void test_retry_cancellation(grpc_end2end_test_config config,
"}")),
};
grpc_channel_args client_args = {GPR_ARRAY_SIZE(args), args};
std::string name = absl::StrCat("retry_cancellation/%s", mode.name);
std::string name = absl::StrCat("retry_cancellation/", mode.name);
grpc_end2end_test_fixture f =
begin_test(config, name.c_str(), &client_args, nullptr);

Loading…
Cancel
Save