shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

machined: also set up /var/lib/machines as btrfs, if "machinectl set-limit" is called

Browse Source
This commit is contained in:
Lennart Poettering 2015-03-02 19:21:04 +01:00
parent 65eae3b762
commit 4cee5eede2
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/import/importd.c
View File

@ -689,7 +689,7 @@ static int method_pull_tar_or_raw(sd_bus *bus, sd_bus_message *msg, void *userda
if (v < 0) if (v < 0)
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown verification mode %s", verify); return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown verification mode %s", verify);
r = setup_machine_directory(error); r = setup_machine_directory((uint64_t) -1, error);
if (r < 0) if (r < 0)
return r; return r;
@ -784,7 +784,7 @@ static int method_pull_dkr(sd_bus *bus, sd_bus_message *msg, void *userdata, sd_
if (v != IMPORT_VERIFY_NO) if (v != IMPORT_VERIFY_NO)
return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "DKR does not support verification."); return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, "DKR does not support verification.");
r = setup_machine_directory(error); r = setup_machine_directory((uint64_t) -1, error);
if (r < 0) if (r < 0)
return r; return r;

6
src/machine/machined-dbus.c
View File

@ -31,6 +31,7 @@
#include "cgroup-util.h" #include "cgroup-util.h"
#include "btrfs-util.h" #include "btrfs-util.h"
#include "machine-image.h" #include "machine-image.h"
#include "machine-pool.h"
#include "image-dbus.h" #include "image-dbus.h"
#include "machined.h" #include "machined.h"
#include "machine-dbus.h" #include "machine-dbus.h"
@ -799,6 +800,11 @@ static int method_set_pool_limit(sd_bus *bus, sd_bus_message *message, void *use
if (r == 0) if (r == 0)
return 1; /* Will call us back */ return 1; /* Will call us back */
/* Set up the machine directory if necessary */
r = setup_machine_directory(limit, error);
if (r < 0)
return r;
r = btrfs_resize_loopback("/var/lib/machines", limit); r = btrfs_resize_loopback("/var/lib/machines", limit);
if (r < 0 && r != -ENODEV) if (r < 0 && r != -ENODEV)
return sd_bus_error_set_errnof(error, r, "Failed to adjust loopback limit: %m"); return sd_bus_error_set_errnof(error, r, "Failed to adjust loopback limit: %m");

14
src/shared/machine-pool.c
View File

@ -47,7 +47,7 @@ static int check_btrfs(void) {
return F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC); return F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC);
} }
static int setup_machine_raw(sd_bus_error *error) { static int setup_machine_raw(uint64_t size, sd_bus_error *error) {
_cleanup_free_ char *tmp = NULL; _cleanup_free_ char *tmp = NULL;
_cleanup_close_ int fd = -1; _cleanup_close_ int fd = -1;
struct statvfs ss; struct statvfs ss;
@ -91,7 +91,7 @@ static int setup_machine_raw(sd_bus_error *error) {
goto fail; goto fail;
} }
if (ftruncate(fd, VAR_LIB_MACHINES_SIZE_START) < 0) { if (ftruncate(fd, size) < 0) {
r = sd_bus_error_set_errnof(error, errno, "Failed to enlarge /var/lib/machines.raw: %m"); r = sd_bus_error_set_errnof(error, errno, "Failed to enlarge /var/lib/machines.raw: %m");
goto fail; goto fail;
} }
@ -160,7 +160,7 @@ fail:
return r; return r;
} }
int setup_machine_directory(sd_bus_error *error) { int setup_machine_directory(uint64_t size, sd_bus_error *error) {
_cleanup_release_lock_file_ LockFile lock_file = LOCK_FILE_INIT; _cleanup_release_lock_file_ LockFile lock_file = LOCK_FILE_INIT;
struct loop_info64 info = { struct loop_info64 info = {
.lo_flags = LO_FLAGS_AUTOCLEAR, .lo_flags = LO_FLAGS_AUTOCLEAR,
@ -171,6 +171,12 @@ int setup_machine_directory(sd_bus_error *error) {
bool tmpdir_made = false, mntdir_made = false, mntdir_mounted = false; bool tmpdir_made = false, mntdir_made = false, mntdir_mounted = false;
int r, nr = -1; int r, nr = -1;
/* btrfs cannot handle file systems < 16M, hence use this as minimum */
if (size == (uint64_t) -1)
size = VAR_LIB_MACHINES_SIZE_START;
else if (size < 16*1024*1024)
size = 16*1024*1024;
/* Make sure we only set the directory up once at a time */ /* Make sure we only set the directory up once at a time */
r = make_lock_file("/run/systemd/machines.lock", LOCK_EX, &lock_file); r = make_lock_file("/run/systemd/machines.lock", LOCK_EX, &lock_file);
if (r < 0) if (r < 0)
@ -193,7 +199,7 @@ int setup_machine_directory(sd_bus_error *error) {
dir_is_empty("/var/lib/machines") == 0) dir_is_empty("/var/lib/machines") == 0)
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "/var/lib/machines is not a btrfs file system. Operation is not supported on legacy file systems."); return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "/var/lib/machines is not a btrfs file system. Operation is not supported on legacy file systems.");
fd = setup_machine_raw(error); fd = setup_machine_raw(size, error);
if (fd < 0) if (fd < 0)
return fd; return fd;

2
src/shared/machine-pool.h
View File

@ -23,4 +23,4 @@
#include "sd-bus.h" #include "sd-bus.h"
int setup_machine_directory(sd_bus_error *error); int setup_machine_directory(uint64_t size, sd_bus_error *error);