Merge branch 'sg/split-index-racefix' into maint
The codepath to support the experimental split-index mode had remaining "racily clean" issues fixed. * sg/split-index-racefix: split-index: BUG() when cache entry refers to non-existing shared entry split-index: smudge and add racily clean cache entries to split index split-index: don't compare cached data of entries already marked for split index split-index: count the number of deleted entries t1700-split-index: date back files to avoid racy situations split-index: add tests to demonstrate the racy split index problem t1700-split-index: document why FSMONITOR is disabled in this test script
This commit is contained in:
Junio C Hamano
@ -6,8 +6,18 @@ test_description='split index mode tests'
|
||||
|
||||
# We need total control of index splitting here
|
||||
sane_unset GIT_TEST_SPLIT_INDEX
|
||||
# A couple of tests expect the index to have a specific checksum,
|
||||
# but the presence of the optional FSMN extension would interfere
|
||||
# with those checks, so disable it in this test script.
|
||||
sane_unset GIT_FSMONITOR_TEST
|
||||
|
||||
# Create a file named as $1 with content read from stdin.
|
||||
# Set the file's mtime to a few seconds in the past to avoid racy situations.
|
||||
create_non_racy_file () {
|
||||
cat >"$1" &&
|
||||
test-tool chmtime =-5 "$1"
|
||||
}
|
||||
|
||||
test_expect_success 'enable split index' '
|
||||
git config splitIndex.maxPercentChange 100 &&
|
||||
git update-index --split-index &&
|
||||
@ -31,7 +41,7 @@ test_expect_success 'enable split index' '
|
||||
'
|
||||
|
||||
test_expect_success 'add one file' '
|
||||
: >one &&
|
||||
create_non_racy_file one &&
|
||||
git update-index --add one &&
|
||||
git ls-files --stage >ls-files.actual &&
|
||||
cat >ls-files.expect <<-EOF &&
|
||||
@ -83,7 +93,7 @@ test_expect_success 'enable split index again, "one" now belongs to base index"'
|
||||
'
|
||||
|
||||
test_expect_success 'modify original file, base index untouched' '
|
||||
echo modified >one &&
|
||||
echo modified | create_non_racy_file one &&
|
||||
git update-index one &&
|
||||
git ls-files --stage >ls-files.actual &&
|
||||
cat >ls-files.expect <<-EOF &&
|
||||
@ -102,7 +112,7 @@ test_expect_success 'modify original file, base index untouched' '
|
||||
'
|
||||
|
||||
test_expect_success 'add another file, which stays index' '
|
||||
: >two &&
|
||||
create_non_racy_file two &&
|
||||
git update-index --add two &&
|
||||
git ls-files --stage >ls-files.actual &&
|
||||
cat >ls-files.expect <<-EOF &&
|
||||
@ -155,7 +165,7 @@ test_expect_success 'remove file in base index' '
|
||||
'
|
||||
|
||||
test_expect_success 'add original file back' '
|
||||
: >one &&
|
||||
create_non_racy_file one &&
|
||||
git update-index --add one &&
|
||||
git ls-files --stage >ls-files.actual &&
|
||||
cat >ls-files.expect <<-EOF &&
|
||||
@ -174,7 +184,7 @@ test_expect_success 'add original file back' '
|
||||
'
|
||||
|
||||
test_expect_success 'add new file' '
|
||||
: >two &&
|
||||
create_non_racy_file two &&
|
||||
git update-index --add two &&
|
||||
git ls-files --stage >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
@ -218,7 +228,7 @@ test_expect_success 'rev-parse --shared-index-path' '
|
||||
|
||||
test_expect_success 'set core.splitIndex config variable to true' '
|
||||
git config core.splitIndex true &&
|
||||
: >three &&
|
||||
create_non_racy_file three &&
|
||||
git update-index --add three &&
|
||||
git ls-files --stage >ls-files.actual &&
|
||||
cat >ls-files.expect <<-EOF &&
|
||||
@ -253,9 +263,9 @@ test_expect_success 'set core.splitIndex config variable to false' '
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'set core.splitIndex config variable to true' '
|
||||
test_expect_success 'set core.splitIndex config variable back to true' '
|
||||
git config core.splitIndex true &&
|
||||
: >three &&
|
||||
create_non_racy_file three &&
|
||||
git update-index --add three &&
|
||||
BASE=$(test-tool dump-split-index .git/index | grep "^base") &&
|
||||
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
|
||||
@ -265,7 +275,7 @@ test_expect_success 'set core.splitIndex config variable to true' '
|
||||
deletions:
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
: >four &&
|
||||
create_non_racy_file four &&
|
||||
git update-index --add four &&
|
||||
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
@ -279,7 +289,7 @@ test_expect_success 'set core.splitIndex config variable to true' '
|
||||
|
||||
test_expect_success 'check behavior with splitIndex.maxPercentChange unset' '
|
||||
git config --unset splitIndex.maxPercentChange &&
|
||||
: >five &&
|
||||
create_non_racy_file five &&
|
||||
git update-index --add five &&
|
||||
BASE=$(test-tool dump-split-index .git/index | grep "^base") &&
|
||||
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
|
||||
@ -289,7 +299,7 @@ test_expect_success 'check behavior with splitIndex.maxPercentChange unset' '
|
||||
deletions:
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
: >six &&
|
||||
create_non_racy_file six &&
|
||||
git update-index --add six &&
|
||||
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
|
||||
cat >expect <<-EOF &&
|
||||
@ -303,7 +313,7 @@ test_expect_success 'check behavior with splitIndex.maxPercentChange unset' '
|
||||
|
||||
test_expect_success 'check splitIndex.maxPercentChange set to 0' '
|
||||
git config splitIndex.maxPercentChange 0 &&
|
||||
: >seven &&
|
||||
create_non_racy_file seven &&
|
||||
git update-index --add seven &&
|
||||
BASE=$(test-tool dump-split-index .git/index | grep "^base") &&
|
||||
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
|
||||
@ -313,7 +323,7 @@ test_expect_success 'check splitIndex.maxPercentChange set to 0' '
|
||||
deletions:
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
: >eight &&
|
||||
create_non_racy_file eight &&
|
||||
git update-index --add eight &&
|
||||
BASE=$(test-tool dump-split-index .git/index | grep "^base") &&
|
||||
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
|
||||
@ -326,17 +336,17 @@ test_expect_success 'check splitIndex.maxPercentChange set to 0' '
|
||||
'
|
||||
|
||||
test_expect_success 'shared index files expire after 2 weeks by default' '
|
||||
: >ten &&
|
||||
create_non_racy_file ten &&
|
||||
git update-index --add ten &&
|
||||
test $(ls .git/sharedindex.* | wc -l) -gt 2 &&
|
||||
just_under_2_weeks_ago=$((5-14*86400)) &&
|
||||
test-tool chmtime =$just_under_2_weeks_ago .git/sharedindex.* &&
|
||||
: >eleven &&
|
||||
create_non_racy_file eleven &&
|
||||
git update-index --add eleven &&
|
||||
test $(ls .git/sharedindex.* | wc -l) -gt 2 &&
|
||||
just_over_2_weeks_ago=$((-1-14*86400)) &&
|
||||
test-tool chmtime =$just_over_2_weeks_ago .git/sharedindex.* &&
|
||||
: >twelve &&
|
||||
create_non_racy_file twelve &&
|
||||
git update-index --add twelve &&
|
||||
test $(ls .git/sharedindex.* | wc -l) -le 2
|
||||
'
|
||||
@ -344,12 +354,12 @@ test_expect_success 'shared index files expire after 2 weeks by default' '
|
||||
test_expect_success 'check splitIndex.sharedIndexExpire set to 16 days' '
|
||||
git config splitIndex.sharedIndexExpire "16.days.ago" &&
|
||||
test-tool chmtime =$just_over_2_weeks_ago .git/sharedindex.* &&
|
||||
: >thirteen &&
|
||||
create_non_racy_file thirteen &&
|
||||
git update-index --add thirteen &&
|
||||
test $(ls .git/sharedindex.* | wc -l) -gt 2 &&
|
||||
just_over_16_days_ago=$((-1-16*86400)) &&
|
||||
test-tool chmtime =$just_over_16_days_ago .git/sharedindex.* &&
|
||||
: >fourteen &&
|
||||
create_non_racy_file fourteen &&
|
||||
git update-index --add fourteen &&
|
||||
test $(ls .git/sharedindex.* | wc -l) -le 2
|
||||
'
|
||||
@ -358,13 +368,13 @@ test_expect_success 'check splitIndex.sharedIndexExpire set to "never" and "now"
|
||||
git config splitIndex.sharedIndexExpire never &&
|
||||
just_10_years_ago=$((-365*10*86400)) &&
|
||||
test-tool chmtime =$just_10_years_ago .git/sharedindex.* &&
|
||||
: >fifteen &&
|
||||
create_non_racy_file fifteen &&
|
||||
git update-index --add fifteen &&
|
||||
test $(ls .git/sharedindex.* | wc -l) -gt 2 &&
|
||||
git config splitIndex.sharedIndexExpire now &&
|
||||
just_1_second_ago=-1 &&
|
||||
test-tool chmtime =$just_1_second_ago .git/sharedindex.* &&
|
||||
: >sixteen &&
|
||||
create_non_racy_file sixteen &&
|
||||
git update-index --add sixteen &&
|
||||
test $(ls .git/sharedindex.* | wc -l) -le 2
|
||||
'
|
||||
@ -379,7 +389,7 @@ do
|
||||
# Create one new shared index file
|
||||
git config core.sharedrepository "$mode" &&
|
||||
git config core.splitIndex true &&
|
||||
: >one &&
|
||||
create_non_racy_file one &&
|
||||
git update-index --add one &&
|
||||
echo "$modebits" >expect &&
|
||||
test_modebits .git/index >actual &&
|
||||
|
||||
214
t/t1701-racy-split-index.sh
Executable file
214
t/t1701-racy-split-index.sh
Executable file
@ -0,0 +1,214 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This test can give false success if your machine is sufficiently
|
||||
# slow or all trials happened to happen on second boundaries.
|
||||
|
||||
test_description='racy split index'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'setup' '
|
||||
# Only split the index when the test explicitly says so.
|
||||
sane_unset GIT_TEST_SPLIT_INDEX &&
|
||||
git config splitIndex.maxPercentChange 100 &&
|
||||
|
||||
echo "cached content" >racy-file &&
|
||||
git add racy-file &&
|
||||
git commit -m initial &&
|
||||
|
||||
echo something >other-file &&
|
||||
# No raciness with this file.
|
||||
test-tool chmtime =-20 other-file &&
|
||||
|
||||
echo "+cached content" >expect
|
||||
'
|
||||
|
||||
check_cached_diff () {
|
||||
git diff-index --patch --cached $EMPTY_TREE racy-file >diff &&
|
||||
tail -1 diff >actual &&
|
||||
test_cmp expect actual
|
||||
}
|
||||
|
||||
trials="0 1 2 3 4"
|
||||
for trial in $trials
|
||||
do
|
||||
test_expect_success "split the index while adding a racily clean file #$trial" '
|
||||
rm -f .git/index .git/sharedindex.* &&
|
||||
|
||||
# The next three commands must be run within the same
|
||||
# second (so both writes to racy-file result in the same
|
||||
# mtime) to create the interesting racy situation.
|
||||
echo "cached content" >racy-file &&
|
||||
|
||||
# Update and split the index. The cache entry of
|
||||
# racy-file will be stored only in the shared index.
|
||||
git update-index --split-index --add racy-file &&
|
||||
|
||||
# File size must stay the same.
|
||||
echo "dirty worktree" >racy-file &&
|
||||
|
||||
# Subsequent git commands should notice that racy-file
|
||||
# and the split index have the same mtime, and check
|
||||
# the content of the file to see if it is actually
|
||||
# clean.
|
||||
check_cached_diff
|
||||
'
|
||||
done
|
||||
|
||||
for trial in $trials
|
||||
do
|
||||
test_expect_success "add a racily clean file to an already split index #$trial" '
|
||||
rm -f .git/index .git/sharedindex.* &&
|
||||
|
||||
git update-index --split-index &&
|
||||
|
||||
# The next three commands must be run within the same
|
||||
# second.
|
||||
echo "cached content" >racy-file &&
|
||||
|
||||
# Update the split index. The cache entry of racy-file
|
||||
# will be stored only in the split index.
|
||||
git update-index --add racy-file &&
|
||||
|
||||
# File size must stay the same.
|
||||
echo "dirty worktree" >racy-file &&
|
||||
|
||||
# Subsequent git commands should notice that racy-file
|
||||
# and the split index have the same mtime, and check
|
||||
# the content of the file to see if it is actually
|
||||
# clean.
|
||||
check_cached_diff
|
||||
'
|
||||
done
|
||||
|
||||
for trial in $trials
|
||||
do
|
||||
test_expect_success "split the index when the index contains a racily clean cache entry #$trial" '
|
||||
rm -f .git/index .git/sharedindex.* &&
|
||||
|
||||
# The next three commands must be run within the same
|
||||
# second.
|
||||
echo "cached content" >racy-file &&
|
||||
|
||||
git update-index --add racy-file &&
|
||||
|
||||
# File size must stay the same.
|
||||
echo "dirty worktree" >racy-file &&
|
||||
|
||||
# Now wait a bit to ensure that the split index written
|
||||
# below will get a more recent mtime than racy-file.
|
||||
sleep 1 &&
|
||||
|
||||
# Update and split the index when the index contains
|
||||
# the racily clean cache entry of racy-file.
|
||||
# A corresponding replacement cache entry with smudged
|
||||
# stat data should be added to the new split index.
|
||||
git update-index --split-index --add other-file &&
|
||||
|
||||
# Subsequent git commands should notice the smudged
|
||||
# stat data in the replacement cache entry and that it
|
||||
# doesnt match with the file the worktree.
|
||||
check_cached_diff
|
||||
'
|
||||
done
|
||||
|
||||
for trial in $trials
|
||||
do
|
||||
test_expect_success "update the split index when it contains a new racily clean cache entry #$trial" '
|
||||
rm -f .git/index .git/sharedindex.* &&
|
||||
|
||||
git update-index --split-index &&
|
||||
|
||||
# The next three commands must be run within the same
|
||||
# second.
|
||||
echo "cached content" >racy-file &&
|
||||
|
||||
# Update the split index. The cache entry of racy-file
|
||||
# will be stored only in the split index.
|
||||
git update-index --add racy-file &&
|
||||
|
||||
# File size must stay the same.
|
||||
echo "dirty worktree" >racy-file &&
|
||||
|
||||
# Now wait a bit to ensure that the split index written
|
||||
# below will get a more recent mtime than racy-file.
|
||||
sleep 1 &&
|
||||
|
||||
# Update the split index when the racily clean cache
|
||||
# entry of racy-file is only stored in the split index.
|
||||
# An updated cache entry with smudged stat data should
|
||||
# be added to the new split index.
|
||||
git update-index --add other-file &&
|
||||
|
||||
# Subsequent git commands should notice the smudged
|
||||
# stat data.
|
||||
check_cached_diff
|
||||
'
|
||||
done
|
||||
|
||||
for trial in $trials
|
||||
do
|
||||
test_expect_success "update the split index when a racily clean cache entry is stored only in the shared index #$trial" '
|
||||
rm -f .git/index .git/sharedindex.* &&
|
||||
|
||||
# The next three commands must be run within the same
|
||||
# second.
|
||||
echo "cached content" >racy-file &&
|
||||
|
||||
# Update and split the index. The cache entry of
|
||||
# racy-file will be stored only in the shared index.
|
||||
git update-index --split-index --add racy-file &&
|
||||
|
||||
# File size must stay the same.
|
||||
echo "dirty worktree" >racy-file &&
|
||||
|
||||
# Now wait a bit to ensure that the split index written
|
||||
# below will get a more recent mtime than racy-file.
|
||||
sleep 1 &&
|
||||
|
||||
# Update the split index when the racily clean cache
|
||||
# entry of racy-file is only stored in the shared index.
|
||||
# A corresponding replacement cache entry with smudged
|
||||
# stat data should be added to the new split index.
|
||||
git update-index --add other-file &&
|
||||
|
||||
# Subsequent git commands should notice the smudged
|
||||
# stat data.
|
||||
check_cached_diff
|
||||
'
|
||||
done
|
||||
|
||||
for trial in $trials
|
||||
do
|
||||
test_expect_success "update the split index after unpack trees() copied a racily clean cache entry from the shared index #$trial" '
|
||||
rm -f .git/index .git/sharedindex.* &&
|
||||
|
||||
# The next three commands must be run within the same
|
||||
# second.
|
||||
echo "cached content" >racy-file &&
|
||||
|
||||
# Update and split the index. The cache entry of
|
||||
# racy-file will be stored only in the shared index.
|
||||
git update-index --split-index --add racy-file &&
|
||||
|
||||
# File size must stay the same.
|
||||
echo "dirty worktree" >racy-file &&
|
||||
|
||||
# Now wait a bit to ensure that the split index written
|
||||
# below will get a more recent mtime than racy-file.
|
||||
sleep 1 &&
|
||||
|
||||
# Update the split index after unpack_trees() copied the
|
||||
# racily clean cache entry of racy-file from the shared
|
||||
# index. A corresponding replacement cache entry
|
||||
# with smudged stat data should be added to the new
|
||||
# split index.
|
||||
git read-tree -m HEAD &&
|
||||
|
||||
# Subsequent git commands should notice the smudged
|
||||
# stat data.
|
||||
check_cached_diff
|
||||
'
|
||||
done
|
||||
|
||||
test_done
|
||||
Reference in New Issue
Block a user