Merge pull request #3249 from brauner/2020-01-09/bugfixes

src/lxc/mainloop.c

@@ -65,6 +65,7 @@ int lxc_mainloop_add_handler(struct lxc_epoll_descr *descr, int fd,
 	struct epoll_event ev;
 	struct mainloop_handler *handler;
 	struct lxc_list *item;
+
 	if (fd < 0)
 		return -1;
 

src/lxc/start.c

@@ -1091,11 +1091,13 @@ void lxc_abort(const char *name, struct lxc_handler *handler)
 
 	lxc_set_state(name, handler, ABORTING);
 
-	if (handler->pidfd >= 0)
+	if (handler->pidfd >= 0) {
 		ret = lxc_raw_pidfd_send_signal(handler->pidfd, SIGKILL, NULL, 0);
-	else if (handler->pid > 0)
-		ret = kill(handler->pid, SIGKILL);
-	if (ret < 0)
+		if (ret)
+			SYSWARN("Failed to send SIGKILL via pidfd %d for process %d", handler->pidfd, handler->pid);
+	}
+
+	if (ret && (errno != ESRCH) && kill(handler->pid, SIGKILL))
 		SYSERROR("Failed to send SIGKILL to %d", handler->pid);
 
 	do {

src/tests/api_reboot.c

@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 		 */
 		sleep(5);
 
-		if (!c->reboot2(c, -1)) {
+		if (!c->reboot2(c, 60)) {
 			lxc_error("%s\n", "Failed to reboot container \"reboot\"");
 			goto on_error_stop;
 		}