sts-sponsors team mailing list archive

[Adam Collard <mp+438684@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/src/provisioningserver/utils/services.py b/src/provisioningserver/utils/services.py
> index dbce466..8403523 100644
> --- a/src/provisioningserver/utils/services.py
> +++ b/src/provisioningserver/utils/services.py
> @@ -1166,17 +1167,23 @@ class NetworksMonitoringService(SingleInstanceService):
>                  hints = self._get_topology_hints()
>  
>              maas_url, system_id, credentials = yield self.getRefreshDetails()
> -            yield self._run_refresh(
> -                maas_url,
> -                system_id,
> -                credentials,
> -                interfaces,
> -                hints,
> -            )
> -            # Note: _interfacesRecorded() will reconfigure discovery after
> -            # recording the interfaces, so there is no need to call
> -            # _configureNetworkDiscovery() here.
> -            self._interfacesRecorded(interfaces)
> +            try:
> +                yield self._run_refresh(
> +                    maas_url,
> +                    system_id,
> +                    credentials,
> +                    interfaces,
> +                    hints,
> +                )
> +            except SignalException as exc:
> +                # Most likely a transient networking error. We'll retry the
> +                # next time the service runs the scripts.
> +                log.warn(f"Error signalling test results: {exc}")

hmm, warning about an Error seems wrong?

> +            else:
> +                # Note: _interfacesRecorded() will reconfigure discovery after
> +                # recording the interfaces, so there is no need to call
> +                # _configureNetworkDiscovery() here.
> +                self._interfacesRecorded(interfaces)
>          else:
>              # Send out beacons unsolicited once every 30 seconds. (Use
>              # solicitations so that replies will be received, that way peers


-- 
https://code.launchpad.net/~bjornt/maas/+git/maas/+merge/438684
Your team MAAS Maintainers is requested to review the proposed merge of ~bjornt/maas:bug-2003310-signal-error into maas:master.