TS-3503: updated CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/46b4daa5 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/46b4daa5 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/46b4daa5 Branch: refs/heads/master Commit: 46b4daa557026f84c7d93e2ba2bd0de016171e14 Parents: 480d34e Author: Bryan Call <[email protected]> Authored: Tue Apr 7 10:21:00 2015 -0700 Committer: Bryan Call <[email protected]> Committed: Tue Apr 7 10:21:00 2015 -0700 ---------------------------------------------------------------------- CHANGES | 3 +++ proxy/logging/LogObject.cc | 5 +++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/46b4daa5/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index ac96f36..4503a37 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 6.0.0 + *) [TS-3503] Add ua_first_read to milestones to track when the first byte was + read from the client + *) [TS-3450]: rename header_rewrite condition INTERNAL-TRANSACTION as INTERNAL-TXN in-line with the changes in [TS-3449] http://git-wip-us.apache.org/repos/asf/trafficserver/blob/46b4daa5/proxy/logging/LogObject.cc ---------------------------------------------------------------------- diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc index 83b86a0..414d9b5 100644 --- a/proxy/logging/LogObject.cc +++ b/proxy/logging/LogObject.cc @@ -383,6 +383,7 @@ LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed) LogBuffer *buffer; LogBuffer *new_buffer; bool retry = true; + uint32_t count = 0; do { // To avoid a race condition, we keep a count of held references in @@ -390,6 +391,7 @@ LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed) head_p h; int result = 0; do { + ++count; INK_QUEUE_LD(h, m_log_buffer); head_p new_h; SET_FREELIST_POINTER_VERSION(new_h, FREELIST_POINTER(h), FREELIST_VERSION(h) + 1); @@ -488,6 +490,9 @@ LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed) if (result_code == LogBuffer::LB_BUFFER_TOO_SMALL) { buffer = NULL; } + if (count > 1) { + Error("spinning too much in logging %d", count); + } return buffer; }
