Attachment 654745 Details for Bug 881733 – Alternative patch for quantum/agent/linux/utils.py

[patch] Alternative patch for quantum/agent/linux/utils.py

utils.py.patch (text/plain), 1.77 KB, created by Etsuji Nakai on 2012-11-30 03:05:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Etsuji Nakai

Created: 2012-11-30 03:05:04 UTC

Size: 1.77 KB

patch

obsolete

>--- /usr/lib/python2.7/site-packages/quantum/agent/linux/utils.py.orig	2012-11-30 10:48:29.226283473 +0900
>+++ /usr/lib/python2.7/site-packages/quantum/agent/linux/utils.py	2012-11-30 11:02:56.109055923 +0900
>@@ -23,6 +23,7 @@
> import shlex
> import socket
> import struct
>+import time
> 
> from eventlet.green import subprocess
> 
>@@ -40,19 +41,26 @@
>     env = os.environ.copy()
>     if addl_env:
>         env.update(addl_env)
>-    obj = subprocess.Popen(cmd, shell=False, stdin=subprocess.PIPE,
>-                           stdout=subprocess.PIPE, stderr=subprocess.PIPE,
>-                           env=env)
>-
>-    _stdout, _stderr = (process_input and
>-                        obj.communicate(process_input) or
>-                        obj.communicate())
>-    obj.stdin.close()
>-    m = ("\nCommand: %s\nExit code: %s\nStdout: %r\nStderr: %r" %
>-        (cmd, obj.returncode, _stdout, _stderr))
>-    LOG.debug(m)
>-    if obj.returncode and check_exit_code:
>-        raise RuntimeError(m)
>+    retry = 5
>+    while True:
>+        obj = subprocess.Popen(cmd, shell=False, stdin=subprocess.PIPE,
>+                               stdout=subprocess.PIPE, stderr=subprocess.PIPE,
>+                               env=env)
>+
>+        _stdout, _stderr = (process_input and
>+                            obj.communicate(process_input) or
>+                            obj.communicate())
>+        obj.stdin.close()
>+        m = ("\nCommand: %s\nExit code: %s\nStdout: %r\nStderr: %r" %
>+            (cmd, obj.returncode, _stdout, _stderr))
>+        LOG.debug(m)
>+        if obj.returncode and check_exit_code:
>+            retry -= 1
>+            time.sleep(0.5)
>+            if retry == 0:
>+                raise RuntimeError(m)
>+        else:
>+            break
> 
>     return return_stderr and (_stdout, _stderr) or _stdout
>

Actions: View | Diff

Attachments on bug 881733: 654286 | 654745