[systemd-devel] [PATCH] tmpfiles: introduce type X
David Strauss
david at davidstrauss.net
Tue Jan 22 14:07:10 PST 2013
A quick web search is failing me, so I'll ask here: is this "type X" a
novel thing you're introducing or something used elsewhere? I don't
see it mentioned in Lennart's overview of tmp storage areas [1],
either.
[1] http://0pointer.de/blog/projects/tmp.html
On Fri, Jan 18, 2013 at 7:13 AM, <msekleta at redhat.com> wrote:
> From: Michal Sekletar <msekleta at redhat.com>
>
> Type X will exclude path itself from clean-up. However, if the path is a
> directory systemd-tmpfiles will clean-up its content.
>
> In contrast to type x, where path is ignored completely, type X needs some
> Age parameter. In order to determine Age parameter, we will look for config
> entries of type d or D and pick the best match. Best match is either
> exact match or longest prefix match.
> ---
> man/tmpfiles.d.xml | 15 ++++
> src/tmpfiles/tmpfiles.c | 192 +++++++++++++++++++++++++++++++-----------------
> 2 files changed, 138 insertions(+), 69 deletions(-)
>
> diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
> index 785264e..519f9bc 100644
> --- a/man/tmpfiles.d.xml
> +++ b/man/tmpfiles.d.xml
> @@ -166,6 +166,21 @@ L /tmp/foobar - - - - /dev/null</programlisting>
> </varlistentry>
>
> <varlistentry>
> + <term><varname>X</varname></term>
> + <listitem><para>Ignore a path
> + during cleanup. Use this type
> + to prevent path removal as
> + controlled with the Age parameter.
> + Note that if path is a directory,
> + content of a directory is not
> + excluded from clean-up, only
> + directory itself. Lines of this
> + type accept shell-style globs
> + in place of normal path
> + names.</para></listitem>
> + </varlistentry>
> +
> + <varlistentry>
> <term><varname>r</varname></term>
> <listitem><para>Remove a file
> or directory if it
> diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
> index d8fb07e..c2023f5 100644
> --- a/src/tmpfiles/tmpfiles.c
> +++ b/src/tmpfiles/tmpfiles.c
> @@ -70,6 +70,7 @@ typedef enum ItemType {
>
> /* These ones take globs */
> IGNORE_PATH = 'x',
> + IGNORE_DIRECTORY_PATH = 'X',
> REMOVE_PATH = 'r',
> RECURSIVE_REMOVE_PATH = 'R',
> RELABEL_PATH = 'z',
> @@ -119,7 +120,7 @@ static const char * const conf_file_dirs[] = {
> #define MAX_DEPTH 256
>
> static bool needs_glob(ItemType t) {
> - return t == IGNORE_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH;
> + return t == IGNORE_PATH || t == IGNORE_DIRECTORY_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH;
> }
>
> static struct Item* find_glob(Hashmap *h, const char *match) {
> @@ -218,6 +219,7 @@ static bool unix_socket_alive(const char *fn) {
> }
>
> static int dir_cleanup(
> + Item *i,
> const char *p,
> DIR *d,
> const struct stat *ds,
> @@ -297,7 +299,7 @@ static int dir_cleanup(
> continue;
> }
>
> - q = dir_cleanup(sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false);
> + q = dir_cleanup(i, sub_path, sub_dir, &s, cutoff, rootdev, false, maxdepth-1, false);
> closedir(sub_dir);
>
> if (q < 0)
> @@ -320,12 +322,14 @@ static int dir_cleanup(
> if (age >= cutoff)
> continue;
>
> - log_debug("rmdir '%s'\n", sub_path);
> + if (!i->type == IGNORE_DIRECTORY_PATH || !streq(dent->d_name, p)) {
> + log_debug("rmdir '%s'\n", sub_path);
>
> - if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0) {
> - if (errno != ENOENT && errno != ENOTEMPTY) {
> - log_error("rmdir(%s): %m", sub_path);
> - r = -errno;
> + if (unlinkat(dirfd(d), dent->d_name, AT_REMOVEDIR) < 0) {
> + if (errno != ENOENT && errno != ENOTEMPTY) {
> + log_error("rmdir(%s): %m", sub_path);
> + r = -errno;
> + }
> }
> }
>
> @@ -395,68 +399,6 @@ finish:
> return r;
> }
>
> -static int clean_item(Item *i) {
> - DIR *d;
> - struct stat s, ps;
> - bool mountpoint;
> - int r;
> - usec_t cutoff, n;
> -
> - assert(i);
> -
> - if (i->type != CREATE_DIRECTORY &&
> - i->type != TRUNCATE_DIRECTORY &&
> - i->type != IGNORE_PATH)
> - return 0;
> -
> - if (!i->age_set)
> - return 0;
> -
> - n = now(CLOCK_REALTIME);
> - if (n < i->age)
> - return 0;
> -
> - cutoff = n - i->age;
> -
> - d = opendir(i->path);
> - if (!d) {
> - if (errno == ENOENT)
> - return 0;
> -
> - log_error("Failed to open directory %s: %m", i->path);
> - return -errno;
> - }
> -
> - if (fstat(dirfd(d), &s) < 0) {
> - log_error("stat(%s) failed: %m", i->path);
> - r = -errno;
> - goto finish;
> - }
> -
> - if (!S_ISDIR(s.st_mode)) {
> - log_error("%s is not a directory.", i->path);
> - r = -ENOTDIR;
> - goto finish;
> - }
> -
> - if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0) {
> - log_error("stat(%s/..) failed: %m", i->path);
> - r = -errno;
> - goto finish;
> - }
> -
> - mountpoint = s.st_dev != ps.st_dev ||
> - (s.st_dev == ps.st_dev && s.st_ino == ps.st_ino);
> -
> - r = dir_cleanup(i->path, d, &s, cutoff, s.st_dev, mountpoint, MAX_DEPTH, i->keep_first_level);
> -
> -finish:
> - if (d)
> - closedir(d);
> -
> - return r;
> -}
> -
> static int item_set_perms(Item *i, const char *path) {
> /* not using i->path directly because it may be a glob */
> if (i->mode_set)
> @@ -669,6 +611,7 @@ static int create_item(Item *i) {
> switch (i->type) {
>
> case IGNORE_PATH:
> + case IGNORE_DIRECTORY_PATH:
> case REMOVE_PATH:
> case RECURSIVE_REMOVE_PATH:
> return 0;
> @@ -852,6 +795,7 @@ static int remove_item_instance(Item *i, const char *instance) {
> case CREATE_BLOCK_DEVICE:
> case CREATE_CHAR_DEVICE:
> case IGNORE_PATH:
> + case IGNORE_DIRECTORY_PATH:
> case RELABEL_PATH:
> case RECURSIVE_RELABEL_PATH:
> case WRITE_FILE:
> @@ -896,6 +840,7 @@ static int remove_item(Item *i) {
> case CREATE_CHAR_DEVICE:
> case CREATE_BLOCK_DEVICE:
> case IGNORE_PATH:
> + case IGNORE_DIRECTORY_PATH:
> case RELABEL_PATH:
> case RECURSIVE_RELABEL_PATH:
> case WRITE_FILE:
> @@ -911,6 +856,84 @@ static int remove_item(Item *i) {
> return r;
> }
>
> +static int clean_item_instance(Item *i, const char* instance) {
> + DIR *d;
> + struct stat s, ps;
> + bool mountpoint;
> + int r;
> + usec_t cutoff, n;
> +
> + assert(i);
> +
> + if (!i->age_set)
> + return 0;
> +
> + n = now(CLOCK_REALTIME);
> + if (n < i->age)
> + return 0;
> +
> + cutoff = n - i->age;
> +
> + d = opendir(instance);
> + if (!d) {
> + if (errno == ENOENT || errno == ENOTDIR)
> + return 0;
> +
> + log_error("Failed to open directory %s: %m", i->path);
> + return -errno;
> + }
> +
> + if (fstat(dirfd(d), &s) < 0) {
> + log_error("stat(%s) failed: %m", i->path);
> + r = -errno;
> + goto finish;
> + }
> +
> + if (!S_ISDIR(s.st_mode)) {
> + log_error("%s is not a directory.", i->path);
> + r = -ENOTDIR;
> + goto finish;
> + }
> +
> + if (fstatat(dirfd(d), "..", &ps, AT_SYMLINK_NOFOLLOW) != 0) {
> + log_error("stat(%s/..) failed: %m", i->path);
> + r = -errno;
> + goto finish;
> + }
> +
> + mountpoint = s.st_dev != ps.st_dev ||
> + (s.st_dev == ps.st_dev && s.st_ino == ps.st_ino);
> +
> + r = dir_cleanup(i, instance, d, &s, cutoff, s.st_dev, mountpoint, MAX_DEPTH, i->keep_first_level);
> +
> +finish:
> + if (d)
> + closedir(d);
> +
> + return r;
> +}
> +
> +static int clean_item(Item *i) {
> + int r = 0;
> +
> + assert(i);
> +
> + switch (i->type) {
> + case CREATE_DIRECTORY:
> + case TRUNCATE_DIRECTORY:
> + case IGNORE_PATH:
> + clean_item_instance(i, i->path);
> + break;
> + case IGNORE_DIRECTORY_PATH:
> + r = glob_item(i, clean_item_instance);
> + break;
> + default:
> + break;
> + }
> +
> + return r;
> +}
> +
> static int process_item(Item *i) {
> int r, q, p;
>
> @@ -1030,6 +1053,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
> case TRUNCATE_DIRECTORY:
> case CREATE_FIFO:
> case IGNORE_PATH:
> + case IGNORE_DIRECTORY_PATH:
> case REMOVE_PATH:
> case RECURSIVE_REMOVE_PATH:
> case RELABEL_PATH:
> @@ -1266,6 +1290,8 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
> FILE *f;
> unsigned v = 0;
> int r = 0;
> + Iterator iterator;
> + Item *i;
>
> assert(fn);
>
> @@ -1298,6 +1324,34 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
> r = k;
> }
>
> + /* we have to determine age parameter for each entry of type X */
> + HASHMAP_FOREACH(i, globs, iterator) {
> + Iterator iter;
> + Item *j, *candidate_item = NULL;
> +
> + if (i->type != IGNORE_DIRECTORY_PATH)
> + continue;
> +
> + HASHMAP_FOREACH(j, items, iter) {
> + if (j->type != CREATE_DIRECTORY && j->type != TRUNCATE_DIRECTORY)
> + continue;
> +
> + if (path_equal(j->path, i->path)) {
> + candidate_item = j;
> + break;
> + }
> +
> + if ((!candidate_item && path_startswith(i->path, j->path)) ||
> + (candidate_item && path_startswith(j->path, candidate_item->path) && (fnmatch(i->path, j->path, FNM_PATHNAME | FNM_PERIOD) == 0)))
> + candidate_item = j;
> + }
> +
> + if (candidate_item) {
> + i->age = candidate_item->age;
> + i->age_set = true;
> + }
> + }
> +
> if (ferror(f)) {
> log_error("Failed to read from file %s: %m", fn);
> if (r == 0)
> --
> 1.8.1
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel
--
David Strauss
| david at davidstrauss.net
| +1 512 577 5827 [mobile]
More information about the systemd-devel
mailing list