Fixing container restore issue due to different IDs

Signed-off-by: rajasec <rajasec79@gmail.com>

Author: rajasec

restore.go

@@ -94,8 +94,9 @@ func restoreContainer(context *cli.Context, spec *specs.LinuxSpec, config *confi
 	if err != nil {
 		logrus.Error(err)
 	}
-	if status == libcontainer.Running {
-		fatal(fmt.Errorf("Container with id %s already running", context.GlobalString("id")))
+	_, cerr := handleContainerstatus(status, container, context)
+	if cerr != nil {
+		return -1, cerr
 	}
 	// ensure that the container is always removed if we were the process
 	// that created it.
@@ -143,6 +144,22 @@ func restoreContainer(context *cli.Context, spec *specs.LinuxSpec, config *confi
 	return handler.forward(process)
 }
 
+func handleContainerstatus(status libcontainer.Status, container libcontainer.Container, context *cli.Context) (int, error) {
+	switch status {
+	case libcontainer.Running:
+		return -1, fmt.Errorf("Container with id %s already running", context.GlobalString("id"))
+	case libcontainer.Destroyed:
+		defer func() {
+			// Ensure to clean/destroy the container as the container id got created during restore startup
+			if err := container.Destroy(); err != nil {
+				logrus.Error(err)
+			}
+		}()
+		return -1, fmt.Errorf("Container with id %s does not exists", context.GlobalString("id"))
+	}
+	return 1, nil
+}
+
 func criuOptions(context *cli.Context) *libcontainer.CriuOpts {
 	imagePath := getCheckpointImagePath(context)
 	if err := os.MkdirAll(imagePath, 0655); err != nil {