summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-09-02 11:42:33 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-09-02 11:42:33 +0000
commit858dfd34bca20ea49d41f2f0249554d9cb225069 (patch)
tree4addc97c424bf448c37d23577c44b8eb5414e79e /src
parentee111aabf49128fe88968f658b0f4b683a3caa00 (diff)
downloads6-rc-858dfd34bca20ea49d41f2f0249554d9cb225069.tar.xz
Intermediate commit to fix a regression
Diffstat (limited to 'src')
-rw-r--r--src/include/s6-rc/s6rc-constants.h3
-rw-r--r--src/include/s6-rc/s6rc-servicedir.h2
-rw-r--r--src/libs6rc/deps-lib/s6rc1
-rw-r--r--src/libs6rc/s6rc_servicedir_manage.c152
-rw-r--r--src/s6-rc/s6-rc-init.c2
-rw-r--r--src/s6-rc/s6-rc-update.c204
6 files changed, 316 insertions, 48 deletions
diff --git a/src/include/s6-rc/s6rc-constants.h b/src/include/s6-rc/s6rc-constants.h
index 05e2ff1..168dac8 100644
--- a/src/include/s6-rc/s6rc-constants.h
+++ b/src/include/s6-rc/s6rc-constants.h
@@ -3,9 +3,6 @@
#ifndef S6RC_CONSTANTS_H
#define S6RC_CONSTANTS_H
-#define S6RC_LIVE_REAL_SUFFIX ".real"
-#define S6RC_LIVE_NEW_SUFFIX ".new"
-
#define S6RC_COMPILED_BASE "/etc/s6-rc/compiled"
#define S6RC_ONESHOT_RUNNER "s6rc-oneshot-runner"
diff --git a/src/include/s6-rc/s6rc-servicedir.h b/src/include/s6-rc/s6rc-servicedir.h
index d52fddf..e9475bd 100644
--- a/src/include/s6-rc/s6rc-servicedir.h
+++ b/src/include/s6-rc/s6rc-servicedir.h
@@ -8,5 +8,7 @@ extern int s6rc_servicedir_unblock (char const *, int) ;
extern int s6rc_servicedir_copy_offline (char const *, char const *) ;
extern int s6rc_servicedir_copy_online (char const *, char const *) ;
#define s6rc_servicedir_copy(src, dst, h) ((h) ? s6rc_servicedir_copy_online(src, dst) : s6rc_servicedir_copy_offline(src, dst))
+extern int s6rc_servicedir_supervise () ;
+extern void s6rc_servicedir_unsupervise (char const *, char const *const *, unsigned int) ;
#endif
diff --git a/src/libs6rc/deps-lib/s6rc b/src/libs6rc/deps-lib/s6rc
index 00c3aab..2390c75 100644
--- a/src/libs6rc/deps-lib/s6rc
+++ b/src/libs6rc/deps-lib/s6rc
@@ -13,5 +13,6 @@ s6rc_servicedir_block.o
s6rc_servicedir_unblock.o
s6rc_servicedir_copy_offline.o
s6rc_servicedir_copy_online.o
+s6rc_servicedir_manage.o
-ls6
-lskarnet
diff --git a/src/libs6rc/s6rc_servicedir_manage.c b/src/libs6rc/s6rc_servicedir_manage.c
new file mode 100644
index 0000000..3c883be
--- /dev/null
+++ b/src/libs6rc/s6rc_servicedir_manage.c
@@ -0,0 +1,152 @@
+/* ISC license. */
+
+#include <skalibs/tai.h>
+#include <s6-rc/s6rc-servicedir.h>
+
+
+static int s6rc_servicedir_manage (char const *live, unsigned char const *state, unsigned int nlong, tain_t const *deadline)
+{
+#if 0
+ unsigned int livelen = str_len(live) ;
+ char
+ byte_copy(lfn + llen + 1, 12, "servicedirs") ;
+ byte_copy(cfn, llen + 1, lfn) ;
+ byte_copy(cfn + llen + 1, 21, "compiled/servicedirs") ;
+ if (!hiercopy(cfn, lfn))
+ {
+ cleanup() ;
+ strerr_diefu4sys(111, "recursively copy ", cfn, " to ", lfn) ;
+ }
+
+ tain_now_g() ;
+ tain_add_g(&deadline, &tto) ;
+ dir = opendir(lfn) ;
+ if (!dir)
+ {
+ cleanup() ;
+ strerr_diefu2sys(111, "opendir ", lfn) ;
+ }
+ for (;;)
+ {
+ unsigned int thislen ;
+ direntry *d ;
+ errno = 0 ;
+ d = readdir(dir) ;
+ if (!d) break ;
+ if (d->d_name[0] == '.') continue ;
+ thislen = str_len(d->d_name) ;
+ if (thislen > maxlen) maxlen = thislen ;
+ ndirs++ ;
+ }
+ if (errno)
+ {
+ int e = errno ;
+ dir_close(dir) ;
+ errno = e ;
+ cleanup() ;
+ strerr_diefu2sys(111, "readdir ", lfn) ;
+ }
+ if (ndirs)
+ {
+ ftrigr_t a = FTRIGR_ZERO ;
+ gid_t gid = getgid() ;
+ unsigned int i = 0 ;
+ int r ;
+ uint16 ids[ndirs] ;
+ char srcfn[llen + 23 + maxlen] ; /* XXX: unsafe if dir is writable by non-root */
+ char dstfn[llen + 9 + sizeof(S6_SVSCAN_CTLDIR "/control") + maxlen] ;
+ rewinddir(dir) ;
+ byte_copy(srcfn, llen + 12, lfn) ;
+ srcfn[llen + 12] = '/' ;
+ byte_copy(dstfn, llen, satmp.s) ;
+ byte_copy(dstfn + llen, 8, "/scandir") ;
+ dstfn[llen + 8] = '/' ;
+ if (!ftrigr_startf_g(&a, &deadline))
+ {
+ int e = errno ;
+ dir_close(dir) ;
+ errno = e ;
+ cleanup() ;
+ strerr_diefu1sys(111, "start event listener process") ;
+ }
+ for (;;)
+ {
+ unsigned int thislen ;
+ direntry *d ;
+ errno = 0 ;
+ d = readdir(dir) ;
+ if (!d) break ;
+ if (d->d_name[0] == '.') continue ;
+ thislen = str_len(d->d_name) ;
+ byte_copy(srcfn + llen + 13, thislen, d->d_name) ;
+ byte_copy(srcfn + llen + 13 + thislen, 6, "/down") ;
+ if (!touch(srcfn))
+ {
+ cleanup() ;
+ strerr_diefu2sys(111, "touch ", srcfn) ;
+ }
+ byte_copy(srcfn + llen + 14 + thislen, 9, "log/down") ;
+ if (!touch(srcfn))
+ {
+ cleanup() ;
+ strerr_diefu2sys(111, "touch ", srcfn) ;
+ }
+ byte_copy(srcfn + llen + 14 + thislen, 6, "event") ;
+ if (!ftrigw_fifodir_make(srcfn, gid, 0))
+ {
+ cleanup() ;
+ strerr_diefu2sys(111, "make fifodir ", srcfn) ;
+ }
+ ids[i] = ftrigr_subscribe_g(&a, srcfn, "s", 0, &deadline) ;
+ if (!ids[i])
+ {
+ int e = errno ;
+ dir_close(dir) ;
+ errno = e ;
+ cleanup() ;
+ strerr_diefu2sys(111, "subscribe to ", srcfn) ;
+ }
+ srcfn[llen + 13 + thislen] = 0 ;
+ byte_copy(dstfn + llen + 9, thislen + 1, d->d_name) ;
+ if (symlink(srcfn, dstfn) < 0)
+ {
+ int e = errno ;
+ dir_close(dir) ;
+ errno = e ;
+ cleanup() ;
+ strerr_diefu4sys(111, "symlink ", srcfn, " to ", dstfn) ;
+ }
+ i++ ;
+ }
+ if (errno)
+ {
+ int e = errno ;
+ dir_close(dir) ;
+ errno = e ;
+ cleanup() ;
+ strerr_diefu2sys(111, "readdir ", lfn) ;
+ }
+ dir_close(dir) ;
+ byte_copy(dstfn + llen + 9, sizeof(S6_SVSCAN_CTLDIR "/control"), S6_SVSCAN_CTLDIR "/control") ;
+ r = s6_svc_write(dstfn, "a", 1) ;
+ if (r < 0)
+ {
+ cleanup() ;
+ strerr_diefu2sys(111, "write to ", dstfn) ;
+ }
+ if (!r) strerr_warnw2x("s6-svscan not running on ", argv[0]) ;
+ else
+ {
+ if (ftrigr_wait_and_g(&a, ids, ndirs, &deadline) < 0)
+ {
+ cleanup() ;
+ strerr_diefu1sys(111, "wait for s6-supervise processes to come up") ;
+ }
+ }
+ ftrigr_end(&a) ;
+ }
+ else dir_close(dir) ;
+ }
+#endif
+ return 0 ;
+}
diff --git a/src/s6-rc/s6-rc-init.c b/src/s6-rc/s6-rc-init.c
index 750875d..eec2a69 100644
--- a/src/s6-rc/s6-rc-init.c
+++ b/src/s6-rc/s6-rc-init.c
@@ -73,7 +73,7 @@ int main (int argc, char const *const *argv)
if (!s6rc_sanitize_dir(&satmp, live, &dirlen)) dienomem() ;
llen = satmp.len ;
- if (!stralloc_catb(&satmp, S6RC_LIVE_REAL_SUFFIX, sizeof(S6RC_LIVE_REAL_SUFFIX)))
+ if (!stralloc_cats(&satmp, ":initial") || !stralloc_0(&satmp))
strerr_diefu1sys(111, "stralloc_catb") ;
{
diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c
index b45d99e..f179a50 100644
--- a/src/s6-rc/s6-rc-update.c
+++ b/src/s6-rc/s6-rc-update.c
@@ -20,6 +20,7 @@
#include <skalibs/skamisc.h>
#include <skalibs/webipc.h>
#include <skalibs/unix-transactional.h>
+#include <skalibs/random.h>
#include <execline/execline.h>
#include <s6/config.h>
#include <s6/s6-supervise.h>
@@ -149,7 +150,7 @@ static inline void stuff_with_oldc (unsigned char *oldstate, int fdoldc, s6rc_db
close(oldfdres) ;
}
-static inline void fill_convtable_and_flags (unsigned char *conversion_table, unsigned char *oldstate, unsigned char *newstate, char const *namedata, unsigned int const *oldindex, unsigned int *oldlong, unsigned int *newlong, cdb_t *newc, char const *newfn, s6rc_db_t const *olddb, s6rc_db_t const *newdb)
+static inline void fill_convtable_and_flags (unsigned char *conversion_table, unsigned char *oldstate, unsigned char *newstate, char const *namedata, unsigned int const *oldindex, unsigned int *newlong, cdb_t *newc, char const *newfn, s6rc_db_t const *olddb, s6rc_db_t const *newdb)
{
unsigned int newn = newdb->nshort + newdb->nlong ;
unsigned int i = olddb->nshort + olddb->nlong ;
@@ -188,7 +189,6 @@ static inline void fill_convtable_and_flags (unsigned char *conversion_table, un
bitarray_set(conversion_table + i * bitarray_div8(newn), x) ;
if (oldstate[i] & 8)
{
- if (i < olddb->nlong) oldlong[i] = x ;
if (x < newdb->nlong) newlong[x] = i ;
if ((i < olddb->nlong) != (x < newdb->nlong)) oldstate[i] |= 4 ;
}
@@ -198,7 +198,7 @@ static inline void fill_convtable_and_flags (unsigned char *conversion_table, un
}
}
-static inline void stuff_with_newc (int fdnewc, char const *newfn, unsigned char *conversion_table, unsigned char *oldstate, unsigned char *newstate, char const *namedata, unsigned int const *oldindex, unsigned int *oldlong, unsigned int *newlong, s6rc_db_t const *olddb, s6rc_db_t const *newdb)
+static inline void stuff_with_newc (int fdnewc, char const *newfn, unsigned char *conversion_table, unsigned char *oldstate, unsigned char *newstate, char const *namedata, unsigned int const *oldindex, unsigned int *newlong, s6rc_db_t const *olddb, s6rc_db_t const *newdb)
{
cdb_t newc = CDB_ZERO ;
int newfdres = open_readatb(fdnewc, "resolve.cdb") ;
@@ -206,7 +206,7 @@ static inline void stuff_with_newc (int fdnewc, char const *newfn, unsigned char
if (!cdb_init_map(&newc, newfdres, 1))
strerr_diefu3sys(111, "cdb_init ", newfn, "/compiled/resolve.cdb") ;
- fill_convtable_and_flags(conversion_table, oldstate, newstate, namedata, oldindex, oldlong, newlong, &newc, newfn, olddb, newdb) ;
+ fill_convtable_and_flags(conversion_table, oldstate, newstate, namedata, oldindex, newlong, &newc, newfn, olddb, newdb) ;
cdb_free(&newc) ;
close(newfdres) ;
@@ -223,7 +223,7 @@ static inline void adjust_newup (unsigned char const *oldstate, unsigned int old
}
}
-static void compute_transitions (char const *convfile, unsigned char *oldstate, unsigned int *oldlong, int fdoldc, s6rc_db_t const *olddb, unsigned char *newstate, unsigned int *newlong, int fdnewc, char const *newfn, s6rc_db_t const *newdb, stralloc *sa)
+static void compute_transitions (char const *convfile, unsigned char *oldstate, int fdoldc, s6rc_db_t const *olddb, unsigned char *newstate, unsigned int *newlong, int fdnewc, char const *newfn, s6rc_db_t const *newdb, stralloc *sa)
{
unsigned int oldn = olddb->nshort + olddb->nlong ;
unsigned int newn = newdb->nshort + newdb->nlong ;
@@ -232,7 +232,7 @@ static void compute_transitions (char const *convfile, unsigned char *oldstate,
unsigned char conversion_table[oldn * bitarray_div8(newn)] ;
byte_zero(conversion_table, oldn * bitarray_div8(newn)) ;
stuff_with_oldc(oldstate, fdoldc, olddb, convfile, oldindex, sa) ;
- stuff_with_newc(fdnewc, newfn, conversion_table, oldstate, newstate, sa->s + sabase, oldindex, oldlong, newlong, olddb, newdb) ;
+ stuff_with_newc(fdnewc, newfn, conversion_table, oldstate, newstate, sa->s + sabase, oldindex, newlong, olddb, newdb) ;
sa->len = sabase ;
s6rc_graph_closure(olddb, oldstate, 5, 0) ;
adjust_newup(oldstate, oldn, newstate, newn, conversion_table) ;
@@ -240,54 +240,166 @@ static void compute_transitions (char const *convfile, unsigned char *oldstate,
- /* Service directory replacement */
+ /* Update the live directory while keeping active servicedirs */
+static inline void rollback_servicedirs (char const *newlive, unsigned char const *newstate, unsigned int const *newlong, s6rc_db_t const *olddb, s6rc_db_t const *newdb, unsigned int n)
+{
+ unsigned int newllen = str_len(newlive) ;
+ unsigned int i = n ;
+ while (i--)
+ {
+ unsigned int newnamelen = str_len(newdb->string + newdb->services[i].name) ;
+ char newfn[newllen + 14 + newnamelen] ;
+ byte_copy(newfn, newllen, newlive) ;
+ byte_copy(newfn + newllen, 13, "/servicedirs/") ;
+ byte_copy(newfn + newllen + 13, newnamelen + 1, newdb->string + newdb->services[i].name) ;
+ if (newstate[i] & 1)
+ {
+ char const *oldname = newstate[i] & 4 ? olddb->string + olddb->services[newlong[i]].name : newdb->string + newdb->services[i].name ;
+ unsigned int oldnamelen = str_len(oldname) ;
+ char oldfn[livelen + 23 + oldnamelen] ;
+ byte_copy(oldfn, livelen, live) ;
+ byte_copy(oldfn + livelen, 22, "/compiled/servicedirs/") ;
+ byte_copy(oldfn + livelen + 22, oldnamelen + 1, oldname) ;
+ if (!s6rc_servicedir_copy_online(oldfn, newfn))
+ strerr_diefu4sys(111, "rollback ", oldfn, " into ", newfn) ;
+ byte_copy(oldfn + livelen, 13, "/servicedirs/") ;
+ byte_copy(oldfn + livelen + 13, oldnamelen + 1, oldname) ;
+ if (rename(newfn, oldfn) < 0)
+ strerr_diefu4sys(111, "rollback: can't rename ", newfn, " to ", oldfn) ;
+ }
+ }
+}
- /* The update itself. */
-
+static inline void unsupervise (char const *live, char const *name, int keepsupervisor)
+{
+ unsigned int namelen = str_len(name) ;
+ char fn[livelen + 14 + namelen] ;
+ byte_copy(fn, livelen, live) ;
+ byte_copy(fn + livelen, 9, "/scandir/") ;
+ byte_copy(fn + livelen + 9, namelen + 1, name) ;
+ unlink(fn) ;
+ if (!keepsupervisor)
+ {
+ byte_copy(fn + livelen + 1, 12, "servicedirs/") ;
+ byte_copy(fn + livelen + 13, namelen + 1, name) ;
+ s6_svc_writectl(fn, S6_SUPERVISE_CTLDIR, "x", 1) ;
+ }
+}
-static inline void make_new_live (unsigned char const *newstate, unsigned int newn, char const *newcompiled, stralloc *sa)
+static inline void make_new_livedir (unsigned char const *oldstate, s6rc_db_t const *olddb, unsigned char const *newstate, s6rc_db_t const *newdb, char const *newcompiled, unsigned int *newlong, stralloc *sa)
{
+ unsigned int tmpbase = satmp.len ;
unsigned int sabase = sa->len ;
- unsigned int dirlen, llen, newlen ;
+ unsigned int newclen = str_len(newcompiled) ;
+ unsigned int dirlen, llen, newlen, sdlen ;
+ int e = 0 ;
+ unsigned int i = 0 ;
+ if (sareadlink(&satmp, live) < 0) strerr_diefu2sys(111, "readlink ", live) ;
if (!s6rc_sanitize_dir(sa, live, &dirlen)) dienomem() ;
llen = sa->len ;
- if (!stralloc_cats(sa, S6RC_LIVE_REAL_SUFFIX S6RC_LIVE_NEW_SUFFIX)
- || !stralloc_0(sa))
- dienomem() ;
+ if (!random_sauniquename(sa, 8) || !stralloc_0(sa)) dienomem() ;
newlen = sa->len - 1 ;
rm_rf(sa->s + sabase) ;
if (mkdir(sa->s + sabase, 0755) < 0) strerr_diefu2sys(111, "mkdir ", sa->s + sabase) ;
strerr_diefu2sys(111, "mkdir ", sa->s + sabase) ;
- sa->len = newlen ;
- if (!stralloc_cats(sa, "/state") || !stralloc_0(sa)) goto err ;
{
- char tmpstate[newn] ;
- unsigned int i = newn ;
+ unsigned int tmplen = satmp.len ;
+ char fn[llen - sabase + 9] ;
+ if (!stralloc_cats(sa, "/scandir") || !stralloc_0(sa)) { e = errno ; goto err ; }
+ byte_copy(fn, llen - sabase, sa->s + sabase) ;
+ byte_copy(fn + llen - sabase, 9, "/scandir") ;
+ if (sareadlink(&satmp, fn) < 0 || !stralloc_0(&satmp)) { e = errno ; goto err ; }
+ if (symlink(satmp.s + tmplen, sa->s + sabase) < 0) { e = errno ; goto err ; }
+ satmp.len = tmplen ;
+ sa->len = newlen ;
+ }
+ if (!stralloc_cats(sa, "/state") || !stralloc_0(sa)) { e = errno ; goto err ; }
+ {
+ char tmpstate[newdb->nlong + newdb->nshort] ;
+ unsigned int i = newdb->nlong + newdb->nshort ;
while (i--) tmpstate[i] = newstate[i] & 1 ;
- if (!openwritenclose_unsafe(sa->s + sabase, tmpstate, newn)) goto err ;
+ if (!openwritenclose_unsafe(sa->s + sabase, tmpstate, newdb->nlong + newdb->nshort)) { e = errno ; goto err ; }
}
sa->len = newlen ;
- if (!stralloc_cats(sa, "/compiled") || !stralloc_0(sa)) goto err ;
+ if (!stralloc_cats(sa, "/compiled") || !stralloc_0(sa)) { e = errno ; goto err ; }
if (symlink(newcompiled, sa->s + sabase) < 0) goto err ;
+ sa->len = newlen ;
+ if (!stralloc_cats(sa, "/servicedirs") || !stralloc_0(sa)) { e = errno ; goto err ; }
+ if (mkdir(sa->s + sabase, 0755) < 0) { e = errno ; goto err ; }
+ sdlen = sa->len ;
+ sa->s[sdlen - 1] = '/' ;
+
+ for (; i < newdb->nlong ; i++)
+ {
+ unsigned int newnamelen = str_len(newdb->string + newdb->services[i].name) ;
+ char newfn[newclen + 14 + newnamelen] ;
+ byte_copy(newfn, newclen, newcompiled) ;
+ byte_copy(newfn + newclen, 13, "/servicedirs/") ;
+ byte_copy(newfn + newclen + 13, newnamelen + 1, newdb->string + newdb->services[i].name) ;
+ sa->len = sdlen ;
+ if (!stralloc_cats(sa, newdb->string + newdb->services[i].name)
+ || !stralloc_0(sa)) { e = errno ; goto rollback ; }
+ if (newstate[i] & 1)
+ {
+ char const *oldname = newstate[i] & 4 ? olddb->string + olddb->services[newlong[i]].name : newdb->string + olddb->services[i].name ;
+ unsigned int oldnamelen = str_len(oldname) ;
+ char oldfn[livelen + 13 + oldnamelen] ;
+ byte_copy(oldfn, livelen, live) ;
+ byte_copy(oldfn + livelen, 13, "/servicedirs/") ;
+ byte_copy(oldfn + livelen + 13, oldnamelen + 1, oldname) ;
+ if (rename(oldfn, sa->s + sabase) < 0) goto rollback ;
+ if (!s6rc_servicedir_copy_online(newfn, sa->s + sabase)) { i++ ; e = errno ; goto rollback ; }
+ }
+ else if (!s6rc_servicedir_copy_offline(newfn, sa->s + sabase)) { e = errno ; goto rollback ; }
+ }
+
+ sa->len = newlen ;
+ sa->s[sa->len++] = 0 ;
+ {
+ char tmpfn[llen + 5 - sabase] ;
+ byte_copy(tmpfn, llen - sabase, sa->s + sabase) ;
+ byte_copy(tmpfn + llen - sabase, 5, ".new") ;
+ if (unlink(tmpfn) < 0 && errno != ENOENT) { e = errno ; goto rollback ; }
+ if (symlink(sa->s + dirlen, tmpfn) < 0) { e = errno ; goto rollback ; }
+
+ /* The point of no return is here */
+ if (rename(tmpfn, live) < 0)
+ {
+ e = errno ;
+ unlink(tmpfn) ;
+ goto rollback ;
+ }
+ }
+
+ /* scandir cleanup, then old livedir cleanup */
+ sa->len = dirlen ;
+ sa->s[sa->len++] = '/' ;
+ if (!stralloc_catb(sa, satmp.s + tmpbase, satmp.len - tmpbase) || !stralloc_0(sa))
+ dienomem() ;
+
+ i = olddb->nlong ;
+ while (i--) unsupervise(sa->s + sabase, olddb->string + olddb->services[i].name, oldstate[i] & 1 && !(oldstate[i] && 32)) ;
+ rm_rf(sa->s + sabase) ;
sa->len = sabase ;
+ satmp.len = tmpbase ;
return ;
+ rollback:
+ sa->len = newlen ;
+ sa->s[sa->len++] = 0 ;
+ rollback_servicedirs(sa->s + sabase, newstate, newlong, olddb, newdb, i) ;
err:
- {
- int e = errno ;
- sa->len = newlen ;
- sa->s[sa->len++] = 0 ;
- rm_rf(sa->s + sabase) ;
- errno = e ;
- strerr_diefu2sys(111, "make new live directory in ", sa->s) ;
- }
+ sa->len = newlen ;
+ sa->s[sa->len++] = 0 ;
+ rm_rf(sa->s + sabase) ;
+ errno = e ;
+ strerr_diefu2sys(111, "make new live directory in ", sa->s) ;
}
-
/* Pipe updates */
static inline int delete_old_pipes (s6_fdholder_t *a, s6rc_db_t const *olddb, unsigned char const *oldstate, tain_t const *deadline)
@@ -364,7 +476,11 @@ static void update_fdholder (s6rc_db_t const *olddb, unsigned char const *oldsta
byte_copy(fnsocket + livelen, sizeof("/servicedirs/" S6RC_FDHOLDER "/s"), "/servicedirs" S6RC_FDHOLDER "/s") ;
fdsocket = ipc_stream_nb() ;
if (fdsocket < 0) goto hammer ;
- if (!ipc_timed_connect_g(fdsocket, fnsocket, deadline)) goto closehammer ;
+ if (!ipc_timed_connect_g(fdsocket, fnsocket, deadline))
+ {
+ if (errno == ETIMEDOUT) strerr_dief1x(1, "timed out") ;
+ else goto closehammer ;
+ }
s6_fdholder_init(&a, fdsocket) ;
if (!delete_old_pipes(&a, olddb, oldstate, deadline)) goto freehammer ;
if (!create_new_pipes(&a, newdb, newstate, deadline)) goto freehammer ;
@@ -382,7 +498,7 @@ static void update_fdholder (s6rc_db_t const *olddb, unsigned char const *oldsta
pid_t pid ;
int wstat ;
char tfmt[UINT_FMT] ;
- char const *newargv[7] = { S6_EXTBINPREFIX "s6-svc", "-T", tfmt, "-twR", "--", fnsocket, 0 } ;
+ char const *newargv[7] = { S6_EXTBINPREFIX "s6-svc", "-T", tfmt, "-t", "--", fnsocket, 0 } ;
fill_tfmt(tfmt, deadline) ;
fnsocket[livelen + sizeof("/servicedirs/" S6RC_FDHOLDER) - 1] = 0 ;
pid = child_spawn0(newargv[0], newargv, envp) ;
@@ -391,6 +507,7 @@ static void update_fdholder (s6rc_db_t const *olddb, unsigned char const *oldsta
tain_now_g() ;
if (WIFSIGNALED(wstat) || WEXITSTATUS(wstat))
if (verbosity) strerr_warnw1x("restart s6rc-fdholder") ;
+ if (!tain_future(deadline)) strerr_dief1x(1, "timed out") ;
}
}
@@ -484,7 +601,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
s6rc_service_t newserviceblob[newn] ;
char const *newargvblob[newdb.nargvs] ;
uint32 newdepsblob[newdb.ndeps << 1] ;
- unsigned int oldlong[olddb.nlong] ;
unsigned int newlong[newdb.nlong] ;
char oldstringblob[olddb.stringlen] ;
char newstringblob[newdb.stringlen] ;
@@ -520,8 +636,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
if (r != oldn) strerr_diefu2sys(111, "read ", dbfn) ;
r = oldn ;
while (r--) oldstate[r] &= 1 ;
- r = olddb.nlong ;
- while (r--) oldlong[r] = newdb.nlong + newdb.nshort ;
r = newdb.nlong ;
while (r--) newlong[r] = olddb.nlong + olddb.nshort ;
@@ -529,7 +643,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
/* Read the conversion file and compute what to do */
if (verbosity >= 2) strerr_warni1x("computing state adjustments") ;
- compute_transitions(convfile, oldstate, oldlong, fdoldc, &olddb, newstate, newlong, fdnewc, argv[0], &newdb, &sa) ;
+ compute_transitions(convfile, oldstate, fdoldc, &olddb, newstate, newlong, fdnewc, argv[0], &newdb, &sa) ;
tain_now_g() ;
if (!tain_future(&deadline)) strerr_dief1x(1, "timed out") ;
@@ -573,27 +687,29 @@ int main (int argc, char const *const *argv, char const *const *envp)
tain_now_g() ;
if (WIFSIGNALED(wstat) || WEXITSTATUS(wstat))
strerr_dief1x(wait_estatus(wstat), "first s6-rc invocation failed") ;
+ if (!tain_future(&deadline)) strerr_dief1x(1, "timed out") ;
}
+ if (!dryrun)
+ {
- /* Service directory and state switch */
+ /* Update state and service directories */
- if (verbosity >= 2)
- strerr_warni1x("updating state and service directories") ;
+ if (verbosity >= 2)
+ strerr_warni1x("updating state and service directories") ;
- /* Pipelines */
+ /* Adjust stored pipelines */
- if (verbosity >= 2)
- strerr_warni1x("updating s6rc-fdholder pipe storage") ;
+ if (verbosity >= 2)
+ strerr_warni1x("updating s6rc-fdholder pipe storage") ;
- update_fdholder(&olddb, oldstate, &newdb, newstate, envp, &deadline) ;
+ update_fdholder(&olddb, oldstate, &newdb, newstate, envp, &deadline) ;
+ }
/* Up transition */
- if (!tain_future(&deadline)) strerr_dief1x(1, "timed out") ;
-
{
char const *newargv[11 + (dryrun * 5) + want_count(newstate, newn)] ;
unsigned int m = 0, i = newn ;