You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/05/09 18:12:10 UTC
[1/3] incubator-trafficcontrol git commit: This closes #555
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master f37cb0425 -> bd603e85e
This closes #555
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bd603e85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bd603e85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bd603e85
Branch: refs/heads/master
Commit: bd603e85ef7ba7e2ba3c0ee0099469ee3c42811d
Parents: cc7478a
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue May 9 12:12:08 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 9 12:12:08 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] incubator-trafficcontrol git commit: add revalidation check
when no update is queued
Posted by de...@apache.org.
add revalidation check when no update is queued
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/cc7478aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/cc7478aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/cc7478aa
Branch: refs/heads/master
Commit: cc7478aa25cacd2eeadda909ffc394fbb22e7885
Parents: 4833c57
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Mon May 8 13:56:22 2017 -0400
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 9 12:12:08 2017 -0600
----------------------------------------------------------------------
traffic_ops/bin/traffic_ops_ort.pl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/cc7478aa/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 433b6b6..1c77567 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -936,7 +936,8 @@ sub check_syncds_state {
}
}
elsif ( $script_mode == $SYNCDS && $upd_pending != 1 ) {
- ( $log_level >> $ERROR ) && print "ERROR In syncds mode, but no syncds update needs to be applied. I'm outta here.\n";
+ ( $log_level >> $ERROR ) && print "ERROR In syncds mode, but no syncds update needs to be applied. Running revalidation before exiting.\n";
+ &revalidate_while_sleeping();
exit 0;
}
else {
[3/3] incubator-trafficcontrol git commit: run dispersion sleep after
update check
Posted by de...@apache.org.
run dispersion sleep after update check
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/4833c571
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/4833c571
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/4833c571
Branch: refs/heads/master
Commit: 4833c5717f23f9a9b2507a02dfed12032ebfc705
Parents: f37cb04
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Mon May 8 10:18:14 2017 -0400
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue May 9 12:12:08 2017 -0600
----------------------------------------------------------------------
traffic_ops/bin/traffic_ops_ort.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4833c571/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 014a0b6..433b6b6 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -867,7 +867,6 @@ sub check_syncds_state {
else {
$reval_in_use = 0;
}
- ( $dispersion > 0 ) && &sleep_timer($random_duration);
$upd_ref = &lwp_get($uri);
if ( $upd_ref =~ m/^\d{3}$/ ) {
@@ -889,6 +888,7 @@ sub check_syncds_state {
}
if ( $upd_pending == 1 ) {
+ ( $dispersion > 0 ) && &sleep_timer($random_duration);
( $log_level >> $ERROR ) && print "ERROR Traffic Ops is signaling that an update is waiting to be applied.\n";
$syncds_update = $UPDATE_TROPS_NEEDED;