From: Brett Smith <brett@curoverse.com>
Date: Fri, 4 Dec 2015 19:37:06 +0000 (-0500)
Subject: Remove redundant exception from Node Manager NETWORK_ERRORS.
X-Git-Tag: 1.1.0~1208^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6f5021de4086494b0f693cf0d0aef28fd0a41bd5

Remove redundant exception from Node Manager NETWORK_ERRORS.
---

diff --git a/services/nodemanager/arvnodeman/config.py b/services/nodemanager/arvnodeman/config.py
index 50c3ceb66f..dd45165dea 100644
--- a/services/nodemanager/arvnodeman/config.py
+++ b/services/nodemanager/arvnodeman/config.py
@@ -5,7 +5,6 @@ from __future__ import absolute_import, print_function
 import ConfigParser
 import importlib
 import logging
-import ssl
 import sys
 
 import arvados
@@ -13,10 +12,10 @@ import httplib2
 import pykka
 from apiclient import errors as apierror
 
-# IOError is the base class for socket.error and friends.
+# IOError is the base class for socket.error, ssl.SSLError, and friends.
 # It seems like it hits the sweet spot for operations we want to retry:
 # it's low-level, but unlikely to catch code bugs.
-NETWORK_ERRORS = (IOError, ssl.SSLError)
+NETWORK_ERRORS = (IOError,)
 ARVADOS_ERRORS = NETWORK_ERRORS + (apierror.Error,)
 
 actor_class = pykka.ThreadingActor