[CRIU] [PATCH] restore: Don't finish_remote_restore on detached

Radostin Stoyanov rstoyanov1 at gmail.com
Wed Apr 25 00:12:48 MSK 2018


When --restore-detached is used with image-{cache, proxy} the
following errors were shown after successful restore.

Error (criu/img-remote.c:775): Error opening local connection for RESTORE_FINISH:null                                                                                   │
Error (criu/img-remote.c:836): Unable to open finish restore connection
Error (criu/cr-restore.c:2615): Finish remote restore failed.

Signed-off-by: Radostin Stoyanov <rstoyanov1 at gmail.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index db913b2d..f9a6b044 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2608,7 +2608,7 @@ int cr_restore_tasks(void)
 
 	ret = restore_root_task(root_item);
 
-	if (opts.remote && (finish_remote_restore() < 0)) {
+	if (opts.remote && !opts.restore_detach && (finish_remote_restore() < 0)) {
 		pr_err("Finish remote restore failed.\n");
 		goto err;
 	}
-- 
2.14.3



More information about the CRIU mailing list