diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-01-12 14:08:50 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-01-12 14:08:50 -0800 |
| commit | 9d4fc31da4e86358ad02aa24ab86ed1ca82b9ee9 (patch) | |
| tree | 6bbf23b861f6fd2969085dea80c1f89cda797701 /src/core/ext | |
| parent | 8cf88f1eb169f5bae7ddfbdd571fd4c27ba5e1bf (diff) | |
| parent | 5868c8335c386fc9846241eec0171969c8f7422d (diff) | |
Merge github.com:grpc/grpc into metadata_filter
Diffstat (limited to 'src/core/ext')
| -rw-r--r-- | src/core/ext/resolver/dns/native/dns_resolver.c | 5 | ||||
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/frame_rst_stream.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/ext/resolver/dns/native/dns_resolver.c b/src/core/ext/resolver/dns/native/dns_resolver.c index 9bb1c0c227..58fe9d3985 100644 --- a/src/core/ext/resolver/dns/native/dns_resolver.c +++ b/src/core/ext/resolver/dns/native/dns_resolver.c @@ -188,9 +188,8 @@ static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg, gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC); gpr_timespec next_try = gpr_backoff_step(&r->backoff_state, now); gpr_timespec timeout = gpr_time_sub(next_try, now); - const char *msg = grpc_error_string(error); - gpr_log(GPR_DEBUG, "dns resolution failed: %s", msg); - + gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", + grpc_error_string(error)); GPR_ASSERT(!r->have_retry_timer); r->have_retry_timer = true; GRPC_RESOLVER_REF(&r->base, "retry-timer"); diff --git a/src/core/ext/transport/chttp2/transport/frame_rst_stream.c b/src/core/ext/transport/chttp2/transport/frame_rst_stream.c index 583ac9e98e..7d5beed09d 100644 --- a/src/core/ext/transport/chttp2/transport/frame_rst_stream.c +++ b/src/core/ext/transport/chttp2/transport/frame_rst_stream.c @@ -108,7 +108,7 @@ grpc_error *grpc_chttp2_rst_stream_parser_parse(grpc_exec_ctx *exec_ctx, (((uint32_t)p->reason_bytes[2]) << 8) | (((uint32_t)p->reason_bytes[3])); grpc_error *error = GRPC_ERROR_NONE; - if (reason != GRPC_HTTP2_NO_ERROR) { + if (reason != GRPC_HTTP2_NO_ERROR || s->header_frames_received < 2) { error = grpc_error_set_int(GRPC_ERROR_CREATE("RST_STREAM"), GRPC_ERROR_INT_HTTP2_ERROR, (intptr_t)reason); } |