You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by cm...@apache.org on 2026/01/12 16:24:23 UTC
(trafficserver) branch 10.1.x updated (c28a5da23b -> 4fdd9eb779)
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a change to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
from c28a5da23b regex_remap: Document host option // prefix behavior (#12730)
new 8596f03a5b block_errors: Fix plugin message handling (#12757)
new adf871b4cf Use malloc allocated buffers for h2 headers if enabled (#12767)
new 4fdd9eb779 Fix convert2yaml.py to handle files without trailing newline (#12784)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
include/proxy/http2/Http2CommonSession.h | 4 +
include/proxy/http2/Http2Stream.h | 10 +-
plugins/experimental/block_errors/block_errors.cc | 40 +++--
.../pluginTest/block_errors/block_errors.test.py | 176 +++++++++++++++++++++
tests/gold_tests/records/gold/no_newline.yaml | 3 +
.../records/legacy_config/no_newline.config | 1 +
.../records/records_config_to_yaml.test.py | 9 ++
tools/records/convert2yaml.py | 4 +-
8 files changed, 230 insertions(+), 17 deletions(-)
create mode 100644 tests/gold_tests/pluginTest/block_errors/block_errors.test.py
create mode 100644 tests/gold_tests/records/gold/no_newline.yaml
create mode 100644 tests/gold_tests/records/legacy_config/no_newline.config
(trafficserver) 01/03: block_errors: Fix plugin message handling (#12757)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 8596f03a5b93d527c4a1eaf98c3c2ddad82517a5
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Tue Jan 6 16:48:35 2026 -0600
block_errors: Fix plugin message handling (#12757)
The msg_hook handler was not verifying the event type and was
incorrectly logging errors for messages intended for other plugins. ATS
core broadcasts all plugin messages to all registered handlers, so each
plugin must filter for its own messages. Added TS_EVENT_LIFECYCLE_MSG
check, filter messages by 'block_errors' target prefix, and used TextView
to parse target/command.
(cherry picked from commit 7e366fa067f4916dbcec802eae049c0aea0acef6)
---
plugins/experimental/block_errors/block_errors.cc | 40 +++--
.../pluginTest/block_errors/block_errors.test.py | 176 +++++++++++++++++++++
2 files changed, 204 insertions(+), 12 deletions(-)
diff --git a/plugins/experimental/block_errors/block_errors.cc b/plugins/experimental/block_errors/block_errors.cc
index 88fe3bf57a..aff6acbee6 100644
--- a/plugins/experimental/block_errors/block_errors.cc
+++ b/plugins/experimental/block_errors/block_errors.cc
@@ -20,6 +20,7 @@
#include <unordered_map>
#include <limits>
#include <swoc/IPAddr.h>
+#include <swoc/TextView.h>
#include <swoc/bwf_ip.h>
#include <unistd.h>
#include <arpa/inet.h>
@@ -37,31 +38,46 @@ static bool enabled = true;
//-------------------------------------------------------------------------
static int
-msg_hook(TSCont * /* contp ATS_UNUSED */, TSEvent /* event ATS_UNUSED */, void *edata)
+msg_hook(TSCont * /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
- TSPluginMsg *msg = static_cast<TSPluginMsg *>(edata);
- std::string_view tag(static_cast<const char *>(msg->tag));
- std::string_view data(static_cast<const char *>(msg->data));
+ if (event != TS_EVENT_LIFECYCLE_MSG) {
+ TSError("block_errors: unexpected event %d", event);
+ return TS_EVENT_NONE;
+ }
+
+ TSPluginMsg *msg = static_cast<TSPluginMsg *>(edata);
+ swoc::TextView message{msg->tag, strlen(msg->tag)};
+ swoc::TextView target = message.take_prefix_at('.');
+ swoc::TextView command = message;
+
+ // Filter for messages meant for this plugin.
+ if (target != "block_errors") {
+ Dbg(dbg_ctl, "msg_hook: message for a different plugin: %.*s", static_cast<int>(target.size()), target.data());
+ return TS_EVENT_NONE;
+ }
+
+ swoc::TextView data{static_cast<const char *>(msg->data), msg->data_size};
- Dbg(dbg_ctl, "msg_hook: tag=%s data=%s", tag.data(), data.data());
+ Dbg(dbg_ctl, "msg_hook: command=%.*s data=%.*s", static_cast<int>(command.size()), command.data(), static_cast<int>(data.size()),
+ data.data());
- if (tag == "block_errors.enabled") {
+ if (command == "enabled") {
enabled = static_cast<bool>(atoi(data.data()));
- } else if (tag == "block_errors.limit") {
+ } else if (command == "limit") {
RESET_LIMIT = atoi(data.data());
- } else if (tag == "block_errors.cycles") {
+ } else if (command == "cycles") {
TIMEOUT_CYCLES = atoi(data.data());
- } else if (tag == "block_errors.shutdown") {
+ } else if (command == "shutdown") {
shutdown_connection = static_cast<bool>(atoi(data.data()));
} else {
- Dbg(dbg_ctl, "msg_hook: unknown message tag '%s'", tag.data());
- TSError("block_errors: unknown message tag '%s'", tag.data());
+ Dbg(dbg_ctl, "msg_hook: unknown command '%.*s'", static_cast<int>(command.size()), command.data());
+ TSError("block_errors: unknown command '%.*s'", static_cast<int>(command.size()), command.data());
}
Dbg(dbg_ctl, "reset limit: %d per minute, timeout limit: %d minutes, shutdown connection: %d enabled: %d", RESET_LIMIT,
TIMEOUT_CYCLES, shutdown_connection, enabled);
- return 0;
+ return TS_EVENT_NONE;
}
//-------------------------------------------------------------------------
diff --git a/tests/gold_tests/pluginTest/block_errors/block_errors.test.py b/tests/gold_tests/pluginTest/block_errors/block_errors.test.py
new file mode 100644
index 0000000000..c50869356d
--- /dev/null
+++ b/tests/gold_tests/pluginTest/block_errors/block_errors.test.py
@@ -0,0 +1,176 @@
+"""
+Verify block_errors plugin message handling.
+"""
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+Test.Summary = '''
+Verify block_errors plugin message handling via traffic_ctl.
+'''
+
+Test.SkipUnless(Condition.PluginExists('block_errors.so'),)
+
+# Define ATS and configure it.
+ts = Test.MakeATSProcess("ts")
+
+ts.Disk.records_config.update({
+ 'proxy.config.diags.debug.enabled': 1,
+ 'proxy.config.diags.debug.tags': 'block_errors',
+})
+
+# Configure block_errors plugin with initial values.
+ts.Disk.plugin_config.AddLine('block_errors.so')
+
+# Verify the plugin loads.
+ts.Disk.diags_log.Content = Testers.ContainsExpression(
+ "loading plugin.*block_errors.so", "Verify the block_errors plugin got loaded.")
+
+#
+# Test 1: Verify the plugin starts with default values.
+#
+tr = Test.AddTestRun("Verify plugin starts with default values.")
+tr.Processes.Default.Command = "echo verifying plugin starts with default values"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.StartBefore(ts)
+tr.StillRunningAfter = ts
+
+# Verify the default values are logged at startup.
+ts.Disk.traffic_out.Content = Testers.ContainsExpression(
+ "reset limit: 1000 per minute, timeout limit: 4 minutes, shutdown connection: 0 enabled: 1",
+ "Verify block_errors starts with default values.")
+
+#
+# Test 2: Verify changing the 'enabled' setting via traffic_ctl.
+#
+tr = Test.AddTestRun("Verify changing 'enabled' via traffic_ctl.")
+tr.Processes.Default.Command = "traffic_ctl plugin msg block_errors.enabled 0"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.StillRunningAfter = ts
+
+tr = Test.AddTestRun("Await the enabled change.")
+tr.Processes.Default.Command = "echo awaiting enabled change"
+tr.Processes.Default.ReturnCode = 0
+await_enabled = tr.Processes.Process('await_enabled', 'sleep 30')
+await_enabled.Ready = When.FileContains(ts.Disk.traffic_out.Name, "msg_hook: command=enabled data=0")
+tr.Processes.Default.StartBefore(await_enabled)
+
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "msg_hook: command=enabled data=0", "Verify block_errors received the enabled command.")
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "reset limit: 1000 per minute, timeout limit: 4 minutes, shutdown connection: 0 enabled: 0",
+ "Verify block_errors applied the enabled=0 setting.")
+
+#
+# Test 3: Verify changing the 'limit' setting via traffic_ctl.
+#
+tr = Test.AddTestRun("Verify changing 'limit' via traffic_ctl.")
+tr.Processes.Default.Command = "traffic_ctl plugin msg block_errors.limit 500"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.StillRunningAfter = ts
+
+tr = Test.AddTestRun("Await the limit change.")
+tr.Processes.Default.Command = "echo awaiting limit change"
+tr.Processes.Default.ReturnCode = 0
+await_limit = tr.Processes.Process('await_limit', 'sleep 30')
+await_limit.Ready = When.FileContains(ts.Disk.traffic_out.Name, "msg_hook: command=limit data=500")
+tr.Processes.Default.StartBefore(await_limit)
+
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "msg_hook: command=limit data=500", "Verify block_errors received the limit command.")
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "reset limit: 500 per minute", "Verify block_errors applied the limit=500 setting.")
+
+#
+# Test 4: Verify changing the 'cycles' setting via traffic_ctl.
+#
+tr = Test.AddTestRun("Verify changing 'cycles' via traffic_ctl.")
+tr.Processes.Default.Command = "traffic_ctl plugin msg block_errors.cycles 8"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.StillRunningAfter = ts
+
+tr = Test.AddTestRun("Await the cycles change.")
+tr.Processes.Default.Command = "echo awaiting cycles change"
+tr.Processes.Default.ReturnCode = 0
+await_cycles = tr.Processes.Process('await_cycles', 'sleep 30')
+await_cycles.Ready = When.FileContains(ts.Disk.traffic_out.Name, "msg_hook: command=cycles data=8")
+tr.Processes.Default.StartBefore(await_cycles)
+
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "msg_hook: command=cycles data=8", "Verify block_errors received the cycles command.")
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "timeout limit: 8 minutes", "Verify block_errors applied the cycles=8 setting.")
+
+#
+# Test 5: Verify changing the 'shutdown' setting via traffic_ctl.
+#
+tr = Test.AddTestRun("Verify changing 'shutdown' via traffic_ctl.")
+tr.Processes.Default.Command = "traffic_ctl plugin msg block_errors.shutdown 1"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.StillRunningAfter = ts
+
+tr = Test.AddTestRun("Await the shutdown change.")
+tr.Processes.Default.Command = "echo awaiting shutdown change"
+tr.Processes.Default.ReturnCode = 0
+await_shutdown = tr.Processes.Process('await_shutdown', 'sleep 30')
+await_shutdown.Ready = When.FileContains(ts.Disk.traffic_out.Name, "msg_hook: command=shutdown data=1")
+tr.Processes.Default.StartBefore(await_shutdown)
+
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "msg_hook: command=shutdown data=1", "Verify block_errors received the shutdown command.")
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "shutdown connection: 1", "Verify block_errors applied the shutdown=1 setting.")
+
+#
+# Test 6: Verify an unknown command is handled gracefully.
+#
+tr = Test.AddTestRun("Verify unknown command is handled gracefully.")
+tr.Processes.Default.Command = "traffic_ctl plugin msg block_errors.unknown_command test"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.StillRunningAfter = ts
+
+tr = Test.AddTestRun("Await the unknown command response.")
+tr.Processes.Default.Command = "echo awaiting unknown command response"
+tr.Processes.Default.ReturnCode = 0
+await_unknown = tr.Processes.Process('await_unknown', 'sleep 30')
+await_unknown.Ready = When.FileContains(ts.Disk.traffic_out.Name, "msg_hook: unknown command 'unknown_command'")
+tr.Processes.Default.StartBefore(await_unknown)
+
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "msg_hook: unknown command 'unknown_command'", "Verify block_errors logs unknown commands.")
+
+#
+# Test 7: Verify messages for other plugins are ignored.
+#
+tr = Test.AddTestRun("Verify messages for other plugins are ignored.")
+tr.Processes.Default.Command = "traffic_ctl plugin msg other_plugin.command test"
+tr.Processes.Default.ReturnCode = 0
+tr.Processes.Default.Env = ts.Env
+tr.StillRunningAfter = ts
+
+tr = Test.AddTestRun("Await the other plugin message response.")
+tr.Processes.Default.Command = "echo awaiting other plugin message response"
+tr.Processes.Default.ReturnCode = 0
+await_other = tr.Processes.Process('await_other', 'sleep 30')
+await_other.Ready = When.FileContains(ts.Disk.traffic_out.Name, "msg_hook: message for a different plugin: other_plugin")
+tr.Processes.Default.StartBefore(await_other)
+
+ts.Disk.traffic_out.Content += Testers.ContainsExpression(
+ "msg_hook: message for a different plugin: other_plugin", "Verify block_errors ignores messages for other plugins.")
(trafficserver) 03/03: Fix convert2yaml.py to handle files without trailing newline (#12784)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 4fdd9eb7792dc8c8c5913101e83d15f88e178a84
Author: Bryan Call <bc...@apache.org>
AuthorDate: Wed Jan 7 15:57:33 2026 -0800
Fix convert2yaml.py to handle files without trailing newline (#12784)
The script was using value[:-1] to strip the trailing newline, which
incorrectly truncates the last character if the file doesn't end with
a newline. Changed to value.rstrip('\n') which properly handles both
cases.
Added test case for config files without trailing newlines.
(cherry picked from commit dea3657c624f58a495a7089ee2088a5b9cb29f42)
---
tests/gold_tests/records/gold/no_newline.yaml | 3 +++
tests/gold_tests/records/legacy_config/no_newline.config | 1 +
tests/gold_tests/records/records_config_to_yaml.test.py | 9 +++++++++
tools/records/convert2yaml.py | 4 ++--
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/tests/gold_tests/records/gold/no_newline.yaml b/tests/gold_tests/records/gold/no_newline.yaml
new file mode 100644
index 0000000000..82f26fe64f
--- /dev/null
+++ b/tests/gold_tests/records/gold/no_newline.yaml
@@ -0,0 +1,3 @@
+records:
+ http:
+ negative_caching_enabled: 0
diff --git a/tests/gold_tests/records/legacy_config/no_newline.config b/tests/gold_tests/records/legacy_config/no_newline.config
new file mode 100644
index 0000000000..ace091af5e
--- /dev/null
+++ b/tests/gold_tests/records/legacy_config/no_newline.config
@@ -0,0 +1 @@
+CONFIG proxy.config.http.negative_caching_enabled INT 0
\ No newline at end of file
diff --git a/tests/gold_tests/records/records_config_to_yaml.test.py b/tests/gold_tests/records/records_config_to_yaml.test.py
index 5996422958..49836a9d75 100644
--- a/tests/gold_tests/records/records_config_to_yaml.test.py
+++ b/tests/gold_tests/records/records_config_to_yaml.test.py
@@ -56,3 +56,12 @@ tr.Processes.Default.Command = f'python3 convert2yaml.py -f override_map.config
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
"We cannot continue with 'proxy.config.ssl.client.verify.server' at line '3' as an existing YAML map will be overridden.",
"Error should be present")
+
+file_suffix = file_suffix + 1
+
+tr = Test.AddTestRun("Test config file without trailing newline")
+tr.Setup.Copy(os.path.join(Test.Variables.RepoDir, "tools/records/convert2yaml.py"))
+tr.Setup.Copy('legacy_config/no_newline.config')
+tr.Processes.Default.Command = f'python3 convert2yaml.py -f no_newline.config --output generated{file_suffix}.yaml --yaml --mute'
+f = tr.Disk.File(f"generated{file_suffix}.yaml")
+f.Content = "gold/no_newline.yaml"
diff --git a/tools/records/convert2yaml.py b/tools/records/convert2yaml.py
index 0643715c08..9708f958d9 100755
--- a/tools/records/convert2yaml.py
+++ b/tools/records/convert2yaml.py
@@ -270,8 +270,8 @@ def handle_file_input(args):
elif args.node and name.startswith("proxy.node."):
name = name[len("proxy."):]
- # Build the object
- add_object(config, name, value[:-1], type, track_info)
+ # Build the object (use rstrip to handle files without trailing newline)
+ add_object(config, name, value.rstrip('\n'), type, track_info)
idx = idx + 1
ts = {}
(trafficserver) 02/03: Use malloc allocated buffers for h2 headers if enabled (#12767)
Posted by cm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit adf871b4cfade68def929b8204202398f641e531
Author: Chris McFarlen <ch...@mcfarlen.us>
AuthorDate: Tue Jan 6 11:36:21 2026 -0600
Use malloc allocated buffers for h2 headers if enabled (#12767)
(cherry picked from commit c98e6e347c6065cbaeb89bacd2f924bc1495cd71)
---
include/proxy/http2/Http2CommonSession.h | 4 ++++
include/proxy/http2/Http2Stream.h | 10 +++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/proxy/http2/Http2CommonSession.h b/include/proxy/http2/Http2CommonSession.h
index cb61107fe9..0b1d9b8112 100644
--- a/include/proxy/http2/Http2CommonSession.h
+++ b/include/proxy/http2/Http2CommonSession.h
@@ -60,7 +60,11 @@ enum class Http2SsnMilestone {
LAST_ENTRY,
};
+#if TS_USE_MALLOC_ALLOCATOR
+size_t const HTTP2_HEADER_BUFFER_SIZE_INDEX = BUFFER_SIZE_INDEX_FOR_XMALLOC_SIZE(4096);
+#else
size_t const HTTP2_HEADER_BUFFER_SIZE_INDEX = BUFFER_SIZE_INDEX_4K;
+#endif
/**
@startuml
diff --git a/include/proxy/http2/Http2Stream.h b/include/proxy/http2/Http2Stream.h
index ccc462488a..a7b9fe170a 100644
--- a/include/proxy/http2/Http2Stream.h
+++ b/include/proxy/http2/Http2Stream.h
@@ -209,10 +209,14 @@ private:
Http2StreamState _state = Http2StreamState::HTTP2_STREAM_STATE_IDLE;
int64_t _http_sm_id = -1;
- HTTPHdr _receive_header;
+ HTTPHdr _receive_header;
+#if TS_USE_MALLOC_ALLOCATOR
+ MIOBuffer _receive_buffer{BUFFER_SIZE_INDEX_FOR_XMALLOC_SIZE(4096)};
+#else
MIOBuffer _receive_buffer{BUFFER_SIZE_INDEX_4K};
- VIO read_vio;
- VIO write_vio;
+#endif
+ VIO read_vio;
+ VIO write_vio;
History<HISTORY_DEFAULT_SIZE> _history;
Milestones<Http2StreamMilestone, static_cast<size_t>(Http2StreamMilestone::LAST_ENTRY)> _milestones;