Merge pull request #251 from gao-feng/pod

do not cleanup resources of pod when all of the containers are exited

Author: laijs

src/container.c

@@ -778,13 +778,3 @@ void hyper_cleanup_container(struct hyper_container *c, struct hyper_pod *pod)
 	hyper_cleanup_container_portmapping(c, pod);
 	hyper_free_container(c);
 }
-
-void hyper_cleanup_containers(struct hyper_pod *pod)
-{
-	struct hyper_container *c, *n;
-
-	list_for_each_entry_safe(c, n, &pod->containers, list)
-		hyper_cleanup_container(c, pod);
-
-	pod->remains = 0;
-}

src/container.h

@@ -59,7 +59,6 @@ struct hyper_pod;
 int hyper_setup_container(struct hyper_container *container, struct hyper_pod *pod);
 struct hyper_container *hyper_find_container(struct hyper_pod *pod, const char *id);
 void hyper_cleanup_container(struct hyper_container *container, struct hyper_pod *pod);
-void hyper_cleanup_containers(struct hyper_pod *pod);
 void hyper_free_container(struct hyper_container *c);
 
 static inline int hyper_has_container(struct hyper_pod *pod, const char *id) {

src/exec.c

@@ -715,16 +715,11 @@ static int hyper_release_exec(struct hyper_exec *exec)
 		fprintf(stdout, "%s container init exited %s, remains %d\n",
 			__func__, exec->pod->req_destroy?"manually":"automatically", exec->pod->remains);
 
-		// TODO send finish of this container and full cleanup
-		if (--exec->pod->remains > 0)
-			return 0;
-
-		if (exec->pod->req_destroy) {
+		if (--exec->pod->remains == 0 && exec->pod->req_destroy) {
 			/* shutdown vm manually, hyper doesn't care the pod finished codes */
 			hyper_pod_destroyed(0);
 		}
 
-		hyper_cleanup_pod(exec->pod);
 		return 0;
 	}
 

src/hyper.h

@@ -82,7 +82,6 @@ static inline int hyper_create(char *hyper_path)
 }
 
 int hyper_open_serial(char *tty);
-void hyper_cleanup_pod(struct hyper_pod *pod);
 int hyper_enter_sandbox(struct hyper_pod *pod, int pidpipe);
 void hyper_pod_destroyed(int failed);
 int hyper_ctl_append_msg(struct hyper_event *he, uint32_t type, uint8_t *data, uint32_t len);

src/init.c

@@ -887,47 +887,6 @@ static void hyper_cmd_online_cpu_mem()
 	}
 }
 
-static void hyper_cleanup_hostname(struct hyper_pod *pod)
-{
-	free(pod->hostname);
-	pod->hostname = NULL;
-}
-
-static void hyper_cleanup_shared(struct hyper_pod *pod)
-{
-	if (pod->share_tag == NULL) {
-		fprintf(stdout, "no shared directory\n");
-		return;
-	}
-
-	free(pod->share_tag);
-	pod->share_tag = NULL;
-	if (umount(SHARED_DIR) < 0 &&
-	    umount2(SHARED_DIR, MNT_DETACH)) {
-		perror("fail to umount shared dir");
-		return;
-	}
-
-	if (rmdir(SHARED_DIR) < 0)
-		perror("fail to delete " SHARED_DIR);
-
-	sync();
-}
-
-void hyper_cleanup_pod(struct hyper_pod *pod)
-{
-	if (pod->init_pid) {
-		hyper_kill_process(pod->init_pid);
-		pod->init_pid = 0;
-	}
-	hyper_cleanup_containers(pod);
-	hyper_cleanup_network(pod);
-	hyper_cleanup_shared(pod);
-	hyper_cleanup_dns(pod);
-	hyper_cleanup_portmapping(pod);
-	hyper_cleanup_hostname(pod);
-}
-
 static int hyper_setup_ctl_channel(char *name)
 {
 	uint8_t buf[8];