diff options
author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2020-04-09 09:02:58 -0400 |
---|---|---|
committer | Ashod Nakashian <ashnakash@gmail.com> | 2020-07-01 05:42:43 +0200 |
commit | 5c9988f2e345ca82e7bb5f5e9bf66a30b82a0446 (patch) | |
tree | 800833d3e10231fa92d1afbcfeb01cff4751ae47 /debian/loolwsd.postinst.in | |
parent | 582139eb998432539d79427f22de0eadb25b5ab7 (diff) |
wsd: faster jail setup via bind-mount
loolmount now works and supports mounting and
unmounting, plus numerous improvements,
refactoring, logging, etc.. When enabled,
binding improves the jail setup time by anywhere
from 2x to orders of magnitude (in docker, f.e.).
A new config entry mount_jail_tree controls
whether mounting is used or the old method of
linking/copying of jail contents. It is set to
true by default and falls back to linking/copying.
A test mount is done when the setting is enabled,
and if mounting fails, it's disabled to avoid noise.
Temporarily disabled for unit-tests until we can
cleanup lingering mounts after Jenkins aborts our
build job. In a future patch we will have mount/jail
cleanup as part of make.
The network/system files in /etc that need frequent
refreshing are now updated in systemplate to make
their most recent version available in the jails.
These files can change during the course of loolwsd
lifetime, and are unlikely to be updated in
systemplate after installation at all. We link to
them in the systemplate/etc directory, and if that
fails, we copy them before forking each kit
instance to have the latest.
This reworks the approach used to bind-mount the
jails and the templates such that the total is
now down to only three mounts: systemplate, lo, tmp.
As now systemplate and lotemplate are shared, they
must be mounted as readonly, this means that user/
must now be moved into tmp/user/ which is writable.
The mount-points must be recursive, because we mount
lo/ within the mount-point of systemplate (which is
the root of the jail). But because we (re)bind
recursively, and because both systemplate and
lotemplate are mounted for each jails, we need to
make them unbindable, so they wouldn't multiply the
mount-points for each jails (an explosive growth!)
Contrarywise, we don't want the mount-points to
be shared, because we don't expect to add/remove
mounts after a jail is created.
The random temp directory is now created and set
correctly, plus many logging and other improvements.
Change-Id: Iae3fda5e876cf47d2cae6669a87b5b826a8748df
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92829
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'debian/loolwsd.postinst.in')
-rw-r--r-- | debian/loolwsd.postinst.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in index 41198e75a..ac38e2ab1 100644 --- a/debian/loolwsd.postinst.in +++ b/debian/loolwsd.postinst.in @@ -5,6 +5,7 @@ set -e case "$1" in configure) setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit || true + setcap cap_sys_admin=ep /usr/bin/loolmount || true adduser --quiet --system --group --home /opt/lool lool mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd |