From 09750ce3525129a676dec4f579aea3ad2eca1b19 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 9 Jan 2023 11:09:14 +0000 Subject: Add instances implementation (still needs testing) Signed-off-by: Laurent Bercot --- doc/index.html | 10 ++ doc/instances.html | 121 ++++++++++++++++++ doc/s6-instance-control.html | 65 ++++++++++ doc/s6-instance-create.html | 92 ++++++++++++++ doc/s6-instance-delete.html | 72 +++++++++++ doc/s6-instance-maker.html | 203 ++++++++++++++++++++++++++++++ doc/s6-log.html | 2 +- doc/s6-svc.html | 7 +- doc/s6-usertree-maker.html | 6 +- doc/servicedir.html | 7 ++ package/deps.mak | 9 ++ package/modes | 3 + package/targets.mak | 5 +- src/instance/deps-exe/s6-instance-control | 1 + src/instance/deps-exe/s6-instance-create | 2 + src/instance/deps-exe/s6-instance-delete | 2 + src/instance/s6-instance-control.c | 79 ++++++++++++ src/instance/s6-instance-create.c | 97 ++++++++++++++ src/instance/s6-instance-delete.c | 61 +++++++++ src/instance/s6-instance-maker.c | 2 +- src/libs6/s6_supervise_link_names.c | 3 +- src/supervision/s6-svc.c | 45 +++++-- 22 files changed, 881 insertions(+), 13 deletions(-) create mode 100644 doc/instances.html create mode 100644 doc/s6-instance-control.html create mode 100644 doc/s6-instance-create.html create mode 100644 doc/s6-instance-delete.html create mode 100644 doc/s6-instance-maker.html create mode 100644 src/instance/deps-exe/s6-instance-control create mode 100644 src/instance/deps-exe/s6-instance-create create mode 100644 src/instance/deps-exe/s6-instance-delete create mode 100644 src/instance/s6-instance-control.c create mode 100644 src/instance/s6-instance-create.c create mode 100644 src/instance/s6-instance-delete.c diff --git a/doc/index.html b/doc/index.html index c0c8403..8b87d71 100644 --- a/doc/index.html +++ b/doc/index.html @@ -271,6 +271,16 @@ synchronization.
  • The s6-usertree-maker program
    • +

    Management of dynamic instances

    + + +

    Timed lock acquisition

    Operation of the service

    diff --git a/doc/servicedir.html b/doc/servicedir.html index 4ae06c2..89a272d 100644 --- a/doc/servicedir.html +++ b/doc/servicedir.html @@ -209,6 +209,13 @@ created by s6-supervise if it does not exist. is the rendez-vous point for listeners, where s6-supervise will send notifications when the service goes up or down. +
  • Optional directories named instance +and instances. Those are internal subdirectories created by +s6-instance maker in a templated service +directory. Outside of instanced services, these directories should never +appear, and you should never create them manually.
    • + +
  • An optional service directory named log. If it exists and foo is in a scandir, and s6-svscan runs on that scandir, then two services are monitored: foo and diff --git a/package/deps.mak b/package/deps.mak index 7aad077..c881c5e 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -42,6 +42,9 @@ src/fdholder/s6-fdholder-setdump.o src/fdholder/s6-fdholder-setdump.lo: src/fdho src/fdholder/s6-fdholder-store.o src/fdholder/s6-fdholder-store.lo: src/fdholder/s6-fdholder-store.c src/include/s6/fdholder.h src/fdholder/s6-fdholder-transferdump.o src/fdholder/s6-fdholder-transferdump.lo: src/fdholder/s6-fdholder-transferdump.c src/include/s6/fdholder.h src/fdholder/s6-fdholderd.o src/fdholder/s6-fdholderd.lo: src/fdholder/s6-fdholderd.c src/include/s6/accessrules.h src/include/s6/fdholder.h +src/instance/s6-instance-control.o src/instance/s6-instance-control.lo: src/instance/s6-instance-control.c src/include/s6/config.h +src/instance/s6-instance-create.o src/instance/s6-instance-create.lo: src/instance/s6-instance-create.c src/include/s6/supervise.h +src/instance/s6-instance-delete.o src/instance/s6-instance-delete.lo: src/instance/s6-instance-delete.c src/include/s6/supervise.h src/instance/s6-instance-maker.o src/instance/s6-instance-maker.lo: src/instance/s6-instance-maker.c src/include/s6/auto.h src/include/s6/config.h src/libs6/ftrig1_free.o src/libs6/ftrig1_free.lo: src/libs6/ftrig1_free.c src/libs6/ftrig1.h src/libs6/ftrig1_make.o src/libs6/ftrig1_make.lo: src/libs6/ftrig1_make.c src/libs6/ftrig1.h @@ -217,6 +220,12 @@ s6-fdholder-transferdump: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} s6-fdholder-transferdump: src/fdholder/s6-fdholder-transferdump.o ${LIBS6} s6-fdholderd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} s6-fdholderd: src/fdholder/s6-fdholderd.o ${LIBS6} +s6-instance-control: EXTRA_LIBS := -lskarnet +s6-instance-control: src/instance/s6-instance-control.o +s6-instance-create: EXTRA_LIBS := -lskarnet +s6-instance-create: src/instance/s6-instance-create.o ${LIBS6} +s6-instance-delete: EXTRA_LIBS := -lskarnet +s6-instance-delete: src/instance/s6-instance-delete.o ${LIBS6} s6-instance-maker: EXTRA_LIBS := -lskarnet s6-instance-maker: src/instance/s6-instance-maker.o libs6auto.a.xyzzy ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) diff --git a/package/modes b/package/modes index a0ee4ae..a76c1e1 100644 --- a/package/modes +++ b/package/modes @@ -66,3 +66,6 @@ s6-fdholder-transferdump 0755 s6-fdholder-transferdumpc 0755 s6-usertree-maker 0755 s6-instance-maker 0755 +s6-instance-create 0755 +s6-instance-delete 0755 +s6-instance-control 0755 diff --git a/package/targets.mak b/package/targets.mak index 2f6f81a..8e58122 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -56,7 +56,10 @@ s6-fdholder-getdump \ s6-fdholder-setdump \ s6-fdholder-transferdump \ s6-applyuidgid \ -s6-setuidgid +s6-setuidgid \ +s6-instance-create \ +s6-instance-delete \ +s6-instance-control LIBEXEC_TARGETS := s6lockd-helper diff --git a/src/instance/deps-exe/s6-instance-control b/src/instance/deps-exe/s6-instance-control new file mode 100644 index 0000000..e7187fe --- /dev/null +++ b/src/instance/deps-exe/s6-instance-control @@ -0,0 +1 @@ +-lskarnet diff --git a/src/instance/deps-exe/s6-instance-create b/src/instance/deps-exe/s6-instance-create new file mode 100644 index 0000000..08815d9 --- /dev/null +++ b/src/instance/deps-exe/s6-instance-create @@ -0,0 +1,2 @@ +${LIBS6} +-lskarnet diff --git a/src/instance/deps-exe/s6-instance-delete b/src/instance/deps-exe/s6-instance-delete new file mode 100644 index 0000000..08815d9 --- /dev/null +++ b/src/instance/deps-exe/s6-instance-delete @@ -0,0 +1,2 @@ +${LIBS6} +-lskarnet diff --git a/src/instance/s6-instance-control.c b/src/instance/s6-instance-control.c new file mode 100644 index 0000000..899ab89 --- /dev/null +++ b/src/instance/s6-instance-control.c @@ -0,0 +1,79 @@ +/* ISC license. */ + +#include + +#include +#include +#include +#include +#include + +#include + +#define USAGE "s6-instance-control [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T timeout ] [ -abqhkti12pcyroduDUxOX ] service instance" +#define dieusage() strerr_dieusage(100, USAGE) + +#define DATASIZE 63 + +int main (int argc, char const **argv) +{ + char const **fullargv = argv ; + size_t namelen ; + PROG = "s6-instance-control" ; + + { + subgetopt l = SUBGETOPT_ZERO ; + unsigned int datalen = 1 ; + unsigned int timeout = 0 ; + for (;;) + { + int opt = subgetopt_r(argc, argv, "abqhkti12pcyroduxOT:w:", &l) ; + if (opt == -1) break ; + switch (opt) + { + case 'a' : + case 'b' : + case 'q' : + case 'h' : + case 'k' : + case 't' : + case 'i' : + case '1' : + case '2' : + case 'p' : + case 'c' : + case 'y' : + case 'r' : + case 'o' : + case 'd' : + case 'u' : + case 'D' : + case 'U' : + case 'x' : + case 'O' : if (datalen++ >= DATASIZE) strerr_dief1x(100, "too many commands") ; break ; + case 'T' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ; + case 'w' : if (!memchr("dDuUrR", l.arg[0], 6)) dieusage() ; break ; + default : dieusage() ; + } + } + argc -= l.ind ; argv += l.ind ; + } + + if (argc < 2) dieusage() ; + namelen = strlen(argv[1]) ; + if (!argv[0][0]) strerr_dief1x(100, "invalid service name") ; + if (!argv[1][0] || argv[1][0] == '.' || byte_in(argv[1], namelen, " \t\f\r\n", 5) < 5) + strerr_dief1x(100, "invalid instance name") ; + + { + size_t svlen = strlen(argv[0]) ; + char fn[svlen + 11 + namelen] ; + memcpy(fn, argv[0], svlen) ; + memcpy(fn + svlen, "/instance/", 10) ; + memcpy(fn + svlen + 10, argv[1], namelen + 1) ; + argv[0] = fn ; + argv[1] = 0 ; + fullargv[0] = S6_BINPREFIX "s6-svc" ; + xexec(fullargv) ; + } +} diff --git a/src/instance/s6-instance-create.c b/src/instance/s6-instance-create.c new file mode 100644 index 0000000..2e97618 --- /dev/null +++ b/src/instance/s6-instance-create.c @@ -0,0 +1,97 @@ +/* ISC license. */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#define USAGE "s6-instance-create [ -d | -D ] [ -f ] [ -P ] [ -t timeout ] service instancename" +#define dieusage() strerr_dieusage(100, USAGE) + +static inline void checkinstanced (char const *s) /* chdirs */ +{ + int fd, r ; + size_t len = strlen(s) ; + char fn[len + 10] ; + memcpy(fn, s, len) ; + memcpy(fn + len, "/instance", 10) ; + if (chdir(fn) == -1) strerr_diefu2sys(111, "chdir to ", fn) ; + fd = open_read(S6_SVSCAN_CTLDIR "/lock") ; + if (fd < 0) strerr_diefu3sys(111, "open ", fn, "/" S6_SVSCAN_CTLDIR "/lock") ; + r = fd_islocked(fd) ; + if (r < 0) strerr_diefu3sys(111, "check lock on ", fn, "/" S6_SVSCAN_CTLDIR "/lock") ; + if (!r) strerr_dief2x(1, "instanced service not running on ", s) ; + fd_close(fd) ; +} + +static void cleanup (char const *s) +{ + int e = errno ; + rm_rf(s) ; + errno = e ; +} + +int main (int argc, char const *const *argv) +{ + tain tto = TAIN_INFINITE_RELATIVE ; + size_t namelen ; + uint32_t options = 16 ; + PROG = "s6-instance-create" ; + { + unsigned int t = 0 ; + subgetopt l = SUBGETOPT_ZERO ; + for (;;) + { + int opt = subgetopt_r(argc, argv, "dDfPt:", &l) ; + if (opt == -1) break ; + switch (opt) + { + case 'd' : options |= 12 ; break ; + case 'D' : options |= 4 ; options &= ~8U ; break ; + case 'f' : options |= 1 ; break ; + case 'P' : options |= 2 ; break ; + case 't' : if (!uint0_scan(l.arg, &t)) dieusage() ; break ; + default : dieusage() ; + } + } + argc -= l.ind ; argv += l.ind ; + if (t) tain_from_millisecs(&tto, t) ; + } + if (argc < 2) dieusage() ; + + namelen = strlen(argv[1]) ; + if (!argv[0][0]) strerr_dief1x(100, "invalid service path") ; + if (!argv[1][0] || argv[1][0] == '.' || byte_in(argv[1], namelen, " \t\f\r\n", 5) < 5) + strerr_dief1x(100, "invalid instance name") ; + checkinstanced(argv[0]) ; + + tain_now_set_stopwatch_g() ; + tain_add_g(&tto, &tto) ; + + { + char sv[namelen + 14] ; + memcpy(sv, "../instances/", 13) ; + memcpy(sv + 13, argv[1], namelen + 1) ; + if (!hiercopy("../instances/.template", sv)) + { + cleanup(sv) ; + strerr_diefu5sys(111, "copy ", argv[0], "/instances/.template to ", argv[0], sv+2) ; + } + if (s6_supervise_link_names_g(".", (char const *const *)&sv, argv + 1, 1, options, &tto) == -1) + { + cleanup(sv) ; + strerr_diefu4sys(errno == ETIMEDOUT ? 99 : 111, "creatre instance of ", argv[0], " named ", argv[1]) ; + } + } + return 0 ; +} diff --git a/src/instance/s6-instance-delete.c b/src/instance/s6-instance-delete.c new file mode 100644 index 0000000..fc1337a --- /dev/null +++ b/src/instance/s6-instance-delete.c @@ -0,0 +1,61 @@ +/* ISC license. */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include + +#define USAGE "s6-instance-delete [ -X ] [ -t timeout ] service instancename" +#define dieusage() strerr_dieusage(100, USAGE) + +int main (int argc, char const *const *argv) +{ + tain tto = TAIN_INFINITE_RELATIVE ; + uint32_t options = 1 ; + PROG = "s6-instance-delete" ; + { + unsigned int t = 0 ; + subgetopt l = SUBGETOPT_ZERO ; + for (;;) + { + int opt = subgetopt_r(argc, argv, "Xt:", &l) ; + if (opt == -1) break ; + switch (opt) + { + case 'X' : options &= ~1U ; break ; + case 't' : if (!uint0_scan(l.arg, &t)) dieusage() ; break ; + default : dieusage() ; + } + } + argc -= l.ind ; argv += l.ind ; + if (t) tain_from_millisecs(&tto, t) ; + } + if (argc < 2) dieusage() ; + if (!argv[0][0]) strerr_dief1x(100, "invalid service path") ; + if (!argv[1][0] || argv[1][0] == '.' || byte_in(argv[1], strlen(argv[1]), " \t\f\r\n", 5) < 5) + strerr_dief1x(100, "invalid instance name") ; + + tain_now_set_stopwatch_g() ; + tain_add_g(&tto, &tto) ; + + { + size_t svlen = strlen(argv[0]) ; + char sc[svlen + 10] ; + memcpy(sc, argv[0], svlen) ; + memcpy(sc + svlen, "/instance", 10) ; + if (s6_supervise_unlink_names_g(sc, argv + 1, 1, options, &tto) == -1) + strerr_diefu4sys(111, "prepare deletion of instance ", argv[1], " of service ", argv[0]) ; + } + + return 0 ; +} diff --git a/src/instance/s6-instance-maker.c b/src/instance/s6-instance-maker.c index 20f557f..e70e569 100644 --- a/src/instance/s6-instance-maker.c +++ b/src/instance/s6-instance-maker.c @@ -37,7 +37,7 @@ static int write_run (buffer *b, void *data) size_t l ; char fmt[UINT_FMT] ; l = uint_fmt(fmt, t->maxinstances) ; - if (buffer_puts(b, EXECLINE_EXTBINPREFIX "execlineb -S1\n\n" + if (buffer_puts(b, EXECLINE_EXTBINPREFIX "execlineb -P\n\n" EXECLINE_EXTBINPREFIX "fdmove -c 2 1\n") < 0) return 0 ; if (t->user) { diff --git a/src/libs6/s6_supervise_link_names.c b/src/libs6/s6_supervise_link_names.c index 9af573f..de8e5c5 100644 --- a/src/libs6/s6_supervise_link_names.c +++ b/src/libs6/s6_supervise_link_names.c @@ -42,6 +42,7 @@ static uint16_t registerit (ftrigr_t *a, char *fn, size_t len, gid_t gid, uint32 bit 1: make event/ public bit 2: don't start the service bit 3: remove down files after starting supervisors + bit 4: allow links to relative paths */ int s6_supervise_link_names (char const *scdir, char const *const *servicedirs, char const *const *names, size_t n, uint32_t options, tain const *deadline, tain *stamp) @@ -118,7 +119,7 @@ int s6_supervise_link_names (char const *scdir, char const *const *servicedirs, } fn[len] = 0 ; strcpy(lname + scdirlen + 1, names[i]) ; - if (servicedirs[i][0] != '/') + if (!(options & 16) && servicedirs[i][0] != '/') { rpsa.len = 0 ; if (sarealpath(&rpsa, servicedirs[i]) < 0 || !stralloc_0(&rpsa)) goto err ; diff --git a/src/supervision/s6-svc.c b/src/supervision/s6-svc.c index 7e00f17..5982248 100644 --- a/src/supervision/s6-svc.c +++ b/src/supervision/s6-svc.c @@ -7,28 +7,31 @@ #include #include #include +#include #include #include #include -#define USAGE "s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T timeout ] [ -abqhkti12pcyroduxOX ] servicedir" +#define USAGE "s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T timeout ] [ -abqhkti12pcyroduDUxOX ] servicedir" #define dieusage() strerr_dieusage(100, USAGE) #define DATASIZE 63 int main (int argc, char const *const *argv) { - char data[DATASIZE+1] = "-" ; + size_t len ; + int downfile = -1 ; unsigned int datalen = 1 ; unsigned int timeout = 0 ; + char data[DATASIZE+1] = "-" ; char updown[3] = "-\0" ; PROG = "s6-svc" ; { subgetopt l = SUBGETOPT_ZERO ; for (;;) { - int opt = subgetopt_r(argc, argv, "abqhkti12pcyroduxOT:w:", &l) ; + int opt = subgetopt_r(argc, argv, "abqhkti12pcyroduDUxOT:w:", &l) ; if (opt == -1) break ; switch (opt) { @@ -55,6 +58,20 @@ int main (int argc, char const *const *argv) data[datalen++] = opt ; break ; } + case 'D' : + { + if (datalen >= DATASIZE) strerr_dief1x(100, "too many commands") ; + data[datalen++] = 'd' ; + downfile = 1 ; + break ; + } + case 'U' : + { + if (datalen >= DATASIZE) strerr_dief1x(100, "too many commands") ; + data[datalen++] = 'u' ; + downfile = 0 ; + break ; + } case 'T' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ; case 'w' : { @@ -69,13 +86,14 @@ int main (int argc, char const *const *argv) } if (!argc) dieusage() ; if (argc > 1) strerr_warnw1x("ignoring extra arguments") ; + len = strlen(argv[0]) ; + if (!len) strerr_dief1x(100, "invalid service path") ; if (updown[1] == 'U' || updown[1] == 'R') { - size_t arglen = strlen(argv[0]) ; - char fn[arglen + 17] ; - memcpy(fn, argv[0], arglen) ; - memcpy(fn + arglen, "/notification-fd", 17) ; + char fn[len + 17] ; + memcpy(fn, argv[0], len) ; + memcpy(fn + len, "/notification-fd", 17) ; if (access(fn, F_OK) < 0) { if (errno != ENOENT) strerr_diefu2sys(111, "access ", fn) ; @@ -84,6 +102,19 @@ int main (int argc, char const *const *argv) } } + if (downfile >= 0) + { + char fn[len + 6] ; + memcpy(fn, argv[0], len) ; + memcpy(fn + len, "/down", 6) ; + if (downfile) + { + if (!openwritenclose_unsafe(fn, "", 0)) + strerr_diefu2sys(111, "touch ", fn) ; + } + else unlink_void(fn) ; + } + if (updown[1]) { char const *newargv[11] ; -- cgit v1.2.3