Merge lp:~serge-hallyn/upstart/cgroup-test-base1 into lp:~jamesodhunt/upstart/cgroups

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

i proposed this to see the diff generated for me =)

[James Hunt (jamesodhunt)]

Thanks Serge - pulled into lp:~jamesodhunt/upstart/cgroups.

review: Approve

[Serge Hallyn (serge-hallyn)]

Quoting James Hunt (<email address hidden>):
> Review: Approve
>
> Thanks Serge - pulled into lp:~jamesodhunt/upstart/cgroups.

Oops. Hi James, thanks, however the main reason for this patch was
in support of upcoming native upstart-cgroup support which now is not
going to happen.

So I'm not saying it necessarily should be reverted, as it still
may be useful, but I'm not sure what should be done.

[James Hunt (jamesodhunt)]

... actually, we *may* be adding native cgroup support after all :-)

=== modified file 'init/Makefile.am'
--- init/Makefile.am	2014-03-26 14:38:30 +0000
+++ init/Makefile.am	2014-04-08 14:58:40 +0000
@@ -10,6 +10,7 @@
 	$(DBUS_CFLAGS) \
 	$(JSON_CFLAGS) \
 	$(CGMANAGER_CFLAGS)
+AM_LIBADD = -lcgmanager $(NIH_LIBS) $(NIH_DBUS_LIBS)
 
 AM_CPPFLAGS = \
 	-DLOCALEDIR="\"$(localedir)\"" \
@@ -465,6 +466,7 @@
 	$(NIH_LIBS) \
 	$(NIH_DBUS_LIBS) \
 	$(DBUS_LIBS) \
+	-lcgmanager \
 	-lrt
 
 test_cgroup_SOURCES = tests/test_cgroup.c

=== modified file 'init/event.c'
--- init/event.c	2014-04-04 16:21:38 +0000
+++ init/event.c	2014-04-08 14:58:40 +0000
@@ -304,10 +304,7 @@
 event_pending_handle_jobs (Event *event)
 {
 	int  empty = TRUE;
-
-#ifdef ENABLE_CGROUPS
 	int  warn = FALSE;
-#endif /* ENABLE_CGROUPS */
 
 	nih_assert (event != NULL);
 

=== modified file 'test/Makefile.am'
--- test/Makefile.am	2013-11-16 12:42:57 +0000
+++ test/Makefile.am	2014-04-08 14:58:40 +0000
@@ -8,6 +8,7 @@
 	$(NIH_DBUS_CFLAGS) \
 	$(DBUS_CFLAGS)
 
+AM_LIBADD = -lcgmanager $(NIH_LIBS) $(NIH_DBUS_LIBS)
 AM_CPPFLAGS = \
 	-DLOCALEDIR="\"$(localedir)\"" \
 	-DSBINDIR="\"$(sbindir)\"" \
@@ -36,4 +37,5 @@
 test_util_check_env_SOURCES = tests/test_util_check_env.c
 test_util_check_env_LDADD = \
 	libtest_util_common.a \
-	$(NIH_LIBS)
+	-lcgmanager \
+	$(NIH_LIBS) $(NIH_DBUS_LIBS)

=== modified file 'test/test_util_common.c'
--- test/test_util_common.c	2014-04-03 14:58:47 +0000
+++ test/test_util_common.c	2014-04-08 14:58:40 +0000
@@ -48,6 +48,9 @@
 
 #include "dbus/upstart.h"
 
+#include <nih-dbus/dbus_connection.h>
+#include <cgmanager/cgmanager-client.h>
+
 #include "test_util_common.h"
 
 #ifndef UPSTART_BINARY
@@ -1087,7 +1090,7 @@
 }
 
 NihList *
-test_list_get_index (NihList *list, size_t count)
+test_list_get_strchr (NihList *list, size_t count)
 {
 	size_t i = 0;
 
@@ -1225,3 +1228,170 @@
 
 	return (ret == -1 ? 0 : len);
 }
