This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 3f9ea90 Remove unused TM config options (#6056)
3f9ea90 is described below
commit 3f9ea90212917db4d95b67d37c8eb862db1f228f
Author: Rawlin Peters <[email protected]>
AuthorDate: Tue Jul 27 09:50:33 2021 -0600
Remove unused TM config options (#6056)
The following TM config options are unused, so this removes them:
- http_poll_no_sleep
- max_stat_history
- max_health_history
---
CHANGELOG.md | 1 +
infrastructure/ansible/roles/traffic-monitor/defaults/main.yml | 3 ---
.../ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2 | 3 ---
infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg | 3 ---
infrastructure/docker/traffic_monitor/run.sh | 3 ---
traffic_monitor/conf/traffic_monitor.cfg | 3 ---
traffic_monitor/config/config.go | 4 ----
traffic_monitor/config/config_test.go | 3 ---
traffic_monitor/tests/_integration/tm/Dockerfile_run.sh | 3 ---
9 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6b6144..426be24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,6 +120,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
### Removed
- Removed the unused `backend_max_connections` option from `cdn.conf`.
+- Removed the unused `http_poll_no_sleep`, `max_stat_history`, and
`max_health_history` Traffic Monitor config options.
- Removed the `Long Description 2` and `Long Description 3` fields of
`DeliveryService` from the UI, and changed the backend so that routes
corresponding API 4.0 and above no longer accept or return these fields.
- The Perl implementation of Traffic Ops has been stripped out, along with the
Go implementation's "fall-back to Perl" behavior.
- Traffic Ops no longer includes an `app/public` directory, as the static
webserver has been removed along with the Perl Traffic Ops implementation.
Traffic Ops also no longer attempts to download MaxMind GeoIP City databases
when running the Traffic Ops Postinstall script.
diff --git a/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
b/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
index c4d144b..9c2e027 100644
--- a/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
+++ b/infrastructure/ansible/roles/traffic-monitor/defaults/main.yml
@@ -31,8 +31,6 @@ tm_http_timeout_ms: 2000
tm_peer_polling_interval_ms: 5000
tm_peer_optimistic: true
tm_max_events: 200
-tm_max_stat_history: 5
-tm_max_health_history: 5
tm_health_flush_interval_ms: 20
tm_log_location_error: "{{ tm_log_dir }}/traffic_monitor.log"
tm_log_location_warning: "{{ tm_log_dir }}/traffic_monitor.log"
@@ -42,7 +40,6 @@ tm_log_location_event: "{{ tm_log_dir }}/event.log"
tm_stat_flush_interval_ms: 20
tm_serve_read_timeout_ms: 10000
tm_serve_write_timeout_ms: 20000
-tm_http_poll_no_sleep: false
tm_http_polling_format: "text/json"
tm_to_min_retry_interval: 100
tm_to_max_retry_interval: 60000
diff --git
a/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
b/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
index 3684545..285940d 100644
---
a/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
+++
b/infrastructure/ansible/roles/traffic-monitor/templates/traffic_monitor.cfg.j2
@@ -19,8 +19,6 @@
"peer_polling_interval_ms": {{ tm_peer_polling_interval_ms }},
"peer_optimistic": {{ tm_peer_optimistic | lower }},
"max_events": {{ tm_max_events }},
- "max_stat_history": {{ tm_max_stat_history }},
- "max_health_history": {{ tm_max_health_history }},
"health_flush_interval_ms": {{ tm_health_flush_interval_ms }},
"stat_flush_interval_ms": {{ tm_stat_flush_interval_ms }},
"log_location_event": "{{ tm_log_location_event }}",
@@ -30,7 +28,6 @@
"log_location_debug": "{{ tm_log_location_debug }}",
"serve_read_timeout_ms": {{ tm_serve_read_timeout_ms }},
"serve_write_timeout_ms": {{ tm_serve_write_timeout_ms }},
- "http_poll_no_sleep": {{ tm_http_poll_no_sleep | lower }},
"http_polling_format": "{{ tm_http_polling_format }}",
"traffic_ops_min_retry_interval_ms": {{ tm_to_min_retry_interval }},
"traffic_ops_max_retry_interval_ms": {{ tm_to_max_retry_interval }},
diff --git a/infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg
b/infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg
index 5af0bec..3e3513f 100644
--- a/infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg
+++ b/infrastructure/cdn-in-a-box/traffic_monitor/traffic_monitor.cfg
@@ -7,8 +7,6 @@
"peer_optimistic": true,
"peer_optimistic_quorum_min": 0,
"max_events": 200,
- "max_stat_history": 5,
- "max_health_history": 5,
"health_flush_interval_ms": 20,
"stat_flush_interval_ms": 20,
"log_location_event": "$TM_LOG_EVENT",
@@ -18,6 +16,5 @@
"log_location_debug": "$TM_LOG_DEBUG",
"serve_read_timeout_ms": $SERVER_READ_TIMEOUT_MS,
"serve_write_timeout_ms": $SERVER_WRITE_TIMEOUT_MS,
- "http_poll_no_sleep": false,
"static_file_dir": "/opt/traffic_monitor/static/"
}
diff --git a/infrastructure/docker/traffic_monitor/run.sh
b/infrastructure/docker/traffic_monitor/run.sh
index 1458b48..33d6824 100755
--- a/infrastructure/docker/traffic_monitor/run.sh
+++ b/infrastructure/docker/traffic_monitor/run.sh
@@ -75,8 +75,6 @@ init() {
"peer_polling_interval_ms": 5000,
"peer_optimistic": true,
"max_events": 200,
- "max_stat_history": 5,
- "max_health_history": 5,
"health_flush_interval_ms": 20,
"stat_flush_interval_ms": 20,
"log_location_event":
"/opt/traffic_monitor/var/log/event.log",
@@ -86,7 +84,6 @@ init() {
"log_location_debug": "null",
"serve_read_timeout_ms": 10000,
"serve_write_timeout_ms": 10000,
- "http_poll_no_sleep": false,
"static_file_dir":
"/opt/traffic_monitor/static/",
"peer_polling_protocol": "both",
"cache_polling_protocol": "both"
diff --git a/traffic_monitor/conf/traffic_monitor.cfg
b/traffic_monitor/conf/traffic_monitor.cfg
index 71bed80..b05c943 100644
--- a/traffic_monitor/conf/traffic_monitor.cfg
+++ b/traffic_monitor/conf/traffic_monitor.cfg
@@ -7,8 +7,6 @@
"peer_optimistic": true,
"peer_optimistic_quorum_min": 0,
"max_events": 200,
- "max_stat_history": 5,
- "max_health_history": 5,
"health_flush_interval_ms": 20,
"stat_flush_interval_ms": 20,
"log_location_event": "/opt/traffic_monitor/var/log/event.log",
@@ -18,6 +16,5 @@
"log_location_debug": "null",
"serve_read_timeout_ms": 10000,
"serve_write_timeout_ms": 10000,
- "http_poll_no_sleep": false,
"static_file_dir": "/opt/traffic_monitor/static/"
}
diff --git a/traffic_monitor/config/config.go b/traffic_monitor/config/config.go
index 13b22eb..052e356 100644
--- a/traffic_monitor/config/config.go
+++ b/traffic_monitor/config/config.go
@@ -105,8 +105,6 @@ type Config struct {
PeerOptimistic bool `json:"peer_optimistic"`
PeerOptimisticQuorumMin int
`json:"peer_optimistic_quorum_min"`
MaxEvents uint64 `json:"max_events"`
- MaxStatHistory uint64 `json:"max_stat_history"`
- MaxHealthHistory uint64 `json:"max_health_history"`
HealthFlushInterval time.Duration `json:"-"`
StatFlushInterval time.Duration `json:"-"`
StatBufferInterval time.Duration `json:"-"`
@@ -146,8 +144,6 @@ var DefaultConfig = Config{
PeerOptimistic: true,
PeerOptimisticQuorumMin: 0,
MaxEvents: 200,
- MaxStatHistory: 5,
- MaxHealthHistory: 5,
HealthFlushInterval: 200 * time.Millisecond,
StatFlushInterval: 200 * time.Millisecond,
StatBufferInterval: 0,
diff --git a/traffic_monitor/config/config_test.go
b/traffic_monitor/config/config_test.go
index 2d90e90..d8e09ec 100644
--- a/traffic_monitor/config/config_test.go
+++ b/traffic_monitor/config/config_test.go
@@ -33,8 +33,6 @@ const exampleTMConfig = `
"peer_optimistic": true,
"peer_optimistic_quorum_min": 0,
"max_events": 200,
- "max_stat_history": 5,
- "max_health_history": 5,
"health_flush_interval_ms": 1000,
"stat_flush_interval_ms": 1000,
"log_location_event": "event.log",
@@ -45,7 +43,6 @@ const exampleTMConfig = `
"serve_read_timeout_ms": 10000,
"serve_write_timeout_ms": 10000,
"stat_buffer_interval_ms": 20000,
- "http_poll_no_sleep": false,
"static_file_dir": "static/"
}
`
diff --git a/traffic_monitor/tests/_integration/tm/Dockerfile_run.sh
b/traffic_monitor/tests/_integration/tm/Dockerfile_run.sh
index 6ab040a..44e90d3 100755
--- a/traffic_monitor/tests/_integration/tm/Dockerfile_run.sh
+++ b/traffic_monitor/tests/_integration/tm/Dockerfile_run.sh
@@ -46,8 +46,6 @@ init() {
"peer_polling_interval_ms": 5000,
"peer_optimistic": true,
"max_events": 200,
- "max_stat_history": 5,
- "max_health_history": 5,
"health_flush_interval_ms": 20,
"stat_flush_interval_ms": 20,
"log_location_event":
"/opt/traffic_monitor/var/log/event.log",
@@ -57,7 +55,6 @@ init() {
"log_location_debug": "null",
"serve_read_timeout_ms": 10000,
"serve_write_timeout_ms": 10000,
- "http_poll_no_sleep": false,
"static_file_dir":
"/opt/traffic_monitor/static/"
}
EOF
