Repository: trafficserver Updated Branches: refs/heads/master de7a7b41e -> b9cbffcb2
change error trace to debug for spdy stream error caused by normal race condition during cleanup in error scenarios. Also, trimmed some very long debug lines. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b9cbffcb Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b9cbffcb Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b9cbffcb Branch: refs/heads/master Commit: b9cbffcb294722acc070bb0f377610b395ca04ca Parents: de7a7b4 Author: Sudheer Vinukonda <[email protected]> Authored: Thu Jan 29 21:38:10 2015 +0000 Committer: Sudheer Vinukonda <[email protected]> Committed: Thu Jan 29 21:38:10 2015 +0000 ---------------------------------------------------------------------- proxy/http/HttpSM.cc | 3 ++- proxy/http/HttpSessionAccept.cc | 3 ++- proxy/http/HttpTransact.cc | 3 ++- proxy/spdy/SpdyCallbacks.cc | 3 ++- proxy/spdy/SpdyClientSession.cc | 12 +++++++++--- 5 files changed, 17 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b9cbffcb/proxy/http/HttpSM.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 88cbe4f..9f0b6a3 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -3109,7 +3109,8 @@ HttpSM::is_bg_fill_necessary(HttpTunnelConsumer * c) if (pDone <= 1.0 && pDone > t_state.txn_conf->background_fill_threshold) { return true; } else { - DebugSM("http", "[%" PRId64 "] no background. Only %%%f of %%%f done [%" PRId64 " / %" PRId64" ]", sm_id, pDone, t_state.txn_conf->background_fill_threshold, ua_body_done, ua_cl); + DebugSM("http", "[%" PRId64 "] no background. Only %%%f of %%%f done [%" + PRId64 " / %" PRId64" ]", sm_id, pDone, t_state.txn_conf->background_fill_threshold, ua_body_done, ua_cl); } } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b9cbffcb/proxy/http/HttpSessionAccept.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpSessionAccept.cc b/proxy/http/HttpSessionAccept.cc index 8a81167..2eb647c 100644 --- a/proxy/http/HttpSessionAccept.cc +++ b/proxy/http/HttpSessionAccept.cc @@ -56,7 +56,8 @@ HttpSessionAccept::accept(NetVConnection * netvc, MIOBuffer * iobuf, IOBufferRea if (is_debug_tag_set("http_seq")) { - Debug("http_seq", "[HttpSessionAccept:mainEvent %p] accepted connection from %s transport type = %d", netvc, ats_ip_nptop(client_ip, ipb, sizeof(ipb)), netvc->attributes); + Debug("http_seq", "[HttpSessionAccept:mainEvent %p] accepted connection from %s transport type = %d", + netvc, ats_ip_nptop(client_ip, ipb, sizeof(ipb)), netvc->attributes); } HttpClientSession *new_session = THREAD_ALLOC_INIT(httpClientSessionAllocator, this_ethread()); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b9cbffcb/proxy/http/HttpTransact.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index 3bd3af5..eaa3a89 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -6421,7 +6421,8 @@ HttpTransact::process_quick_http_filter(State* s, int method) if (deny_request) { if (is_debug_tag_set("ip-allow")) { ip_text_buffer ipb; - Debug("ip-allow", "Quick filter denial on %s:%s with mask %x", ats_ip_ntop(&s->client_info.addr.sa, ipb, sizeof(ipb)), hdrtoken_index_to_wks(method), acl_record ? acl_record->_method_mask : 0x0); + Debug("ip-allow", "Quick filter denial on %s:%s with mask %x", ats_ip_ntop(&s->client_info.addr.sa, ipb, sizeof(ipb)), + hdrtoken_index_to_wks(method), acl_record ? acl_record->_method_mask : 0x0); } s->client_connection_enabled = false; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b9cbffcb/proxy/spdy/SpdyCallbacks.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyCallbacks.cc b/proxy/spdy/SpdyCallbacks.cc index 138af6b..28d8d2d 100644 --- a/proxy/spdy/SpdyCallbacks.cc +++ b/proxy/spdy/SpdyCallbacks.cc @@ -54,7 +54,8 @@ spdy_prepare_status_response_and_clean_request(SpdyClientSession *sm, int stream { SpdyRequest *req = sm->find_request(stream_id); if (!req) { - Error ("spdy_prepare_status_response_and_clean_request, req object null for sm %" PRId64 ", stream_id %d", + Debug ("spdy_error", "spdy_prepare_status_response_and_clean_request," + "req object null for sm %" PRId64 ", stream_id %d", sm->sm_id, stream_id); return; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b9cbffcb/proxy/spdy/SpdyClientSession.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc index 0788094..7f2c6b6 100644 --- a/proxy/spdy/SpdyClientSession.cc +++ b/proxy/spdy/SpdyClientSession.cc @@ -339,14 +339,18 @@ spdy_process_fetch(TSEvent event, SpdyClientSession *sm, void *edata) if (req->fetch_body_completed) ret = 0; // Ignore fetch errors after FETCH BODY DONE else { - Debug("spdy_error", "spdy_process_fetch fetch error, fetch_sm %p, ret %d for sm_id %" PRId64 ", stream_id %u, req time %" PRId64 ", url %s", req->fetch_sm, ret, sm->sm_id, req->stream_id, req->start_time, req->url.c_str()); + Debug("spdy_error", "spdy_process_fetch fetch error, fetch_sm %p, ret %d for sm_id %" + PRId64 ", stream_id %u, req time %" PRId64 ", url %s", req->fetch_sm, ret, + sm->sm_id, req->stream_id, req->start_time, req->url.c_str()); req->fetch_sm = NULL; } break; } if (ret) { - Debug("spdy_error", "spdy_process_fetch sending STATUS_500, fetch_sm %p, ret %d for sm_id %" PRId64 ", stream_id %u, req time %" PRId64 ", url %s", req->fetch_sm, ret, sm->sm_id, req->stream_id, req->start_time, req->url.c_str()); + Debug("spdy_error", "spdy_process_fetch sending STATUS_500, fetch_sm %p, ret %d for sm_id %" + PRId64 ", stream_id %u, req time %" PRId64 ", url %s", req->fetch_sm, ret, sm->sm_id, + req->stream_id, req->start_time, req->url.c_str()); spdy_prepare_status_response_and_clean_request(sm, req->stream_id, STATUS_500); } @@ -372,7 +376,9 @@ spdy_process_fetch_header(TSEvent /*event*/, SpdyClientSession *sm, TSFetchSM fe SPDYLAY_CTRL_FLAG_NONE, req->stream_id, spdy_nv.nv); } else { - Error("spdy_process_fetch_header, sm->session NULL, sm_id %" PRId64 ", fetch_sm %p, stream_id %d, req_time %" PRId64 ", url %s", sm->sm_id, fetch_sm, req->stream_id, req->start_time, req->url.c_str()); + Error("spdy_process_fetch_header, sm->session NULL, sm_id %" PRId64 ", fetch_sm %p," + "stream_id %d, req_time %" PRId64 ", url %s", sm->sm_id, fetch_sm, req->stream_id, + req->start_time, req->url.c_str()); } TSVIOReenable(sm->write_vio);
