dc39e09942
When processing a `files_ref_store` transaction, it is sometimes necessary to delete some references from the "packed-refs" file. Do that using a reference transaction conducted against the `packed_ref_store`. This change further decouples `files_ref_store` from `packed_ref_store`. It also fixes multiple problems, including the two revealed by test cases added in the previous commit. First, the old code didn't obtain the `packed-refs` lock until `files_transaction_finish()`. This means that a failure to acquire the `packed-refs` lock (e.g., due to contention with another process) wasn't detected until it was too late (problems like this are supposed to be detected in the "prepare" phase). The new code acquires the `packed-refs` lock in `files_transaction_prepare()`, the same stage of the processing when the loose reference locks are being acquired, removing another reason why the "prepare" phase might succeed and the "finish" phase might nevertheless fail. Second, the old code deleted the loose version of a reference before deleting any packed version of the same reference. This left a moment when another process might think that the packed version of the reference is current, which is incorrect. (Even worse, the packed version of the reference can be arbitrarily old, and might even point at an object that has since been garbage-collected.) Third, if a reference deletion fails to acquire the `packed-refs` lock altogether, then the old code might leave the repository in the incorrect state (possibly corrupt) described in the previous paragraph. Now we activate the new "packed-refs" file (sans any references that are being deleted) *before* deleting the corresponding loose references. But we hold the "packed-refs" lock until after the loose references have been finalized, thus preventing a simultaneous "pack-refs" process from packing the loose version of the reference in the time gap, which would otherwise defeat our attempt to delete it. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
481 lines
15 KiB
Bash
Executable File
481 lines
15 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Test git update-ref error handling'
|
|
. ./test-lib.sh
|
|
|
|
# Create some references, perhaps run pack-refs --all, then try to
|
|
# create some more references. Ensure that the second creation fails
|
|
# with the correct error message.
|
|
# Usage: test_update_rejected <before> <pack> <create> <error>
|
|
# <before> is a ws-separated list of refs to create before the test
|
|
# <pack> (true or false) tells whether to pack the refs before the test
|
|
# <create> is a list of variables to attempt creating
|
|
# <error> is a string to look for in the stderr of update-ref.
|
|
# All references are created in the namespace specified by the current
|
|
# value of $prefix.
|
|
test_update_rejected () {
|
|
before="$1" &&
|
|
pack="$2" &&
|
|
create="$3" &&
|
|
error="$4" &&
|
|
printf "create $prefix/%s $C\n" $before |
|
|
git update-ref --stdin &&
|
|
git for-each-ref $prefix >unchanged &&
|
|
if $pack
|
|
then
|
|
git pack-refs --all
|
|
fi &&
|
|
printf "create $prefix/%s $C\n" $create >input &&
|
|
test_must_fail git update-ref --stdin <input 2>output.err &&
|
|
grep -F "$error" output.err &&
|
|
git for-each-ref $prefix >actual &&
|
|
test_cmp unchanged actual
|
|
}
|
|
|
|
Q="'"
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
git commit --allow-empty -m Initial &&
|
|
C=$(git rev-parse HEAD) &&
|
|
git commit --allow-empty -m Second &&
|
|
D=$(git rev-parse HEAD) &&
|
|
git commit --allow-empty -m Third &&
|
|
E=$(git rev-parse HEAD)
|
|
'
|
|
|
|
test_expect_success 'existing loose ref is a simple prefix of new' '
|
|
|
|
prefix=refs/1l &&
|
|
test_update_rejected "a c e" false "b c/x d" \
|
|
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
|
|
|
|
'
|
|
|
|
test_expect_success 'existing packed ref is a simple prefix of new' '
|
|
|
|
prefix=refs/1p &&
|
|
test_update_rejected "a c e" true "b c/x d" \
|
|
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q"
|
|
|
|
'
|
|
|
|
test_expect_success 'existing loose ref is a deeper prefix of new' '
|
|
|
|
prefix=refs/2l &&
|
|
test_update_rejected "a c e" false "b c/x/y d" \
|
|
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
|
|
|
|
'
|
|
|
|
test_expect_success 'existing packed ref is a deeper prefix of new' '
|
|
|
|
prefix=refs/2p &&
|
|
test_update_rejected "a c e" true "b c/x/y d" \
|
|
"$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q"
|
|
|
|
'
|
|
|
|
test_expect_success 'new ref is a simple prefix of existing loose' '
|
|
|
|
prefix=refs/3l &&
|
|
test_update_rejected "a c/x e" false "b c d" \
|
|
"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
|
|
|
|
'
|
|
|
|
test_expect_success 'new ref is a simple prefix of existing packed' '
|
|
|
|
prefix=refs/3p &&
|
|
test_update_rejected "a c/x e" true "b c d" \
|
|
"$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q"
|
|
|
|
'
|
|
|
|
test_expect_success 'new ref is a deeper prefix of existing loose' '
|
|
|
|
prefix=refs/4l &&
|
|
test_update_rejected "a c/x/y e" false "b c d" \
|
|
"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
|
|
|
|
'
|
|
|
|
test_expect_success 'new ref is a deeper prefix of existing packed' '
|
|
|
|
prefix=refs/4p &&
|
|
test_update_rejected "a c/x/y e" true "b c d" \
|
|
"$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q"
|
|
|
|
'
|
|
|
|
test_expect_success 'one new ref is a simple prefix of another' '
|
|
|
|
prefix=refs/5 &&
|
|
test_update_rejected "a e" false "b c c/x d" \
|
|
"cannot process $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time"
|
|
|
|
'
|
|
|
|
test_expect_success 'empty directory should not fool rev-parse' '
|
|
prefix=refs/e-rev-parse &&
|
|
git update-ref $prefix/foo $C &&
|
|
git pack-refs --all &&
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
echo "$C" >expected &&
|
|
git rev-parse $prefix/foo >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'empty directory should not fool for-each-ref' '
|
|
prefix=refs/e-for-each-ref &&
|
|
git update-ref $prefix/foo $C &&
|
|
git for-each-ref $prefix >expected &&
|
|
git pack-refs --all &&
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
git for-each-ref $prefix >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'empty directory should not fool create' '
|
|
prefix=refs/e-create &&
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
printf "create %s $C\n" $prefix/foo |
|
|
git update-ref --stdin
|
|
'
|
|
|
|
test_expect_success 'empty directory should not fool verify' '
|
|
prefix=refs/e-verify &&
|
|
git update-ref $prefix/foo $C &&
|
|
git pack-refs --all &&
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
printf "verify %s $C\n" $prefix/foo |
|
|
git update-ref --stdin
|
|
'
|
|
|
|
test_expect_success 'empty directory should not fool 1-arg update' '
|
|
prefix=refs/e-update-1 &&
|
|
git update-ref $prefix/foo $C &&
|
|
git pack-refs --all &&
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
printf "update %s $D\n" $prefix/foo |
|
|
git update-ref --stdin
|
|
'
|
|
|
|
test_expect_success 'empty directory should not fool 2-arg update' '
|
|
prefix=refs/e-update-2 &&
|
|
git update-ref $prefix/foo $C &&
|
|
git pack-refs --all &&
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
printf "update %s $D $C\n" $prefix/foo |
|
|
git update-ref --stdin
|
|
'
|
|
|
|
test_expect_success 'empty directory should not fool 0-arg delete' '
|
|
prefix=refs/e-delete-0 &&
|
|
git update-ref $prefix/foo $C &&
|
|
git pack-refs --all &&
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
printf "delete %s\n" $prefix/foo |
|
|
git update-ref --stdin
|
|
'
|
|
|
|
test_expect_success 'empty directory should not fool 1-arg delete' '
|
|
prefix=refs/e-delete-1 &&
|
|
git update-ref $prefix/foo $C &&
|
|
git pack-refs --all &&
|
|
mkdir -p .git/$prefix/foo/bar/baz &&
|
|
printf "delete %s $C\n" $prefix/foo |
|
|
git update-ref --stdin
|
|
'
|
|
|
|
# Test various errors when reading the old values of references...
|
|
|
|
test_expect_success 'missing old value blocks update' '
|
|
prefix=refs/missing-update &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
|
|
EOF
|
|
printf "%s\n" "update $prefix/foo $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'incorrect old value blocks update' '
|
|
prefix=refs/incorrect-update &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "update $prefix/foo $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'existing old value blocks create' '
|
|
prefix=refs/existing-create &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/foo$Q: reference already exists
|
|
EOF
|
|
printf "%s\n" "create $prefix/foo $E" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'incorrect old value blocks delete' '
|
|
prefix=refs/incorrect-delete &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/foo$Q: is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "delete $prefix/foo $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'missing old value blocks indirect update' '
|
|
prefix=refs/missing-indirect-update &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
|
|
EOF
|
|
printf "%s\n" "update $prefix/symref $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'incorrect old value blocks indirect update' '
|
|
prefix=refs/incorrect-indirect-update &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "update $prefix/symref $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'existing old value blocks indirect create' '
|
|
prefix=refs/existing-indirect-create &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
|
|
EOF
|
|
printf "%s\n" "create $prefix/symref $E" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'incorrect old value blocks indirect delete' '
|
|
prefix=refs/incorrect-indirect-delete &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "delete $prefix/symref $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'missing old value blocks indirect no-deref update' '
|
|
prefix=refs/missing-noderef-update &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: reference is missing but expected $D
|
|
EOF
|
|
printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'incorrect old value blocks indirect no-deref update' '
|
|
prefix=refs/incorrect-noderef-update &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'existing old value blocks indirect no-deref create' '
|
|
prefix=refs/existing-noderef-create &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: reference already exists
|
|
EOF
|
|
printf "%s\n" "option no-deref" "create $prefix/symref $E" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'incorrect old value blocks indirect no-deref delete' '
|
|
prefix=refs/incorrect-noderef-delete &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
git update-ref $prefix/foo $C &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: is at $C but expected $D
|
|
EOF
|
|
printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'non-empty directory blocks create' '
|
|
prefix=refs/ne-create &&
|
|
mkdir -p .git/$prefix/foo/bar &&
|
|
: >.git/$prefix/foo/bar/baz.lock &&
|
|
test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
|
|
EOF
|
|
printf "%s\n" "update $prefix/foo $C" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q
|
|
EOF
|
|
printf "%s\n" "update $prefix/foo $D $C" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'broken reference blocks create' '
|
|
prefix=refs/broken-create &&
|
|
mkdir -p .git/$prefix &&
|
|
echo "gobbledigook" >.git/$prefix/foo &&
|
|
test_when_finished "rm -f .git/$prefix/foo" &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
|
|
EOF
|
|
printf "%s\n" "update $prefix/foo $C" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
|
|
EOF
|
|
printf "%s\n" "update $prefix/foo $D $C" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'non-empty directory blocks indirect create' '
|
|
prefix=refs/ne-indirect-create &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
mkdir -p .git/$prefix/foo/bar &&
|
|
: >.git/$prefix/foo/bar/baz.lock &&
|
|
test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q
|
|
EOF
|
|
printf "%s\n" "update $prefix/symref $C" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q
|
|
EOF
|
|
printf "%s\n" "update $prefix/symref $D $C" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'broken reference blocks indirect create' '
|
|
prefix=refs/broken-indirect-create &&
|
|
git symbolic-ref $prefix/symref $prefix/foo &&
|
|
echo "gobbledigook" >.git/$prefix/foo &&
|
|
test_when_finished "rm -f .git/$prefix/foo" &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
|
|
EOF
|
|
printf "%s\n" "update $prefix/symref $C" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err &&
|
|
cat >expected <<-EOF &&
|
|
fatal: cannot lock ref $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken
|
|
EOF
|
|
printf "%s\n" "update $prefix/symref $D $C" |
|
|
test_must_fail git update-ref --stdin 2>output.err &&
|
|
test_cmp expected output.err
|
|
'
|
|
|
|
test_expect_success 'no bogus intermediate values during delete' '
|
|
prefix=refs/slow-transaction &&
|
|
# Set up a reference with differing loose and packed versions:
|
|
git update-ref $prefix/foo $C &&
|
|
git pack-refs --all &&
|
|
git update-ref $prefix/foo $D &&
|
|
git for-each-ref $prefix >unchanged &&
|
|
# Now try to update the reference, but hold the `packed-refs` lock
|
|
# for a while to see what happens while the process is blocked:
|
|
: >.git/packed-refs.lock &&
|
|
test_when_finished "rm -f .git/packed-refs.lock" &&
|
|
{
|
|
# Note: the following command is intentionally run in the
|
|
# background. We increase the timeout so that `update-ref`
|
|
# attempts to acquire the `packed-refs` lock for longer than
|
|
# it takes for us to do the check then delete it:
|
|
git -c core.packedrefstimeout=3000 update-ref -d $prefix/foo &
|
|
} &&
|
|
pid2=$! &&
|
|
# Give update-ref plenty of time to get to the point where it tries
|
|
# to lock packed-refs:
|
|
sleep 1 &&
|
|
# Make sure that update-ref did not complete despite the lock:
|
|
kill -0 $pid2 &&
|
|
# Verify that the reference still has its old value:
|
|
sha1=$(git rev-parse --verify --quiet $prefix/foo || echo undefined) &&
|
|
case "$sha1" in
|
|
$D)
|
|
# This is what we hope for; it means that nothing
|
|
# user-visible has changed yet.
|
|
: ;;
|
|
undefined)
|
|
# This is not correct; it means the deletion has happened
|
|
# already even though update-ref should not have been
|
|
# able to acquire the lock yet.
|
|
echo "$prefix/foo deleted prematurely" &&
|
|
break
|
|
;;
|
|
$C)
|
|
# This value should never be seen. Probably the loose
|
|
# reference has been deleted but the packed reference
|
|
# is still there:
|
|
echo "$prefix/foo incorrectly observed to be C" &&
|
|
break
|
|
;;
|
|
*)
|
|
# WTF?
|
|
echo "unexpected value observed for $prefix/foo: $sha1" &&
|
|
break
|
|
;;
|
|
esac >out &&
|
|
rm -f .git/packed-refs.lock &&
|
|
wait $pid2 &&
|
|
test_must_be_empty out &&
|
|
test_must_fail git rev-parse --verify --quiet $prefix/foo
|
|
'
|
|
|
|
test_expect_success 'delete fails cleanly if packed-refs file is locked' '
|
|
prefix=refs/locked-packed-refs &&
|
|
# Set up a reference with differing loose and packed versions:
|
|
git update-ref $prefix/foo $C &&
|
|
git pack-refs --all &&
|
|
git update-ref $prefix/foo $D &&
|
|
git for-each-ref $prefix >unchanged &&
|
|
# Now try to delete it while the `packed-refs` lock is held:
|
|
: >.git/packed-refs.lock &&
|
|
test_when_finished "rm -f .git/packed-refs.lock" &&
|
|
test_must_fail git update-ref -d $prefix/foo >out 2>err &&
|
|
git for-each-ref $prefix >actual &&
|
|
test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&
|
|
test_cmp unchanged actual
|
|
'
|
|
|
|
test_done
|