You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2021/01/08 00:21:59 UTC
[GitHub] [trafficcontrol] zrhoffman opened a new pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
zrhoffman opened a new pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416
<!--
************ STOP!! ************
If this Pull Request is intended to fix a security vulnerability, DO NOT submit it! Instead, contact
the Apache Software Foundation Security Team at security@trafficcontrol.apache.org and follow the
guidelines at https://www.apache.org/security/ regarding vulnerability disclosure.
-->
## What does this PR (Pull Request) do?
<!-- Explain the changes you made here. If this fixes an Issue, identify it by
replacing the text in the checkbox item with the Issue number e.g.
- [x] This PR fixes #9001 OR is not related to any Issue
^ This will automatically close Issue number 9001 when the Pull Request is
merged (The '#' is important).
Be sure you check the box properly, see the "The following criteria are ALL
met by this PR" section for details.
-->
This PR
- - [x] Fixes #5413 by only checking the update status for Topology parent CacheGroup Servers with `ONLINE` or `REPORTED` status.<!-- You can check for an issue here: https://github.com/apache/trafficcontrol/issues -->
- Restricts Topology parent CacheGroup types to check pending Server updates for to `EDGE_LOC` and `MID_LOC` so that if a server in an `ORG_LOC` cachegroup ever has pending updates or revalidation, caches in Topology child Cache Groups will not have `parent_pending` = `true` or `parent_reval_pending` = `true`.
- Makes API v1 and API v2 use the API v3 handler for GET `servers/{host_name}/update_status`
## Which Traffic Control components are affected by this PR?
<!-- Please delete all components from this list that are NOT affected by this
Pull Request. Also, feel free to add the name of a tool or script that is
affected but not on the list.
Additionally, if this Pull Request does NOT affect documentation, please
explain why documentation is not required. -->
- Traffic Ops
## What is the best way to verify this PR?
<!-- Please include here ALL the steps necessary to test your Pull Request. If
it includes tests (and most should), outline here the steps needed to run the
tests. If not, lay out the manual testing procedure and please explain why
tests are unnecessary for this Pull Request. -->
- Run the API tests, make sure they pass
## If this is a bug fix, what versions of Traffic Control are affected?
<!-- If this PR fixes a bug, please list here all of the affected versions - to
the best of your knowledge. It's also pretty helpful to include a commit hash
of where 'master' is at the time this PR is opened (if it affects master),
because what 'master' means will change over time. For example, if this PR
fixes a bug that's present in master (at commit hash '1df853c8'), in v4.0.0,
and in the current 4.0.1 Release candidate (e.g. RC1), then this list would
look like:
- master (36a1a847b7)
- 5.0.0 (RC6)
If you don't know what other versions might have this bug, AND don't know how
to find the commit hash of 'master', then feel free to leave this section
blank (or, preferably, delete it entirely).
-->
- master (36a1a847b7)
- 5.0.0 (RC6)
## The following criteria are ALL met by this PR
<!-- Check the boxes to signify that the associated statement is true. To
"check a box", replace the space inside of the square brackets with an 'x'.
e.g.
- [ x] <- Wrong
- [x ] <- Wrong
- [] <- Wrong
- [*] <- Wrong
- [x] <- Correct!
-->
- [x] This PR includes tests
- [x] Bugfixes only, documentation is unnecessary
- [x] An update to CHANGELOG.md is not necessary
- [x] This PR includes any and all required license headers
- [x] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://www.apache.org/security/) for details)
<!--
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.
-->
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rawlinp merged pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
rawlinp merged pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416#discussion_r554021921
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -51,39 +53,44 @@ func getServerUpdateStatus(tx *sql.Tx, cfg *config.Config, hostName string) ([]t
selectQuery := `
/* topology_ancestors finds the ancestor topology nodes of the topology node for
- * the cachegroup containing server $4.
+ * the cachegroup containing server $5.
*/
WITH RECURSIVE topology_ancestors AS (
/* This is the base case of the recursive CTE, the topology node for the
- * cachegroup containing server $4.
+ * cachegroup containing server $5.
*/
SELECT tcp.child parent, NULL cachegroup, s.id base_server_id
FROM "server" s
JOIN cachegroup c ON s.cachegroup = c.id
JOIN topology_cachegroup tc ON c."name" = tc.cachegroup
JOIN topology_cachegroup_parents tcp ON tc.id = tcp.child
- WHERE s.host_name = $4
+ WHERE s.host_name = $5
UNION ALL
/* Find all direct topology parent nodes tc of a given topology ancestor ta. */
SELECT tcp.parent, tc.cachegroup, ta.base_server_id
FROM topology_ancestors ta, topology_cachegroup_parents tcp
JOIN topology_cachegroup tc ON tcp.parent = tc.id
+ JOIN cachegroup c ON tc.cachegroup = c."name"
+ JOIN "type" t ON c."type" = t.id
WHERE ta.parent = tcp.child
+ AND t."name" = ANY($4::TEXT[])
Review comment:
I think we may want to support cachegroup types other than EDGE_LOC/MID_LOC, but still require them to have either the EDGE or MID prefix. E.g. EDGE_FOO_LOC or MID_BAR_LOC. So we should probably start just checking for the EDGE/MID prefix now, similar to how we check the EDGE/MID prefix for server types.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416#discussion_r554040500
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -51,39 +53,44 @@ func getServerUpdateStatus(tx *sql.Tx, cfg *config.Config, hostName string) ([]t
selectQuery := `
/* topology_ancestors finds the ancestor topology nodes of the topology node for
- * the cachegroup containing server $4.
+ * the cachegroup containing server $5.
*/
WITH RECURSIVE topology_ancestors AS (
/* This is the base case of the recursive CTE, the topology node for the
- * cachegroup containing server $4.
+ * cachegroup containing server $5.
*/
SELECT tcp.child parent, NULL cachegroup, s.id base_server_id
FROM "server" s
JOIN cachegroup c ON s.cachegroup = c.id
JOIN topology_cachegroup tc ON c."name" = tc.cachegroup
JOIN topology_cachegroup_parents tcp ON tc.id = tcp.child
- WHERE s.host_name = $4
+ WHERE s.host_name = $5
UNION ALL
/* Find all direct topology parent nodes tc of a given topology ancestor ta. */
SELECT tcp.parent, tc.cachegroup, ta.base_server_id
FROM topology_ancestors ta, topology_cachegroup_parents tcp
JOIN topology_cachegroup tc ON tcp.parent = tc.id
+ JOIN cachegroup c ON tc.cachegroup = c."name"
+ JOIN "type" t ON c."type" = t.id
WHERE ta.parent = tcp.child
+ AND t."name" = ANY($4::TEXT[])
Review comment:
Checking for Cache Group types that start with `EDGE` or `MID` in eaf05d2e54
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416#discussion_r554120757
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -127,7 +127,7 @@ ORDER BY s.id
`
cacheStatusesToCheck := []tc.CacheStatus{tc.CacheStatusOnline, tc.CacheStatusReported}
- cacheGroupTypes := []string{tc.CacheGroupEdgeTypeName, tc.CacheGroupMidTypeName}
+ cacheGroupTypes := []tc.CacheType{tc.CacheTypeEdge + "%", tc.CacheGroupMidTypeName + "%"}
Review comment:
Using `MidTypePrefix` in 88cbe8eb3d
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416#discussion_r554112989
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -97,29 +104,31 @@ SELECT
use_reval_pending.value,
s.upd_pending,
status.name AS status,
- /* True if the cachegroup parent or any ancestor topology node has pending updates. */
- TRUE IN (
- SELECT sta.upd_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
- UNION SELECT COALESCE(BOOL_OR(ps.upd_pending), FALSE)
- ) AS parent_upd_pending,
- /* True if the cachegroup parent or any ancestor topology node has pending revalidation. */
- TRUE IN (
- SELECT sta.reval_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
- UNION SELECT COALESCE(BOOL_OR(ps.reval_pending), FALSE)
- ) AS parent_reval_pending
+ /* True if the cachegroup parent or any ancestor topology node has pending updates. */
+ TRUE IN (
+ SELECT sta.upd_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
+ UNION SELECT COALESCE(BOOL_OR(ps.upd_pending), FALSE)
+ ) AS parent_upd_pending,
+ /* True if the cachegroup parent or any ancestor topology node has pending revalidation. */
+ TRUE IN (
+ SELECT sta.reval_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
+ UNION SELECT COALESCE(BOOL_OR(ps.reval_pending), FALSE)
+ ) AS parent_reval_pending
FROM use_reval_pending,
server s
LEFT JOIN status ON s.status = status.id
LEFT JOIN cachegroup cg ON s.cachegroup = cg.id
LEFT JOIN type ON type.id = s.type
LEFT JOIN parentservers ps ON ps.cachegroup = cg.parent_cachegroup_id
AND ps.cdn_id = s.cdn_id
-WHERE s.host_name = $4
+WHERE s.host_name = $5
GROUP BY s.id, s.host_name, type.name, server_reval_pending, use_reval_pending.value, s.upd_pending, status.name
ORDER BY s.id
`
- rows, err := tx.Query(selectQuery, tc.CacheStatusOffline, tc.UseRevalPendingParameterName, tc.GlobalConfigFileName, hostName)
+ cacheStatusesToCheck := []tc.CacheStatus{tc.CacheStatusOnline, tc.CacheStatusReported}
Review comment:
Considering `ADMIN_DOWN` in 03c22553ad
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416#discussion_r554021921
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -51,39 +53,44 @@ func getServerUpdateStatus(tx *sql.Tx, cfg *config.Config, hostName string) ([]t
selectQuery := `
/* topology_ancestors finds the ancestor topology nodes of the topology node for
- * the cachegroup containing server $4.
+ * the cachegroup containing server $5.
*/
WITH RECURSIVE topology_ancestors AS (
/* This is the base case of the recursive CTE, the topology node for the
- * cachegroup containing server $4.
+ * cachegroup containing server $5.
*/
SELECT tcp.child parent, NULL cachegroup, s.id base_server_id
FROM "server" s
JOIN cachegroup c ON s.cachegroup = c.id
JOIN topology_cachegroup tc ON c."name" = tc.cachegroup
JOIN topology_cachegroup_parents tcp ON tc.id = tcp.child
- WHERE s.host_name = $4
+ WHERE s.host_name = $5
UNION ALL
/* Find all direct topology parent nodes tc of a given topology ancestor ta. */
SELECT tcp.parent, tc.cachegroup, ta.base_server_id
FROM topology_ancestors ta, topology_cachegroup_parents tcp
JOIN topology_cachegroup tc ON tcp.parent = tc.id
+ JOIN cachegroup c ON tc.cachegroup = c."name"
+ JOIN "type" t ON c."type" = t.id
WHERE ta.parent = tcp.child
+ AND t."name" = ANY($4::TEXT[])
Review comment:
I think we may want to support cachegroup types other than EDGE_LOC/MID_LOC, but still require them to have either the EDGE or MID prefix. E.g. EDGE_FOO_LOC or MID_BAR_LOC. So we should probably start just checking for the EDGE/MID prefix now, similar to how we check the EDGE/MID prefix for server types.
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -127,7 +127,7 @@ ORDER BY s.id
`
cacheStatusesToCheck := []tc.CacheStatus{tc.CacheStatusOnline, tc.CacheStatusReported}
- cacheGroupTypes := []string{tc.CacheGroupEdgeTypeName, tc.CacheGroupMidTypeName}
+ cacheGroupTypes := []tc.CacheType{tc.CacheTypeEdge + "%", tc.CacheGroupMidTypeName + "%"}
Review comment:
`CacheTypeMid`?
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -97,29 +104,31 @@ SELECT
use_reval_pending.value,
s.upd_pending,
status.name AS status,
- /* True if the cachegroup parent or any ancestor topology node has pending updates. */
- TRUE IN (
- SELECT sta.upd_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
- UNION SELECT COALESCE(BOOL_OR(ps.upd_pending), FALSE)
- ) AS parent_upd_pending,
- /* True if the cachegroup parent or any ancestor topology node has pending revalidation. */
- TRUE IN (
- SELECT sta.reval_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
- UNION SELECT COALESCE(BOOL_OR(ps.reval_pending), FALSE)
- ) AS parent_reval_pending
+ /* True if the cachegroup parent or any ancestor topology node has pending updates. */
+ TRUE IN (
+ SELECT sta.upd_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
+ UNION SELECT COALESCE(BOOL_OR(ps.upd_pending), FALSE)
+ ) AS parent_upd_pending,
+ /* True if the cachegroup parent or any ancestor topology node has pending revalidation. */
+ TRUE IN (
+ SELECT sta.reval_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
+ UNION SELECT COALESCE(BOOL_OR(ps.reval_pending), FALSE)
+ ) AS parent_reval_pending
FROM use_reval_pending,
server s
LEFT JOIN status ON s.status = status.id
LEFT JOIN cachegroup cg ON s.cachegroup = cg.id
LEFT JOIN type ON type.id = s.type
LEFT JOIN parentservers ps ON ps.cachegroup = cg.parent_cachegroup_id
AND ps.cdn_id = s.cdn_id
-WHERE s.host_name = $4
+WHERE s.host_name = $5
GROUP BY s.id, s.host_name, type.name, server_reval_pending, use_reval_pending.value, s.upd_pending, status.name
ORDER BY s.id
`
- rows, err := tx.Query(selectQuery, tc.CacheStatusOffline, tc.UseRevalPendingParameterName, tc.GlobalConfigFileName, hostName)
+ cacheStatusesToCheck := []tc.CacheStatus{tc.CacheStatusOnline, tc.CacheStatusReported}
Review comment:
I think we may also want to consider `ADMIN_DOWN`, since that is the existing behavior today. Thinking about revalidations, we'd still want to have an `ADMIN_DOWN` mid revalidate before its children, otherwise when it comes back up it could serve invalidated content to the edges still.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416#discussion_r554040500
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -51,39 +53,44 @@ func getServerUpdateStatus(tx *sql.Tx, cfg *config.Config, hostName string) ([]t
selectQuery := `
/* topology_ancestors finds the ancestor topology nodes of the topology node for
- * the cachegroup containing server $4.
+ * the cachegroup containing server $5.
*/
WITH RECURSIVE topology_ancestors AS (
/* This is the base case of the recursive CTE, the topology node for the
- * cachegroup containing server $4.
+ * cachegroup containing server $5.
*/
SELECT tcp.child parent, NULL cachegroup, s.id base_server_id
FROM "server" s
JOIN cachegroup c ON s.cachegroup = c.id
JOIN topology_cachegroup tc ON c."name" = tc.cachegroup
JOIN topology_cachegroup_parents tcp ON tc.id = tcp.child
- WHERE s.host_name = $4
+ WHERE s.host_name = $5
UNION ALL
/* Find all direct topology parent nodes tc of a given topology ancestor ta. */
SELECT tcp.parent, tc.cachegroup, ta.base_server_id
FROM topology_ancestors ta, topology_cachegroup_parents tcp
JOIN topology_cachegroup tc ON tcp.parent = tc.id
+ JOIN cachegroup c ON tc.cachegroup = c."name"
+ JOIN "type" t ON c."type" = t.id
WHERE ta.parent = tcp.child
+ AND t."name" = ANY($4::TEXT[])
Review comment:
Checking for Cache Group types that start with `EDGE` or `MID` in eaf05d2e54
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -97,29 +104,31 @@ SELECT
use_reval_pending.value,
s.upd_pending,
status.name AS status,
- /* True if the cachegroup parent or any ancestor topology node has pending updates. */
- TRUE IN (
- SELECT sta.upd_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
- UNION SELECT COALESCE(BOOL_OR(ps.upd_pending), FALSE)
- ) AS parent_upd_pending,
- /* True if the cachegroup parent or any ancestor topology node has pending revalidation. */
- TRUE IN (
- SELECT sta.reval_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
- UNION SELECT COALESCE(BOOL_OR(ps.reval_pending), FALSE)
- ) AS parent_reval_pending
+ /* True if the cachegroup parent or any ancestor topology node has pending updates. */
+ TRUE IN (
+ SELECT sta.upd_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
+ UNION SELECT COALESCE(BOOL_OR(ps.upd_pending), FALSE)
+ ) AS parent_upd_pending,
+ /* True if the cachegroup parent or any ancestor topology node has pending revalidation. */
+ TRUE IN (
+ SELECT sta.reval_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
+ UNION SELECT COALESCE(BOOL_OR(ps.reval_pending), FALSE)
+ ) AS parent_reval_pending
FROM use_reval_pending,
server s
LEFT JOIN status ON s.status = status.id
LEFT JOIN cachegroup cg ON s.cachegroup = cg.id
LEFT JOIN type ON type.id = s.type
LEFT JOIN parentservers ps ON ps.cachegroup = cg.parent_cachegroup_id
AND ps.cdn_id = s.cdn_id
-WHERE s.host_name = $4
+WHERE s.host_name = $5
GROUP BY s.id, s.host_name, type.name, server_reval_pending, use_reval_pending.value, s.upd_pending, status.name
ORDER BY s.id
`
- rows, err := tx.Query(selectQuery, tc.CacheStatusOffline, tc.UseRevalPendingParameterName, tc.GlobalConfigFileName, hostName)
+ cacheStatusesToCheck := []tc.CacheStatus{tc.CacheStatusOnline, tc.CacheStatusReported}
Review comment:
Considering `ADMIN_DOWN` in 03c22553ad
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -127,7 +127,7 @@ ORDER BY s.id
`
cacheStatusesToCheck := []tc.CacheStatus{tc.CacheStatusOnline, tc.CacheStatusReported}
- cacheGroupTypes := []string{tc.CacheGroupEdgeTypeName, tc.CacheGroupMidTypeName}
+ cacheGroupTypes := []tc.CacheType{tc.CacheTypeEdge + "%", tc.CacheGroupMidTypeName + "%"}
Review comment:
Using `MidTypePrefix` in 88cbe8eb3d
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rawlinp merged pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
rawlinp merged pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [trafficcontrol] rawlinp commented on a change in pull request #5416: Limit which Topology parent CacheGroup Servers to check for updates
Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #5416:
URL: https://github.com/apache/trafficcontrol/pull/5416#discussion_r554059151
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -127,7 +127,7 @@ ORDER BY s.id
`
cacheStatusesToCheck := []tc.CacheStatus{tc.CacheStatusOnline, tc.CacheStatusReported}
- cacheGroupTypes := []string{tc.CacheGroupEdgeTypeName, tc.CacheGroupMidTypeName}
+ cacheGroupTypes := []tc.CacheType{tc.CacheTypeEdge + "%", tc.CacheGroupMidTypeName + "%"}
Review comment:
`CacheTypeMid`?
##########
File path: traffic_ops/traffic_ops_golang/server/servers_update_status.go
##########
@@ -97,29 +104,31 @@ SELECT
use_reval_pending.value,
s.upd_pending,
status.name AS status,
- /* True if the cachegroup parent or any ancestor topology node has pending updates. */
- TRUE IN (
- SELECT sta.upd_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
- UNION SELECT COALESCE(BOOL_OR(ps.upd_pending), FALSE)
- ) AS parent_upd_pending,
- /* True if the cachegroup parent or any ancestor topology node has pending revalidation. */
- TRUE IN (
- SELECT sta.reval_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
- UNION SELECT COALESCE(BOOL_OR(ps.reval_pending), FALSE)
- ) AS parent_reval_pending
+ /* True if the cachegroup parent or any ancestor topology node has pending updates. */
+ TRUE IN (
+ SELECT sta.upd_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
+ UNION SELECT COALESCE(BOOL_OR(ps.upd_pending), FALSE)
+ ) AS parent_upd_pending,
+ /* True if the cachegroup parent or any ancestor topology node has pending revalidation. */
+ TRUE IN (
+ SELECT sta.reval_pending FROM server_topology_ancestors sta WHERE sta.base_server_id = s.id
+ UNION SELECT COALESCE(BOOL_OR(ps.reval_pending), FALSE)
+ ) AS parent_reval_pending
FROM use_reval_pending,
server s
LEFT JOIN status ON s.status = status.id
LEFT JOIN cachegroup cg ON s.cachegroup = cg.id
LEFT JOIN type ON type.id = s.type
LEFT JOIN parentservers ps ON ps.cachegroup = cg.parent_cachegroup_id
AND ps.cdn_id = s.cdn_id
-WHERE s.host_name = $4
+WHERE s.host_name = $5
GROUP BY s.id, s.host_name, type.name, server_reval_pending, use_reval_pending.value, s.upd_pending, status.name
ORDER BY s.id
`
- rows, err := tx.Query(selectQuery, tc.CacheStatusOffline, tc.UseRevalPendingParameterName, tc.GlobalConfigFileName, hostName)
+ cacheStatusesToCheck := []tc.CacheStatus{tc.CacheStatusOnline, tc.CacheStatusReported}
Review comment:
I think we may also want to consider `ADMIN_DOWN`, since that is the existing behavior today. Thinking about revalidations, we'd still want to have an `ADMIN_DOWN` mid revalidate before its children, otherwise when it comes back up it could serve invalidated content to the edges still.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org