Github user dg4prez commented on a diff in the pull request:
https://github.com/apache/incubator-trafficcontrol/pull/299#discussion_r106414587
--- Diff: traffic_ops/bin/traffic_ops_ort.pl ---
@@ -705,50 +879,84 @@ sub check_syncds_state {
$syncds_update = $UPDATE_TROPS_NEEDED;
my $parent_pending = ( defined(
$upd_json->[0]->{'parent_pending'} ) ) ? $upd_json->[0]->{'parent_pending'} :
undef;
+ my $parent_reval_pending = ( defined(
$upd_json->[0]->{'parent_reval_pending'} ) ) ?
$upd_json->[0]->{'parent_reval_pending'} : undef;
if ( !defined($parent_pending) ) {
- ( $log_level >> $ERROR ) && print "ERROR Update
URL: $url did not have an parent_pending key.\n";
+ ( $log_level >> $ERROR ) && print "ERROR Update
URL: $uri did not have an parent_pending key.\n";
if ( $script_mode != $SYNCDS ) {
return $syncds_update;
}
else {
- ( $log_level >> $ERROR ) && print
"ERROR Invalid JSON for $url. Exiting, not sure what else to do.\n";
+ ( $log_level >> $ERROR ) && print
"ERROR Invalid JSON for $uri. Exiting, not sure what else to do.\n";
exit 1;
}
}
- if ( $parent_pending == 1 && $wait_for_parents == 1) {
- ( $log_level >> $ERROR ) && print "ERROR
Traffic Ops is signaling that my parents need an update.\n";
- if ( $script_mode == $SYNCDS ) {
- if ( $dispersion > 0 ) {
- ( $log_level >> $WARN ) &&
print "WARN In syncds mode, sleeping for " . $dispersion . "s to see if the
update my parents need is cleared.\n";
- for ( my $i = $dispersion; $i >
0; $i-- ) {
- ( $log_level >> $WARN )
&& print ".";
- sleep 1;
+ if ( defined($parent_reval_pending) ) {
+ if ( ( $parent_pending == 1 ||
$parent_reval_pending == 1 ) && $wait_for_parents == 1 ) {
+ ( $log_level >> $ERROR ) && print
"ERROR Traffic Ops is signaling that my parents need an update.\n";
+ if ( $script_mode == $SYNCDS ) {
+ if ( $dispersion > 0 ) {
+ ( $log_level >> $WARN )
&& print "WARN In syncds mode, sleeping for " . $dispersion . "s to see if the
update my parents need is cleared.\n";
+ ( $dispersion > 0 ) &&
&sleep_timer($dispersion);
+ }
+
+ ( $log_level >> $WARN ) &&
print "\n";
--- End diff --
I'm a really big fan of carriage returns for some reason.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
