You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2017/04/19 14:57:51 UTC
[1/3] incubator-trafficcontrol git commit: simpler implementation is
simpler
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 75997e9e2 -> 23b4f79fa
simpler implementation is simpler
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/66718d9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/66718d9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/66718d9e
Branch: refs/heads/master
Commit: 66718d9e920a2d14b323894edc72837233655dad
Parents: 198243d
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Tue Apr 18 19:31:08 2017 -0400
Committer: David Neuman <da...@gmail.com>
Committed: Wed Apr 19 08:57:22 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/Server.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/66718d9e/traffic_ops/app/lib/UI/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Server.pm b/traffic_ops/app/lib/UI/Server.pm
index 871c68a..adfc10f 100644
--- a/traffic_ops/app/lib/UI/Server.pm
+++ b/traffic_ops/app/lib/UI/Server.pm
@@ -909,15 +909,15 @@ sub readupdate {
if ( $rs_servers->single->type->name =~ m/^EDGE/ ) {
my $parent_cg =
$self->db->resultset('Cachegroup')->search( { id => $rs_servers->single->cachegroup->id } )->get_column('parent_cachegroup_id')->single;
- my $rs_parents = $self->db->resultset('Server')->search( { cachegroup => $parent_cg }, { prefetch => [ 'status'] } );
+ my $rs_parents = $self->db->resultset('Server')->search( { -and => [ cachegroup => $parent_cg, cdn_id => $rs_servers->single->cdn_id ] }, { prefetch => [ 'status'] } );
while ( my $prow = $rs_parents->next ) {
if ( $prow->upd_pending == 1
- && $prow->status->name ne "OFFLINE" && $prow->cdn_id == $rs_servers->single->cdn_id )
+ && $prow->status->name ne "OFFLINE" )
{
$parent_pending{ $rs_servers->single->host_name } = 1;
}
if ( $prow->reval_pending == 1
- && $prow->status->name ne "OFFLINE" && $prow->cdn_id == $rs_servers->single->cdn_id )
+ && $prow->status->name ne "OFFLINE" )
{
$parent_reval_pending{ $rs_servers->single->host_name } = 1;
}
[3/3] incubator-trafficcontrol git commit: This closes #480
Posted by ne...@apache.org.
This closes #480
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/23b4f79f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/23b4f79f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/23b4f79f
Branch: refs/heads/master
Commit: 23b4f79fa075c8a1ef98fc8689eb7e2bb966b398
Parents: 66718d9
Author: David Neuman <da...@gmail.com>
Authored: Wed Apr 19 08:57:47 2017 -0600
Committer: David Neuman <da...@gmail.com>
Committed: Wed Apr 19 08:57:47 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] incubator-trafficcontrol git commit: only shows parent_pending
for parents with cdn_ids that match cdn_id of host
Posted by ne...@apache.org.
only shows parent_pending for parents with cdn_ids that match cdn_id of host
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/198243d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/198243d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/198243d4
Branch: refs/heads/master
Commit: 198243d47f7c1c7ac7a553a854fc334324dc67fb
Parents: 75997e9
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Tue Apr 18 17:15:06 2017 -0400
Committer: David Neuman <da...@gmail.com>
Committed: Wed Apr 19 08:57:22 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/Server.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/198243d4/traffic_ops/app/lib/UI/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Server.pm b/traffic_ops/app/lib/UI/Server.pm
index aaef8eb..871c68a 100644
--- a/traffic_ops/app/lib/UI/Server.pm
+++ b/traffic_ops/app/lib/UI/Server.pm
@@ -912,12 +912,12 @@ sub readupdate {
my $rs_parents = $self->db->resultset('Server')->search( { cachegroup => $parent_cg }, { prefetch => [ 'status'] } );
while ( my $prow = $rs_parents->next ) {
if ( $prow->upd_pending == 1
- && $prow->status->name ne "OFFLINE" )
+ && $prow->status->name ne "OFFLINE" && $prow->cdn_id == $rs_servers->single->cdn_id )
{
$parent_pending{ $rs_servers->single->host_name } = 1;
}
if ( $prow->reval_pending == 1
- && $prow->status->name ne "OFFLINE" )
+ && $prow->status->name ne "OFFLINE" && $prow->cdn_id == $rs_servers->single->cdn_id )
{
$parent_reval_pending{ $rs_servers->single->host_name } = 1;
}