Skip to content

Commit aebef45

Browse files
authored
records.config to records.yaml (#9264)
This commit contains: * records.yaml - Rename records that will have issues when migrated to yaml. To avoid issues with fields which the main root key holds value and also children fields I had to rename them in order to make it compatible with YAML. So fields like this: proxy.config.exec_thread.autoconfig INT 1 << can’t have value and children fields proxy.config.exec_thread.autoconfig.scale FLOAT 1.0 So this now looks like this: proxy.config.exec_thread.autoconfig.enabled INT 1 So when migrated to YAML it will looks like this: exec_thread: autoconfig: enabled: 1 << new field. scale: 1.0 * records.yaml: replace records.config configuration file and use YAML format instead. - This change keeps the original internals and only adds a new layer for parsing YAML instead of records. - YAML nodes are converted to record names (dot(.) separated) and use the same internal features. - traffic_ctl still works with record names. - All the internal API to query and set records remains unchanged. * record.yaml - Add basic unit test for some specific cases. * Add test for fields with multipliers * Docs update.
1 parent 15c39da commit aebef45

File tree

152 files changed

+3994
-1638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+3994
-1638
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ config.cache
5252
config.status
5353
config.nice
5454

55-
configs/records.config.default
55+
configs/records.yaml.default
5656
configs/storage.config.default
5757

5858
doc/_build

ci/jenkins/ats_conf.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
$recedit->set(conf => "proxy.config.http.server_ports", val => "80 80:ipv6 443:ssl 443:ipv6:ssl");
3434

3535
# Threads
36-
$recedit->set(conf => "proxy.config.exec_thread.autoconfig", val => "0");
36+
$recedit->set(conf => "proxy.config.exec_thread.autoconfig.enabled", val => "0");
3737
$recedit->set(conf => "proxy.config.exec_thread.limit", val => "8");
3838
$recedit->set(conf => "proxy.config.cache.threads_per_disk", val => "8");
3939
$recedit->set(conf => "proxy.config.accept_threads", val => "0");
@@ -42,7 +42,7 @@
4242
# TLS
4343
$recedit->set(conf => "proxy.config.ssl.hsts_max_age", val => "17280000");
4444
#$recedit->set(conf => "proxy.config.ssl.max_record_size", val => "-1");
45-
$recedit->set(conf => "proxy.config.ssl.session_cache", val => "2");
45+
$recedit->set(conf => "proxy.config.ssl.session_cache.value", val => "2");
4646
$recedit->set(conf => "proxy.config.ssl.ocsp.enabled", val => "1");
4747
$recedit->set(conf => "proxy.config.http2.stream_priority_enabled", val => "1");
4848
$recedit->set(conf => "proxy.config.ssl.max_record_size", val => "-1");

ci/jenkins/remap.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ reverse_map http://192.168.3.17:6969 https://ci.trafficserver.apache.org
2828

2929
# Read-the-docs
3030
#map http://docs.trafficserver.apache.org \
31-
# http://trafficserver.readthedocs.org/en/latest/reference/configuration/records.config.en.html
31+
# http://trafficserver.readthedocs.org/en/latest/reference/configuration/records.yaml.en.html
3232
redirect http://docs.trafficserver.apache.org https://docs.trafficserver.apache.org
3333

3434
map https://docs.trafficserver.apache.org/__RTD http://192.168.3.17/RTD
3535

3636
map https://docs.trafficserver.apache.org/records.config \
37-
https://trafficserver.readthedocs.org/en/latest/reference/configuration/records.config.en.html \
37+
https://trafficserver.readthedocs.org/en/latest/reference/configuration/records.yaml.en.html \
3838
@plugin=conf_remap.so @pparam=records.config.pristine
3939

4040
map https://docs.trafficserver.apache.org https://trafficserver.readthedocs.org \

configs/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
SUBDIRS = body_factory
2020
EXTRA_DIST = \
21-
records.config.default.in \
21+
records.yaml.default.in \
2222
storage.config.default.in
2323

2424
sysconfdir = $(pkgsysconfdir)
2525
nodist_sysconf_DATA = \
26-
records.config.default \
26+
records.yaml.default \
2727
storage.config.default
2828

2929
dist_sysconf_DATA = \

configs/records.config.default.in

Lines changed: 0 additions & 180 deletions
This file was deleted.

0 commit comments

Comments
 (0)