From 223adee0b476a098c07c56be54f651e1f778380d Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Wed, 28 Feb 2024 15:25:51 +0700 Subject: [PATCH 1/9] update branch, commit ats --- traffic_server/_tsb/repos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traffic_server/_tsb/repos.yml b/traffic_server/_tsb/repos.yml index 1532f2df64..f09ccb0fbd 100644 --- a/traffic_server/_tsb/repos.yml +++ b/traffic_server/_tsb/repos.yml @@ -1,7 +1,7 @@ ats: src: https://github.com/apache/trafficserver - branch: 8.0.x - head: a29528dffb8ea1c6fa57fe0c76ca1ec9d0f08694 + branch: 9.2.x + head: 181593ccf552f9cb4e05b86801a3d68fac7ba3d0 extra: - https://github.com/jrushford/trafficserver - https://github.com/traeak/trafficserver From 2c8271a084bcb1597115a2331bc04d8bc5518730 Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Thu, 7 Mar 2024 17:25:44 +0700 Subject: [PATCH 2/9] update ats tsb patches, branch --- traffic_server/_tsb/patches.yml | 13 +------------ traffic_server/_tsb/repos.yml | 6 ++---- traffic_server/_tsb/trafficserver.spec | 5 +++++ .../plugins/astats_over_http/astats_over_http.c | 4 ---- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/traffic_server/_tsb/patches.yml b/traffic_server/_tsb/patches.yml index e6657a014d..582292b939 100644 --- a/traffic_server/_tsb/patches.yml +++ b/traffic_server/_tsb/patches.yml @@ -1,15 +1,4 @@ -ats: - - f5ac00f3606bd826c52552e59f067d3fe3fcda33 # <2018-09-11T17:18:30+00:00!jrushford@apache.org> For Nexthop, add the capability to mark down origin servers utilizing traffic_ctl. - - 721f8ffca6ee8782573084c671e45ce392d239ef # <2018-06-21T17:21:58+00:00!jrushford@apache.org> add a reason tag to traffic_control host subcommand. - - d295784ba57af7e8e2dba09b85a1cbcaacf797f3 # <2019-05-16T19:33:17+00:00!jrushford@apache.org> Add an ignore_self_detect flag to parent.config so that the local cache host may be a member of a peering cache group. - - ef57a68f4f9d6f6dd5563cff82cddb8adcb8c28c # <2020-05-16T00:05:44+00:00!brian_olsen2@comcast.com> forward port of slice plugin from ats7 - - abe7a933e403b88f1b13ab7f2ebdd6ce95202b42 # <2019-04-02T13:25:48+00:00!brian_olsen2@comcast.com> url_sig debug fix for when url is missing the signature query string - - 9ac557ba3c0f28979c996cb49a827940bfb569d8 # <2019-09-30T19:04:12+00:00!brian_olsen2@comcast.com> url_sig: fix memory leak with urlParse and pristine flag - - 72e582d3de630008641e7849f7cd42b11f6f081b # <2019-02-04T12:47:10-08:00!randallmeyer@yahoo.com> lua plugin: add support for relative path scripts; moves inline script to switch - - ad33e0fff0091093cd31fcfd429933299cb8bf5b # <2020-02-07T00:44:14-08:00!kichan@apache.org> Fix for lua plugin coredump problem during reload - - 1f13f346ef9ae4c0035f5755af4fd28b6f84f1e0 # <2020-04-20T14:59:44-06:00!brian_olsen2@comcast.com> code and documentation for lua states configuration and stats printing (#6571) - - fc66eea820c8ba44196f2051aa41aedd7b874b0b # <2020-03-16T19:30:54+00:00!jrushford@apache.org> Fixes a bug where getHostStatus() will create a host status record when none is found. A Host status record should only be created when a host is marked up or down when traffic_ctl is used to mark a host up or down. - - 5b38fb26737b38267615102775d81136a843075c # <2020-07-01T13:59:15+00:00!brian_olsen2@comcast.com> CacheRead: clear dir entry if doc is found to be truncated +ats: [] openssl: - ec6788fb8ca0704b503c3a0030a142d9805895a6 # <2018-09-18T17:45:39+01:00!matt@openssl.org> Delay setting the sig algs until after the cert_cb has been called trafficcontrol: [] diff --git a/traffic_server/_tsb/repos.yml b/traffic_server/_tsb/repos.yml index f09ccb0fbd..399204adc1 100644 --- a/traffic_server/_tsb/repos.yml +++ b/traffic_server/_tsb/repos.yml @@ -1,10 +1,8 @@ ats: src: https://github.com/apache/trafficserver branch: 9.2.x - head: 181593ccf552f9cb4e05b86801a3d68fac7ba3d0 - extra: - - https://github.com/jrushford/trafficserver - - https://github.com/traeak/trafficserver + head: b4e3c73354d2a104ed6f00379eeb9f121a85e8bb # 9.2.3 + extra: [] cjose: src: https://github.com/cisco/cjose branch: master diff --git a/traffic_server/_tsb/trafficserver.spec b/traffic_server/_tsb/trafficserver.spec index 9d27aba5c4..bda6be47a5 100644 --- a/traffic_server/_tsb/trafficserver.spec +++ b/traffic_server/_tsb/trafficserver.spec @@ -148,8 +148,13 @@ fi %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ssl_server_name.yaml %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/storage.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/volume.config +%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ip_allow.yaml +%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/sni.yaml +%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/strategies.yaml %changelog +* Thu Mar 7 2024 The Anh Nguyen +- Modified to support ATS 9.2.3 * Wed Mar 10 2021 Jonathan Gray - Modified to support stop bundling openssl with ats * Wed Aug 26 2020 Chris Lemmons diff --git a/traffic_server/plugins/astats_over_http/astats_over_http.c b/traffic_server/plugins/astats_over_http/astats_over_http.c index a538344be8..c9759d39c0 100644 --- a/traffic_server/plugins/astats_over_http/astats_over_http.c +++ b/traffic_server/plugins/astats_over_http/astats_over_http.c @@ -917,11 +917,7 @@ static void load_config_file(config_holder_t *config_holder) { TSDebug(PLUGIN_TAG, "scheduling free: %p (%p)", oldconfig, newconfig); free_cont = TSContCreate(free_handler, TSMutexCreate()); TSContDataSet(free_cont, (void *) oldconfig); -#if TS_VERSION_MAJOR < 9 - TSContSchedule(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); -#else TSContScheduleOnPool(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); -#endif } } if(fh) From 0c065a4bef1171d682f09199b56afcae2c3d7005 Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Fri, 8 Mar 2024 10:05:29 +0700 Subject: [PATCH 3/9] fix: build astats_over_http plugin --- traffic_server/_tsb/docker-compose.yml | 2 +- traffic_server/_tsb/run.sh | 2 +- traffic_server/_tsb/trafficserver.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/traffic_server/_tsb/docker-compose.yml b/traffic_server/_tsb/docker-compose.yml index 6467a58bd6..36ded37ec9 100644 --- a/traffic_server/_tsb/docker-compose.yml +++ b/traffic_server/_tsb/docker-compose.yml @@ -31,5 +31,5 @@ services: - ./src/cjose:/opt/src/cjose:Z - ./src/openssl:/opt/src/openssl:Z - ./src/ats:/rpmbuilddir/SOURCES/src:Z - - ./src/trafficcontrol/traffic_server/plugins/astats_over_http:/opt/src/astats_over_http:Z + - ../plugins/astats_over_http:/opt/src/astats_over_http:Z - ../../dist:/rpmbuilddir/RPMS/x86_64:Z diff --git a/traffic_server/_tsb/run.sh b/traffic_server/_tsb/run.sh index 41a05c31c2..76c323f0a3 100755 --- a/traffic_server/_tsb/run.sh +++ b/traffic_server/_tsb/run.sh @@ -73,4 +73,4 @@ ED # This includes changing output redirection to traffic.out and adding udev-settle to wait for disks (sed -i 's/ExecStart=@exp_bindir@\/traffic_manager \$TM_DAEMON_ARGS/ExecStart=@exp_bindir@\/traffic_manager --bind_stdout @exp_logdir@\/traffic.out --bind_stderr @exp_logdir@\/traffic.out \$TM_DAEMON_ARGS/g' /rpmbuilddir/SOURCES/src/rc/trafficserver.service.in) (sed -i 's/After=syslog.target network.target/Wants=systemd-udev-settle.service \nAfter=syslog.target network.target systemd-udev-settle.service/g' /rpmbuilddir/SOURCES/src/rc/trafficserver.service.in) -rpmbuild -bb ${rpmbuild_openssl} --define "_topdir /rpmbuilddir" /rpmbuilddir/SPECS/trafficserver.spec || die "Failed to build rpm." +rpmbuild -bb ${rpmbuild_openssl} --define "_topdir /rpmbuilddir" --define "ats_version 9.2.3" /rpmbuilddir/SPECS/trafficserver.spec || die "Failed to build rpm." diff --git a/traffic_server/_tsb/trafficserver.spec b/traffic_server/_tsb/trafficserver.spec index bda6be47a5..d2cbeb37dd 100644 --- a/traffic_server/_tsb/trafficserver.spec +++ b/traffic_server/_tsb/trafficserver.spec @@ -136,7 +136,6 @@ fi /opt/trafficserver/etc/trafficserver/trafficserver-release %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/cache.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/hosting.config -%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ip_allow.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/logging.yaml %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/parent.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/plugin.config @@ -145,12 +144,16 @@ fi %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/socks.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/splitdns.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ssl_multicert.config -%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ssl_server_name.yaml %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/storage.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/volume.config +%if "%{ats_version}" >= "9" %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ip_allow.yaml %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/sni.yaml %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/strategies.yaml +%else +%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ip_allow.config +%config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ssl_server_name.yaml +%endif %changelog * Thu Mar 7 2024 The Anh Nguyen From df49687710203a1872ad086ccaa43a974e5b4fbf Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Fri, 8 Mar 2024 11:25:54 +0700 Subject: [PATCH 4/9] revert: check TS_VERSION_MAJOR --- traffic_server/plugins/astats_over_http/astats_over_http.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/traffic_server/plugins/astats_over_http/astats_over_http.c b/traffic_server/plugins/astats_over_http/astats_over_http.c index c9759d39c0..f6fecd0a4d 100644 --- a/traffic_server/plugins/astats_over_http/astats_over_http.c +++ b/traffic_server/plugins/astats_over_http/astats_over_http.c @@ -917,7 +917,11 @@ static void load_config_file(config_holder_t *config_holder) { TSDebug(PLUGIN_TAG, "scheduling free: %p (%p)", oldconfig, newconfig); free_cont = TSContCreate(free_handler, TSMutexCreate()); TSContDataSet(free_cont, (void *) oldconfig); - TSContScheduleOnPool(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); +#if TS_VERSION_MAJOR < 9 + TSContSchedule(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); +#else + TSContScheduleOnPool(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); +#endif } } if(fh) From ad7cd0a4d8873c2fd25a174b122c46f612ed51d4 Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Fri, 8 Mar 2024 11:31:18 +0700 Subject: [PATCH 5/9] Update astats_over_http.c --- traffic_server/plugins/astats_over_http/astats_over_http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traffic_server/plugins/astats_over_http/astats_over_http.c b/traffic_server/plugins/astats_over_http/astats_over_http.c index f6fecd0a4d..57cfc1bfef 100644 --- a/traffic_server/plugins/astats_over_http/astats_over_http.c +++ b/traffic_server/plugins/astats_over_http/astats_over_http.c @@ -918,9 +918,9 @@ static void load_config_file(config_holder_t *config_holder) { free_cont = TSContCreate(free_handler, TSMutexCreate()); TSContDataSet(free_cont, (void *) oldconfig); #if TS_VERSION_MAJOR < 9 - TSContSchedule(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); + TSContSchedule(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); #else - TSContScheduleOnPool(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); + TSContScheduleOnPool(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); #endif } } From 470d3aed1fbff92bfadee7692528874a3e56884a Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Fri, 8 Mar 2024 11:32:43 +0700 Subject: [PATCH 6/9] Update astats_over_http.c --- traffic_server/plugins/astats_over_http/astats_over_http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traffic_server/plugins/astats_over_http/astats_over_http.c b/traffic_server/plugins/astats_over_http/astats_over_http.c index 57cfc1bfef..a538344be8 100644 --- a/traffic_server/plugins/astats_over_http/astats_over_http.c +++ b/traffic_server/plugins/astats_over_http/astats_over_http.c @@ -918,9 +918,9 @@ static void load_config_file(config_holder_t *config_holder) { free_cont = TSContCreate(free_handler, TSMutexCreate()); TSContDataSet(free_cont, (void *) oldconfig); #if TS_VERSION_MAJOR < 9 - TSContSchedule(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); + TSContSchedule(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); #else - TSContScheduleOnPool(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); + TSContScheduleOnPool(free_cont, FREE_TMOUT, TS_THREAD_POOL_TASK); #endif } } From 66672c27cde1bb35a43931041c510e8b2aee4ac7 Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Fri, 8 Mar 2024 16:08:41 +0100 Subject: [PATCH 7/9] chore: update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index caded33850..4b6a547db5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#7832](https://github.com/apache/trafficcontrol/pull/7832) *t3c* Removed perl dependency - Updated the CacheGroups Traffic Portal page to use a more performant AG-Grid-based table. - Updated Go version to 1.22.0 +- [#7958] Updated build ATS to 9.2.3 ### Fixed - [#7957](https://github.com/apache/trafficcontrol/pull/7957) *Traffic Ops* Fix the incorrect display of delivery services assigned to ORG servers. From baf0cbad2cdcc7efd16f03b78445b7eedbc5cf5d Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Mon, 10 Jun 2024 09:52:51 +0700 Subject: [PATCH 8/9] update build ats to 9.2.4 --- traffic_server/_tsb/repos.yml | 2 +- traffic_server/_tsb/run.sh | 2 +- traffic_server/_tsb/trafficserver.spec | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/traffic_server/_tsb/repos.yml b/traffic_server/_tsb/repos.yml index 399204adc1..630af8ea11 100644 --- a/traffic_server/_tsb/repos.yml +++ b/traffic_server/_tsb/repos.yml @@ -1,7 +1,7 @@ ats: src: https://github.com/apache/trafficserver branch: 9.2.x - head: b4e3c73354d2a104ed6f00379eeb9f121a85e8bb # 9.2.3 + head: 90fbf13db0858cef0e0a094f445d846b60a4c1ef # 9.2.4 extra: [] cjose: src: https://github.com/cisco/cjose diff --git a/traffic_server/_tsb/run.sh b/traffic_server/_tsb/run.sh index 76c323f0a3..41a05c31c2 100755 --- a/traffic_server/_tsb/run.sh +++ b/traffic_server/_tsb/run.sh @@ -73,4 +73,4 @@ ED # This includes changing output redirection to traffic.out and adding udev-settle to wait for disks (sed -i 's/ExecStart=@exp_bindir@\/traffic_manager \$TM_DAEMON_ARGS/ExecStart=@exp_bindir@\/traffic_manager --bind_stdout @exp_logdir@\/traffic.out --bind_stderr @exp_logdir@\/traffic.out \$TM_DAEMON_ARGS/g' /rpmbuilddir/SOURCES/src/rc/trafficserver.service.in) (sed -i 's/After=syslog.target network.target/Wants=systemd-udev-settle.service \nAfter=syslog.target network.target systemd-udev-settle.service/g' /rpmbuilddir/SOURCES/src/rc/trafficserver.service.in) -rpmbuild -bb ${rpmbuild_openssl} --define "_topdir /rpmbuilddir" --define "ats_version 9.2.3" /rpmbuilddir/SPECS/trafficserver.spec || die "Failed to build rpm." +rpmbuild -bb ${rpmbuild_openssl} --define "_topdir /rpmbuilddir" /rpmbuilddir/SPECS/trafficserver.spec || die "Failed to build rpm." diff --git a/traffic_server/_tsb/trafficserver.spec b/traffic_server/_tsb/trafficserver.spec index d2cbeb37dd..8bf7f28aa8 100644 --- a/traffic_server/_tsb/trafficserver.spec +++ b/traffic_server/_tsb/trafficserver.spec @@ -146,7 +146,7 @@ fi %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ssl_multicert.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/storage.config %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/volume.config -%if "%{ats_version}" >= "9" +%if "%{tag}" >= "9" %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/ip_allow.yaml %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/sni.yaml %config(noreplace) %attr(644,ats,ats) /opt/trafficserver/etc/trafficserver/strategies.yaml @@ -157,7 +157,7 @@ fi %changelog * Thu Mar 7 2024 The Anh Nguyen -- Modified to support ATS 9.2.3 +- Modified to support ATS 9.2.x * Wed Mar 10 2021 Jonathan Gray - Modified to support stop bundling openssl with ats * Wed Aug 26 2020 Chris Lemmons From 7c01fd4e82ab0556dabe869c8a21cb9ad9b334c7 Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Mon, 10 Jun 2024 10:02:47 +0700 Subject: [PATCH 9/9] chore: update Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 152f44ab49..ebf7a82b04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#7832](https://github.com/apache/trafficcontrol/pull/7832) *t3c* Removed perl dependency - Updated the CacheGroups Traffic Portal page to use a more performant AG-Grid-based table. - Updated Go version to 1.22.0 -- [#7958] Updated build ATS to 9.2.3 +- [#7958] Updated build ATS to 9.2.4 - [#7979](https://github.com/apache/trafficcontrol/pull/7979) *Traffic Router*, *Traffic Monitor*, *Traffic Stats*: Store logs in /var/log - [#7999](https://github.com/apache/trafficcontrol/pull/7999) *Traffic Router*, *Traffic Monitor*, *Traffic Stats*: Symlink from /opt//var/log to /var/log/. These symlinks are deprecated with the intent of removing them in ATC 9.0.0. - [#7872](https://github.com/apache/trafficcontrol/issues/7872) *Traffic Router*: Updated Apache Tomcat from 9.0.43, 9.0.67, 9.0.83, and 9.0.86 to 9.0.87.