mirror of
https://github.com/ostreedev/ostree.git
synced 2025-03-14 04:59:00 +03:00
7c8ea25306
I was seeing the `Writing OSTree commit...` phase of rpm-ostree being very slow lately. This turns out to be more fallout from https://github.com/ostreedev/ostree/pull/1170 AKA commit: 8fe4536 Loading the xattrs is slow on my system (F27AW, XFS+LVM, NVMe). I haven't fully traced through why, but AIUI at least on XFS the xattrs are often stored outside of the inode so it's a little bit like doing an `open()+read()`. Plus there's the LSM overhead, etc. The thing is that for rpm-ostree's package layering use case, we basically always want to treat the on-disk state as canonical. (There's a subtle case here if one does overrides for something that contains policy but we'll fix that). Anyways, so we're in a state now where we do the slow but correct thing by default, which seems sane. But let's allow the app to opt-in to telling us "really trust devino". The difference between a `stat()` + hash table lookup versus the full xattr load on my test case of `rpm-ostree install ./tree-1.7.0-10.fc27.x86_64.rpm` is absolutely dramatic; consistently on the order of 10s without this support, and <1s with (800ms). Closes: #1357 Approved by: jlebon
122 lines
4.5 KiB
Bash
Executable File
122 lines
4.5 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
|
|
#
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2 of the License, or (at your option) any later version.
|
|
#
|
|
# This library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with this library; if not, write to the
|
|
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
# Boston, MA 02111-1307, USA.
|
|
|
|
set -euo pipefail
|
|
|
|
. $(dirname $0)/libtest.sh
|
|
|
|
skip_without_user_xattrs
|
|
|
|
setup_test_repository "bare-user"
|
|
|
|
extra_basic_tests=6
|
|
. $(dirname $0)/basic-test.sh
|
|
|
|
# Reset things so we don't inherit a lot of state from earlier tests
|
|
rm repo files -rf
|
|
setup_test_repository "bare-user"
|
|
|
|
cd ${test_tmpdir}
|
|
objpath_nonexec=$(ostree_file_path_to_object_path repo test2 baz/cow)
|
|
assert_file_has_mode ${objpath_nonexec} 644
|
|
objpath_ro=$(ostree_file_path_to_object_path repo test2 baz/cowro)
|
|
assert_file_has_mode ${objpath_ro} 600
|
|
objpath_exec=$(ostree_file_path_to_object_path repo test2 baz/deeper/ohyeahx)
|
|
assert_file_has_mode ${objpath_exec} 755
|
|
echo "ok bare-user committed modes"
|
|
|
|
rm test2-checkout -rf
|
|
$OSTREE checkout -U -H test2 test2-checkout
|
|
cd test2-checkout
|
|
assert_file_has_mode baz/cow 644
|
|
assert_file_has_mode baz/cowro 600
|
|
assert_file_has_mode baz/deeper/ohyeahx 755
|
|
echo "ok bare-user checkout modes"
|
|
|
|
rm test2-checkout -rf
|
|
$OSTREE checkout -U -H test2 test2-checkout
|
|
touch test2-checkout/unwritable
|
|
chmod 0400 test2-checkout/unwritable
|
|
$OSTREE commit -b test2-unwritable --tree=dir=test2-checkout
|
|
chmod 0600 test2-checkout/unwritable
|
|
rm test2-checkout -rf
|
|
$OSTREE checkout -U -H test2-unwritable test2-checkout
|
|
cd test2-checkout
|
|
assert_file_has_mode unwritable 400
|
|
echo "ok bare-user unwritable"
|
|
|
|
rm test2-checkout -rf
|
|
$OSTREE checkout -U -H test2 test2-checkout
|
|
cat > statoverride.txt <<EOF
|
|
=0 /unreadable
|
|
EOF
|
|
touch test2-checkout/unreadable
|
|
$OSTREE commit -b test2-unreadable --statoverride=statoverride.txt --tree=dir=test2-checkout
|
|
$OSTREE fsck
|
|
rm test2-checkout -rf
|
|
$OSTREE checkout -U -H test2-unreadable test2-checkout
|
|
assert_file_has_mode test2-checkout/unreadable 400
|
|
echo "ok bare-user handled unreadable file"
|
|
|
|
cd ${test_tmpdir}
|
|
mkdir -p components/{dbus,systemd}/usr/{bin,lib}
|
|
echo dbus binary > components/dbus/usr/bin/dbus-daemon
|
|
chmod a+x components/dbus/usr/bin/dbus-daemon
|
|
echo dbus lib > components/dbus/usr/lib/libdbus.so.1
|
|
echo dbus helper > components/dbus/usr/lib/dbus-daemon-helper
|
|
chmod a+x components/dbus/usr/lib/dbus-daemon-helper
|
|
echo systemd binary > components/systemd/usr/bin/systemd
|
|
chmod a+x components/systemd/usr/bin/systemd
|
|
echo systemd lib > components/systemd/usr/lib/libsystemd.so.1
|
|
|
|
# Make the gid on dbus 81 like fedora
|
|
$OSTREE commit -b component-dbus --owner-uid 0 --owner-gid 81 --tree=dir=components/dbus
|
|
$OSTREE commit -b component-systemd --owner-uid 0 --owner-gid 0 --tree=dir=components/systemd
|
|
rm rootfs -rf
|
|
for component in dbus systemd; do
|
|
$OSTREE checkout -U -H component-${component} --union rootfs
|
|
done
|
|
echo 'some rootfs data' > rootfs/usr/lib/cache.txt
|
|
$OSTREE commit -b rootfs --link-checkout-speedup --tree=dir=rootfs
|
|
$OSTREE ls rootfs /usr/bin/systemd >ls.txt
|
|
assert_file_has_content ls.txt '^-007.. 0 0 .*/usr/bin/systemd'
|
|
$OSTREE ls rootfs /usr/lib/dbus-daemon-helper >ls.txt
|
|
assert_file_has_content ls.txt '^-007.. 0 81 .*/usr/lib/dbus-daemon-helper'
|
|
echo "ok bare-user link-checkout-speedup maintains uids"
|
|
|
|
cd ${test_tmpdir}
|
|
rm -rf test2-checkout
|
|
$OSTREE checkout -H -U test2 test2-checkout
|
|
# With --link-checkout-speedup, specifying --owner-uid should "win" by default.
|
|
myid=$(id -u)
|
|
newid=$((${myid} + 1))
|
|
$OSTREE commit ${COMMIT_ARGS} --owner-uid ${newid} --owner-gid ${newid} \
|
|
--link-checkout-speedup -b test2-linkcheckout-test --tree=dir=test2-checkout
|
|
$OSTREE ls test2-linkcheckout-test /baz/cow > ls.txt
|
|
assert_file_has_content ls.txt "^-006.. ${newid} ${newid} .*/baz/cow"
|
|
|
|
# But --devino-canonical should override that
|
|
$OSTREE commit ${COMMIT_ARGS} --owner-uid ${newid} --owner-gid ${newid} \
|
|
-I -b test2-devino-test --tree=dir=test2-checkout
|
|
$OSTREE ls test2-devino-test /baz/cow > ls.txt
|
|
assert_file_has_content ls.txt "^-006.. ${myid} ${myid} .*/baz/cow"
|
|
|
|
$OSTREE refs --delete test2-{linkcheckout,devino}-test
|
|
echo "ok commit with -I"
|