p.haul: Repairing WebGUI

Submitted by Arthur Lockman on June 3, 2016, 1:38 p.m.

Details

Message ID 1464961120-7031-1-git-send-email-alockman@redhat.com
State Rejected
Series "p.haul: Repairing WebGUI"
Headers show

Commit Message

Arthur Lockman June 3, 2016, 1:38 p.m.
From: Arthur Lockman <hello@rthr.me>

Previously the WebGUI had a redundant --fdmem parameter,
causing process migration to fail. This is now removed.

Signed-off-by: Arthur Lockman <alockman@redhat.com>
---
 webgui/p_haul_web_gui.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/webgui/p_haul_web_gui.py b/webgui/p_haul_web_gui.py
index 22aabec..e06da34 100644
--- a/webgui/p_haul_web_gui.py
+++ b/webgui/p_haul_web_gui.py
@@ -77,7 +77,7 @@  def migrate():
 
     dest_host = partner, rpc_port
 
-    connection_sks = [None, None, None]
+    connection_sks = [None, None]
 
     for i in range(len(connection_sks)):
         connection_sks[i] = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -87,8 +87,7 @@  def migrate():
     target_args = ['./p.haul', 'pid', pid, '-v', '4', '-j']
     target_args.extend(["--to", partner,
                         "--fdrpc", str(connection_sks[0].fileno()),
-                        "--fdmem", str(connection_sks[1].fileno()),
-                        "--fdfs", str(connection_sks[2].fileno())])
+                        "--fdmem", str(connection_sks[1].fileno())])
 
     # Call p.haul
     print "Exec p.haul: {0}".format(" ".join(target_args))

Comments

Adrian Reber June 3, 2016, 2:04 p.m.
Thanks Arthur for looking into the webgui and fixing it.

Acked-by: Adrian Reber <areber@redhat.com>

On Fri, Jun 03, 2016 at 09:38:40AM -0400, Arthur Lockman wrote:
> From: Arthur Lockman <hello@rthr.me>
> 
> Previously the WebGUI had a redundant --fdmem parameter,
> causing process migration to fail. This is now removed.
> 
> Signed-off-by: Arthur Lockman <alockman@redhat.com>
> ---
>  webgui/p_haul_web_gui.py | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/webgui/p_haul_web_gui.py b/webgui/p_haul_web_gui.py
> index 22aabec..e06da34 100644
> --- a/webgui/p_haul_web_gui.py
> +++ b/webgui/p_haul_web_gui.py
> @@ -77,7 +77,7 @@ def migrate():
>  
>      dest_host = partner, rpc_port
>  
> -    connection_sks = [None, None, None]
> +    connection_sks = [None, None]
>  
>      for i in range(len(connection_sks)):
>          connection_sks[i] = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
> @@ -87,8 +87,7 @@ def migrate():
>      target_args = ['./p.haul', 'pid', pid, '-v', '4', '-j']
>      target_args.extend(["--to", partner,
>                          "--fdrpc", str(connection_sks[0].fileno()),
> -                        "--fdmem", str(connection_sks[1].fileno()),
> -                        "--fdfs", str(connection_sks[2].fileno())])
> +                        "--fdmem", str(connection_sks[1].fileno())])
>  
>      # Call p.haul
>      print "Exec p.haul: {0}".format(" ".join(target_args))
> -- 
> 2.5.5
> 
> _______________________________________________
> CRIU mailing list
> CRIU@openvz.org
> https://lists.openvz.org/mailman/listinfo/criu
Pavel Emelianov June 15, 2016, 11:31 a.m.
Applied, thanks