Merge "Fix serial console worker blocking Nova" into stable/liberty

1 files changed, 1 insertions, 9 deletions

diff --git a/nova/virt/hyperv/ioutils.py b/nova/virt/hyperv/ioutils.py
index e28deb84ff..ed79d150f3 100644
--- a/nova/virt/hyperv/ioutils.py
+++ b/nova/virt/hyperv/ioutils.py
@@ -13,14 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import errno
 import os
 
 from eventlet import patcher
 from oslo_log import log as logging
 
-from nova.i18n import _LE
-
 LOG = logging.getLogger(__name__)
 
 native_threading = patcher.original('threading')
@@ -39,13 +36,8 @@ class IOThread(native_threading.Thread):
     def run(self):
         try:
             self._copy()
-        except IOError as err:
+        except Exception:
             self._stopped.set()
-            # Invalid argument error means that the vm console pipe was closed,
-            # probably the vm was stopped. The worker can stop it's execution.
-            if err.errno != errno.EINVAL:
-                LOG.error(_LE("Error writing vm console log file from "
-                              "serial console pipe. Error: %s") % err)
 
     def _copy(self):
         with open(self._src, 'rb') as src: