You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by yu...@apache.org on 2013/08/09 08:35:23 UTC
[2/3] git commit: TS-2123: Remove useless max_entries_per_buffer
option
TS-2123: Remove useless max_entries_per_buffer option
When the configurable value of max_entries_per_buffer in LogHost is
smaller that LogClient, it'll lead to log dropped silently.
Actually, after we fix https://issues.apache.org/jira/browse/TS-2122 issue,
the max_entries_per_buffer option is unnecessary now.
Let's remove it to avoid traps caused by it.
Signed-off-by: Yunkai Zhang <qi...@taobao.com>
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3c49b11e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3c49b11e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3c49b11e
Branch: refs/heads/master
Commit: 3c49b11ed3ab7c436db408af43be253f96c02ce4
Parents: c0354fb
Author: Yunkai Zhang <qi...@taobao.com>
Authored: Fri Aug 9 12:32:15 2013 +0800
Committer: Yunkai Zhang <qi...@taobao.com>
Committed: Fri Aug 9 14:29:45 2013 +0800
----------------------------------------------------------------------
mgmt/RecordsConfig.cc | 2 --
proxy/logging/LogBuffer.cc | 9 ++++-----
proxy/logging/LogBuffer.h | 1 -
proxy/logging/LogConfig.cc | 8 --------
proxy/logging/LogConfig.h | 1 -
5 files changed, 4 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c49b11e/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index bf4b9ee..23e3c82 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1079,8 +1079,6 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.log.log_buffer_size", RECD_INT, "9216", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.log.max_entries_per_buffer", RECD_INT, "200", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
{RECT_CONFIG, "proxy.config.log.max_secs_per_buffer", RECD_INT, "5", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.log.max_space_mb_for_logs", RECD_INT, "2500", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c49b11e/proxy/logging/LogBuffer.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index f81dffa..d1714ab 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -128,7 +128,7 @@ LogBufferHeader::log_filename()
LogBuffer::LogBuffer(LogObject * owner, size_t size, size_t buf_align, size_t write_align):
m_size(size),
m_buf_align(buf_align),
- m_write_align(write_align), m_max_entries(Log::config->max_entries_per_buffer), m_owner(owner),
+ m_write_align(write_align), m_owner(owner),
m_references(0)
{
size_t hdr_size;
@@ -158,7 +158,7 @@ LogBuffer::LogBuffer(LogObject * owner, LogBufferHeader * header):
m_buffer((char *) header),
m_size(0),
m_buf_align(LB_DEFAULT_ALIGN),
- m_write_align(INK_MIN_ALIGN), m_max_entries(0), m_expiration_time(0), m_owner(owner), m_header(header),
+ m_write_align(INK_MIN_ALIGN), m_expiration_time(0), m_owner(owner), m_header(header),
m_references(0)
{
// This constructor does not allocate a buffer because it gets it as
@@ -221,7 +221,7 @@ LogBuffer::LB_ResultCode LogBuffer::checkout_write(size_t * write_offset, size_t
// before we do
if (write_offset) {
- if (old_s.s.num_entries < m_max_entries && old_s.s.offset + actual_write_size <= m_size) {
+ if (old_s.s.offset + actual_write_size <= m_size) {
// there is room for this entry, update the state
offset = old_s.s.offset;
@@ -810,8 +810,7 @@ LogBufferIterator::next()
LogEntryHeader *entry = (LogEntryHeader *) m_next;
if (entry) {
- if (m_iter_entry_count < m_buffer_entry_count &&
- m_iter_entry_count < (unsigned) Log::config->max_entries_per_buffer) {
+ if (m_iter_entry_count < m_buffer_entry_count) {
m_next += entry->entry_len;
++m_iter_entry_count;
ret_val = entry;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c49b11e/proxy/logging/LogBuffer.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index 8f3de6b..055adec 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -196,7 +196,6 @@ private:
size_t m_buf_align; // the buffer alignment
size_t m_write_align; // the write alignment mask
- int m_max_entries; // max number of entries allowed
long m_expiration_time; // buffer expiration time
LogObject *m_owner; // the LogObject that owns this buf.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c49b11e/proxy/logging/LogConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 112e3a6..abd89f9 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -103,7 +103,6 @@ LogConfig::setup_default_values()
hostname = ats_strdup(name);
log_buffer_size = (int) (10 * LOG_KILOBYTE);
- max_entries_per_buffer = 100;
max_secs_per_buffer = 5;
max_space_mb_for_logs = 100;
max_space_mb_for_orphan_logs = 25;
@@ -207,11 +206,6 @@ LogConfig::read_configuration_variables()
log_buffer_size = val;
}
- val = (int) LOG_ConfigReadInteger("proxy.config.log.max_entries_per_buffer");
- if (val > 0) {
- max_entries_per_buffer = val;
- }
-
val = (int) LOG_ConfigReadInteger("proxy.config.log.max_secs_per_buffer");
if (val > 0) {
max_secs_per_buffer = val;
@@ -771,7 +765,6 @@ LogConfig::display(FILE * fd)
fprintf(fd, "-----------------------------\n");
fprintf(fd, "Config variables:\n");
fprintf(fd, " log_buffer_size = %d\n", log_buffer_size);
- fprintf(fd, " max_entries_per_buffer = %d\n", max_entries_per_buffer);
fprintf(fd, " max_secs_per_buffer = %d\n", max_secs_per_buffer);
fprintf(fd, " max_space_mb_for_logs = %d\n", max_space_mb_for_logs);
fprintf(fd, " max_space_mb_for_orphan_logs = %d\n", max_space_mb_for_orphan_logs);
@@ -1223,7 +1216,6 @@ LogConfig::register_config_callbacks()
// Note: variables that are not exposed in the UI are commented out
//
LOG_RegisterConfigUpdateFunc("proxy.config.log.log_buffer_size", &LogConfig::reconfigure, NULL);
- LOG_RegisterConfigUpdateFunc("proxy.config.log.max_entries_per_buffer", &LogConfig::reconfigure, NULL);
// LOG_RegisterConfigUpdateFunc ("proxy.config.log.max_secs_per_buffer",
// &LogConfig::reconfigure, NULL);
LOG_RegisterConfigUpdateFunc("proxy.config.log.max_space_mb_for_logs", &LogConfig::reconfigure, NULL);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3c49b11e/proxy/logging/LogConfig.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h
index 4fd23d1..11f5b01 100644
--- a/proxy/logging/LogConfig.h
+++ b/proxy/logging/LogConfig.h
@@ -197,7 +197,6 @@ public:
LogFormatList global_format_list;
int log_buffer_size;
- int max_entries_per_buffer;
int max_secs_per_buffer;
int max_space_mb_for_logs;
int max_space_mb_for_orphan_logs;