proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-08 04:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

re-open cgmanager socket after fork in daemonized start

Browse Source 
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2014-02-15 00:16:58 +01:00 committed by Stéphane Graber
parent 1d16785799
commit 7eb44573b0
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lxc/cgmanager.c
View File

@ -114,6 +114,7 @@ static bool cgm_dbus_connect(void)
static void cgm_dbus_disconnect(void) static void cgm_dbus_disconnect(void)
{ {
if (cgroup_manager)
nih_free(cgroup_manager); nih_free(cgroup_manager);
cgroup_manager = NULL; cgroup_manager = NULL;
} }
@ -886,5 +887,6 @@ static struct cgroup_ops cgmanager_ops = {
.attach = cgm_attach, .attach = cgm_attach,
.mount_cgroup = cgm_mount_cgroup, .mount_cgroup = cgm_mount_cgroup,
.nrtasks = cgm_get_nrtasks, .nrtasks = cgm_get_nrtasks,
.disconnect = cgm_dbus_disconnect,
}; };
#endif #endif

8
src/lxc/cgroup.c
View File

@ -167,3 +167,11 @@ int lxc_cgroup_get(const char *filename, char *value, size_t len, const char *na
return ops->get(filename, value, len, name, lxcpath); return ops->get(filename, value, len, name, lxcpath);
return -1; return -1;
} }
void restart_cgroups(void)
{
if (ops && ops->disconnect)
ops->disconnect();
ops = NULL;
cgroup_ops_init();
}

2
src/lxc/cgroup.h
View File

@ -49,6 +49,7 @@ struct cgroup_ops {
bool (*attach)(const char *name, const char *lxcpath, pid_t pid); bool (*attach)(const char *name, const char *lxcpath, pid_t pid);
bool (*mount_cgroup)(void *hdata, const char *root, int type); bool (*mount_cgroup)(void *hdata, const char *root, int type);
int (*nrtasks)(void *hdata); int (*nrtasks)(void *hdata);
void (*disconnect)(void);
}; };
extern bool cgroup_attach(const char *name, const char *lxcpath, pid_t pid); extern bool cgroup_attach(const char *name, const char *lxcpath, pid_t pid);
@ -64,5 +65,6 @@ extern bool cgroup_create_legacy(struct lxc_handler *handler);
extern int cgroup_nrtasks(struct lxc_handler *handler); extern int cgroup_nrtasks(struct lxc_handler *handler);
extern const char *cgroup_get_cgroup(struct lxc_handler *handler, const char *subsystem); extern const char *cgroup_get_cgroup(struct lxc_handler *handler, const char *subsystem);
extern bool cgroup_unfreeze(struct lxc_handler *handler); extern bool cgroup_unfreeze(struct lxc_handler *handler);
extern void restart_cgroups(void);
#endif #endif

1
src/lxc/lxccontainer.c
View File

@ -637,6 +637,7 @@ static bool lxcapi_start(struct lxc_container *c, int useinit, char * const argv
open("/dev/null", O_RDWR); open("/dev/null", O_RDWR);
open("/dev/null", O_RDWR); open("/dev/null", O_RDWR);
setsid(); setsid();
restart_cgroups();
} else { } else {
if (!am_single_threaded()) { if (!am_single_threaded()) {
ERROR("Cannot start non-daemonized container when threaded"); ERROR("Cannot start non-daemonized container when threaded");