diff options
Diffstat (limited to 'azurelinuxagent/ga/update.py')
| -rw-r--r-- | azurelinuxagent/ga/update.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/azurelinuxagent/ga/update.py b/azurelinuxagent/ga/update.py index 2e43031..03d94c3 100644 --- a/azurelinuxagent/ga/update.py +++ b/azurelinuxagent/ga/update.py @@ -21,7 +21,6 @@ import glob import json import os import platform -import random import re import shutil import signal @@ -45,7 +44,6 @@ from azurelinuxagent.common.event import add_event, add_periodic, \ WALAEventOperation from azurelinuxagent.common.exception import ProtocolError, \ ResourceGoneError, \ - RestartError, \ UpdateError from azurelinuxagent.common.future import ustr from azurelinuxagent.common.osutil import get_osutil @@ -662,7 +660,7 @@ class UpdateHandler(object): continue msg = u"Exception retrieving agent manifests: {0}".format( - ustr(traceback.format_exc())) + ustr(e)) logger.warn(msg) add_event( AGENT_NAME, @@ -729,13 +727,6 @@ class GuestAgent(object): if isinstance(e, ResourceGoneError): raise - # The agent was improperly blacklisting versions due to a timeout - # encountered while downloading a later version. Errors of type - # socket.error are IOError, so this should provide sufficient - # protection against a large class of I/O operation failures. - if isinstance(e, IOError): - raise - # Note the failure, blacklist the agent if the package downloaded # - An exception with a downloaded package indicates the package # is corrupt (e.g., missing the HandlerManifest.json file) @@ -826,9 +817,7 @@ class GuestAgent(object): self._load_error() def _download(self): - uris_shuffled = self.pkg.uris - random.shuffle(uris_shuffled) - for uri in uris_shuffled: + for uri in self.pkg.uris: if not HostPluginProtocol.is_default_channel() and self._fetch(uri.uri): break |