[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6174b7b1c72cd5141e04ac2621eef90d86987a91

[Michael Tremer <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 3791 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  6174b7b1c72cd5141e04ac2621eef90d86987a91 (commit)
      from  53ac9dd222aac232b35d0c1ce453eaf4cacc3419 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6174b7b1c72cd5141e04ac2621eef90d86987a91
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Dec 16 16:50:13 2018 +0000

    make.sh: Build in ramdisk
    
    This is an experimental change that I want to trial to speed up
    the nightly builds. The build environment will be mounted in a
    ramdisk and the build will be performed in there.
    
    This will hopefully reduce IO on the (slow) replicated disks.
    
    If there is no significant performance gain from this, this
    commit will be reverted.
    
    To enable this, USE_RAMDISK must be set to 1 in .config.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 make.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

Difference in files:
diff --git a/make.sh b/make.sh
index fd626a999..fb529b669 100755
--- a/make.sh
+++ b/make.sh
@@ -290,6 +290,9 @@ stdumount() {
 	umount $BASEDIR/build/usr/src/lfs		2>/dev/null;
 	umount $BASEDIR/build/usr/src/log		2>/dev/null;
 	umount $BASEDIR/build/usr/src/src		2>/dev/null;
+
+	# Umount ramdisk
+	ramdisk_save "${BASEDIR}/build"
 }
 
 now() {
@@ -423,6 +426,68 @@ exiterror() {
 	exit 1
 }
 
+ramdisk_save() {
+	local path="${1}"
+
+	# Check if the ramdisk is actually mounted
+	if ! mountpoint "${path}" &>/dev/null; then
+		return 1
+	fi
+
+	# Remove the bind-mount
+	umount "${path}"
+
+	echo -n "Saving ramdisk (this might take a moment)..."
+
+	# Copy all data
+	mkdir -p "${path}.tmpfs"
+	if ! rsync -aHAXq --delete "${path}.tmpfs/" "${path}/"; then
+		print_status FAIL
+		return 1
+	fi
+
+	# Umount ramdisk
+	umount "${path}.tmpfs"
+	rm -rf "${path}.tmpfs"
+
+	print_status DONE
+}
+
+ramdisk_restore() {
+	local path="${1}"
+
+	# Don't do anything if ramdisk support isn't enabled
+	if [ "${USE_RAMDISK}" != "1" ]; then
+		return 1
+	fi
+
+	# Check for sufficient memory
+	# XXX TODO
+
+	echo -n "Restoring ramdisk (this might take a moment)..."
+
+	# Mount new ramdisk
+	mkdir -p "${path}.tmpfs"
+	if ! mount -t tmpfs none "${path}.tmpfs"; then
+		exiterror "Could not mount ramdisk"
+	fi
+
+	# Restore all data
+	if ! rsync -aHAXq --delete "${path}/" "${path}.tmpfs/"; then
+		umount "${path}.tmpfs"
+		rm -rf "${path}.tmpfs"
+
+		exiterror "Could not restore ramdisk"
+	fi
+
+	# Overlay the files on disk
+	# We would use "mount --move ..." but systemd is always
+	# mounting / as shared which doesn't allow moving anything
+	mount --bind "${path}.tmpfs" "${path}"
+
+	print_status DONE
+}
+
 prepareenv() {
 	# Are we running the right shell?
 	if [ -z "${BASH}" ]; then
@@ -472,6 +537,9 @@ prepareenv() {
 	export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
 	unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
+	# Mount ramdisk (if requested)
+	ramdisk_restore "${BASEDIR}/build"
+
 	# Make some extra directories
 	mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null
 	mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null


hooks/post-receive
--
IPFire 2.x development tree