+
+static NihDBusProxy *cgroup_manager;
+#define CGMANAGER_DBUS_SOCK "unix:path=/sys/fs/cgroup/cgmanager/sock"
+/*
+ * connect_to_cgmanager:
+ *
+ * Returns -2 if cgmanager is not running, -1 on other error,
+ * and 0 on success
+ */
+int
+connect_to_cgmanager(void)
+{
+	DBusError dbus_error;
+	static DBusConnection *connection;
+
+	dbus_error_init(&dbus_error);
+
+	connection = dbus_connection_open_private(CGMANAGER_DBUS_SOCK, &dbus_error);
+	if (!connection) {
+		nih_error("Failed opening dbus connection: %s: %s",
+				dbus_error.name, dbus_error.message);
+		dbus_error_free(&dbus_error);
+		return -2;
+	}
+	if (nih_dbus_setup(connection, NULL) < 0) {
+		NihError *nerr;
+		nerr = nih_error_get();
+		nih_error("Unable to open cgmanager connection at %s: %s", CGMANAGER_DBUS_SOCK,
+			nerr->message);
+		nih_free(nerr);
+		dbus_error_free(&dbus_error);
+		dbus_connection_unref(connection);
+		return -1;
+	}
+	dbus_connection_set_exit_on_disconnect(connection, FALSE);
+	dbus_error_free(&dbus_error);
+	cgroup_manager = nih_dbus_proxy_new(NULL, connection,
+				NULL /* p2p */,
+				"/org/linuxcontainers/cgmanager", NULL, NULL);
+	dbus_connection_unref(connection);
+	if (!cgroup_manager) {
+		NihError *nerr;
+		nerr = nih_error_get();
+		nih_error("Error opening cgmanager proxy: %s", nerr->message);
+		nih_free(nerr);
+		return -1;
+	}
+
+	if (cgmanager_ping_sync(NULL, cgroup_manager, 0) != 0) {
+		NihError *nerr;
+		nerr = nih_error_get();
+		nih_error("Error pinging cgroup manager: %s", nerr->message);
+		nih_free(nerr);
+		disconnect_cgmanager();
+		return -1;
+	}
+	return 0;
+}
+
+void
+disconnect_cgmanager(void)
+{
+       if (cgroup_manager) {
+	       dbus_connection_flush(cgroup_manager->connection);
+	       dbus_connection_close(cgroup_manager->connection);
+               nih_free(cgroup_manager);
+       }
+       cgroup_manager = NULL;
+}
+
+/*
+ * get_pid_cgroup:
+ *
+ * @controller: cgroup controller to query
+ * @pid: pid whose cgroup to return
+ *
+ * The result must be nih_freed
+ */
+char *
+get_pid_cgroup(const char *controller, pid_t pid)
+{
+	char *str;
+	if (cgmanager_get_pid_cgroup_sync(NULL, cgroup_manager,
+				controller, pid, &str) != 0) {
+		
+		NihError *nerr;
+		nerr = nih_error_get();
+		nih_error("call to cgmanager_set_value_sync failed: %s", nerr->message);
+		nih_free(nerr);
+		return NULL;
+	}
+	return str;
+}
+
+/*
+ * setup_cgroup_sandbox:
+ *
+ * Creates a unique cgroup, sets it to remove on empty, and enters the
+ * current task into the new cgroup.
+ */
+int
+setup_cgroup_sandbox(void)
+{
+	char tmpnam[32], line[1024], *cg;
+	int32_t e;
+	int ret = -1, fd = -1;
+	FILE *cgf = NULL;
+	pid_t mypid = getpid();
+
+	if (!cgroup_manager) {
+		nih_error("%s: connect_to_cgmanager must be called first",
+				__func__);
+		goto out;
+	}
+	memset(tmpnam, 0, 32);
+	strcpy(tmpnam, "/tmp/upstart-test-XXXXXX");
+	if ((fd = mkstemp(tmpnam)) < 0) {
+		nih_error("%s: failed to create a tempfile", __func__);
+		goto out;
+	}
+	unlink(tmpnam);
+	cg = tmpnam+5;
+
+	if ((cgf = fopen("/proc/cgroups", "r")) == NULL) {
+		nih_error("%s: failed to read my cgroups", __func__);
+		goto out;
+	}
+	while (fgets(line, 1024, cgf)) {
+		char *p;
+		if (line[0] == '#')
+			continue;
+
+		p = strchr(line, '\t');
+		if (!p) {
+			nih_error("failed to find a \t");
+			continue;
+		}
+		*p = '\0';
+		if (cgmanager_create_sync(NULL, cgroup_manager, line, cg,
+					&e) != 0) {
+			nih_error("%s: failed to create cgroup %s:%s",
+				__func__, line, cg);
+			goto out;
+		}
+		if (e == 1)
+			nih_warn("%s: boggle: cgroup %s:%s already existed",
+					__func__, line, cg);
+		if (cgmanager_remove_on_empty_sync(NULL, cgroup_manager, line,
+					cg) != 0)
+			nih_warn("%s: failed to mark %s:%s remove-on-empty",
+				__func__, line, cg);
+		if (cgmanager_move_pid_sync(NULL, cgroup_manager, line, cg,
+					mypid) != 0) {
+			nih_error("%s: failed to move myself to cgroup %s:%s",
+				__func__, line, cg);
+			goto out;
+		}
+	}
+	ret = 0;
+
+out:
+	if (fd != -1)
+		close(fd);
+	if (cgf)
+		fclose(cgf);
+	return ret;
+}

=== modified file 'test/test_util_common.h'
--- test/test_util_common.h	2014-03-26 14:38:30 +0000
+++ test/test_util_common.h	2014-04-08 14:58:40 +0000
@@ -775,4 +775,8 @@
 size_t test_tree_count (NihTree *tree)
 	__attribute__((warn_unused_result, unused));
 
+int connect_to_cgmanager(void);
+void disconnect_cgmanager(void);
+char *get_pid_cgroup(const char *controller, pid_t pid);
+int setup_cgroup_sandbox(void);
 #endif /* TEST_UTIL_COMMON_H */

=== modified file 'test/tests/test_util_check_env.c'
--- test/tests/test_util_check_env.c	2013-11-06 17:59:04 +0000
+++ test/tests/test_util_check_env.c	2014-04-08 14:58:40 +0000
@@ -72,6 +72,68 @@
 	return found;
 }
 
+void print_my_cgroup(void)
+{
+	char *str;
+	str = get_pid_cgroup("freezer", getpid());
+	if (str) {
+		nih_warn("I am in freezer cgroup: %s", str);
+		TEST_EQ_STR(str, "/");
+		nih_free(str);
+	} else {
+		TEST_FAILED("Failed to get my freezer cgroup");
+	}
+}
+
+char *get_my_cgroup()
+{
+	char line[1024], *ret = NULL;
+	FILE *f = fopen("/proc/self/cgroup", "r");
+
+	while (fgets(line, 1024, f)) {
+		char *p, *p2;
+		if ((p = strchr(line, ':')) == NULL)
+			continue;
+		p++;
+		if ((p2 = strchr(p, ':')) == NULL)
+			continue;
+		if (strncmp(p, "name=", 5) == 0)
+			continue;
+		ret = NIH_MUST( nih_strdup(NULL, p2+1) );
+		break;
+	}
+	fclose(f);
+	return ret;
+}
+
+int check_cgroup_sandbox(void)
+{
+	char *cg_prev = NULL, *cg_post = NULL;
+	int ret = -1;
+
+	cg_prev = get_my_cgroup();
+	if (!cg_prev)
+		return -1;
+	if (setup_cgroup_sandbox() < 0) {
+		nih_free(cg_prev);
+		return -1;
+	}
+	cg_post = get_my_cgroup();
+	if (!cg_post) {
+		nih_free(cg_prev);
+		return -1;
+	}
+	/* we should have moved cgroups, so the two should be different */
+	if (strcmp(cg_prev, cg_post) != 0) {
+		nih_warn("setup_cgroup_sandbox moved me from %s to %s",
+				cg_prev, cg_post);
+		ret = 0;
+	}
+	nih_free(cg_prev);
+	nih_free(cg_post);
+	return ret;
+}
+
 /**
  * test_checks:
  *
@@ -80,6 +142,8 @@
 void
 test_checks (void)
 {
+	int ret;
+
 	TEST_GROUP ("test environment");
 
 	/*
@@ -94,6 +158,19 @@
 		nih_warn ("This environment will probably cause tests to fail mysteriously!!");
 		nih_warn ("See bug LP:#882147 for further details.");
 	}
+
+	TEST_FEATURE ("checking for cgmanager");
+	ret = connect_to_cgmanager();
+	switch(ret) {
+	case -2: TEST_FAILED("Found no cgroup manager"); break;
+	case -1: TEST_FAILED("Error connecting to cgmanager"); break;
+	case 0: print_my_cgroup(); break;
+	default: TEST_FAILED("Unknown error from connect_to_cgmanager: %d", ret);
+	}
+
+	TEST_FEATURE("cgroup sandbox");
+	TEST_EQ(check_cgroup_sandbox(), 0);
+	disconnect_cgmanager();
 }
 
 int