mirror of
https://github.com/git/git.git
synced 2026-01-11 05:13:13 +09:00
d460267613
When a server S knows that some objects from a repository are available from a promisor remote X, S might want to suggest to a client C cloning or fetching the repo from S that C may use X directly instead of S for these objects. Note that this could happen both in the case S itself doesn't have the objects and borrows them from X, and in the case S has the objects but knows that X is better connected to the world (e.g., it is in a $LARGEINTERNETCOMPANY datacenter with petabit/s backbone connections) than S. Implementation of the latter case, which would require S to omit in its response the objects available on X, is left for future improvement though. Then C might or might not, want to get the objects from X. If S and C can agree on C using X directly, S can then omit objects that can be obtained from X when answering C's request. To allow S and C to agree and let each other know about C using X or not, let's introduce a new "promisor-remote" capability in the protocol v2, as well as a few new configuration variables: - "promisor.advertise" on the server side, and: - "promisor.acceptFromServer" on the client side. By default, or if "promisor.advertise" is set to 'false', a server S will not advertise the "promisor-remote" capability. If S doesn't advertise the "promisor-remote" capability, then a client C replying to S shouldn't advertise the "promisor-remote" capability either. If "promisor.advertise" is set to 'true', S will advertise its promisor remotes with a string like: promisor-remote=<pr-info>[;<pr-info>]... where each <pr-info> element contains information about a single promisor remote in the form: name=<pr-name>[,url=<pr-url>] where <pr-name> is the urlencoded name of a promisor remote and <pr-url> is the urlencoded URL of the promisor remote named <pr-name>. For now, the URL is passed in addition to the name. In the future, it might be possible to pass other information like a filter-spec that the client may use when cloning from S, or a token that the client may use when retrieving objects from X. It is C's responsibility to arrange how it can reach X though, so pieces of information that are usually outside Git's concern, like proxy configuration, must not be distributed over this protocol. It might also be possible in the future for "promisor.advertise" to have other values. For example a value like "onlyName" could prevent S from advertising URLs, which could help in case C should use a different URL for X than the URL S is using. (The URL S is using might be an internal one on the server side for example.) By default or if "promisor.acceptFromServer" is set to "None", C will not accept to use the promisor remotes that might have been advertised by S. In this case, C will not advertise any "promisor-remote" capability in its reply to S. If "promisor.acceptFromServer" is set to "All" and S advertised some promisor remotes, then on the contrary, C will accept to use all the promisor remotes that S advertised and C will reply with a string like: promisor-remote=<pr-name>[;<pr-name>]... where the <pr-name> elements are the urlencoded names of all the promisor remotes S advertised. In a following commit, other values for "promisor.acceptFromServer" will be implemented, so that C will be able to decide the promisor remotes it accepts depending on the name and URL it received from S. So even if that name and URL information is not used much right now, it will be needed soon. Helped-by: Taylor Blau <me@ttaylorr.com> Helped-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
245 lines
7.8 KiB
Bash
Executable File
245 lines
7.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='handling of promisor remote advertisement'
|
|
|
|
. ./test-lib.sh
|
|
|
|
GIT_TEST_MULTI_PACK_INDEX=0
|
|
GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=0
|
|
|
|
# Setup the repository with three commits, this way HEAD is always
|
|
# available and we can hide commit 1 or 2.
|
|
test_expect_success 'setup: create "template" repository' '
|
|
git init template &&
|
|
test_commit -C template 1 &&
|
|
test_commit -C template 2 &&
|
|
test_commit -C template 3 &&
|
|
test-tool genrandom foo 10240 >template/foo &&
|
|
git -C template add foo &&
|
|
git -C template commit -m foo
|
|
'
|
|
|
|
# A bare repo will act as a server repo with unpacked objects.
|
|
test_expect_success 'setup: create bare "server" repository' '
|
|
git clone --bare --no-local template server &&
|
|
mv server/objects/pack/pack-* . &&
|
|
packfile=$(ls pack-*.pack) &&
|
|
git -C server unpack-objects --strict <"$packfile"
|
|
'
|
|
|
|
check_missing_objects () {
|
|
git -C "$1" rev-list --objects --all --missing=print > all.txt &&
|
|
perl -ne 'print if s/^[?]//' all.txt >missing.txt &&
|
|
test_line_count = "$2" missing.txt &&
|
|
if test "$2" -lt 2
|
|
then
|
|
test "$3" = "$(cat missing.txt)"
|
|
else
|
|
test -f "$3" &&
|
|
sort <"$3" >expected_sorted &&
|
|
sort <missing.txt >actual_sorted &&
|
|
test_cmp expected_sorted actual_sorted
|
|
fi
|
|
}
|
|
|
|
initialize_server () {
|
|
count="$1"
|
|
missing_oids="$2"
|
|
|
|
# Repack everything first
|
|
git -C server -c repack.writebitmaps=false repack -a -d &&
|
|
|
|
# Remove promisor file in case they exist, useful when reinitializing
|
|
rm -rf server/objects/pack/*.promisor &&
|
|
|
|
# Repack without the largest object and create a promisor pack on server
|
|
git -C server -c repack.writebitmaps=false repack -a -d \
|
|
--filter=blob:limit=5k --filter-to="$(pwd)/pack" &&
|
|
promisor_file=$(ls server/objects/pack/*.pack | sed "s/\.pack/.promisor/") &&
|
|
>"$promisor_file" &&
|
|
|
|
# Check objects missing on the server
|
|
check_missing_objects server "$count" "$missing_oids"
|
|
}
|
|
|
|
copy_to_lop () {
|
|
oid_path="$(test_oid_to_path $1)" &&
|
|
path="server/objects/$oid_path" &&
|
|
path2="lop/objects/$oid_path" &&
|
|
mkdir -p $(dirname "$path2") &&
|
|
cp "$path" "$path2"
|
|
}
|
|
|
|
test_expect_success "setup for testing promisor remote advertisement" '
|
|
# Create another bare repo called "lop" (for Large Object Promisor)
|
|
git init --bare lop &&
|
|
|
|
# Copy the largest object from server to lop
|
|
obj="HEAD:foo" &&
|
|
oid="$(git -C server rev-parse $obj)" &&
|
|
copy_to_lop "$oid" &&
|
|
|
|
initialize_server 1 "$oid" &&
|
|
|
|
# Configure lop as promisor remote for server
|
|
git -C server remote add lop "file://$(pwd)/lop" &&
|
|
git -C server config remote.lop.promisor true &&
|
|
|
|
git -C lop config uploadpack.allowFilter true &&
|
|
git -C lop config uploadpack.allowAnySHA1InWant true &&
|
|
git -C server config uploadpack.allowFilter true &&
|
|
git -C server config uploadpack.allowAnySHA1InWant true
|
|
'
|
|
|
|
test_expect_success "clone with promisor.advertise set to 'true'" '
|
|
git -C server config promisor.advertise true &&
|
|
|
|
# Clone from server to create a client
|
|
GIT_NO_LAZY_FETCH=0 git clone -c remote.lop.promisor=true \
|
|
-c remote.lop.fetch="+refs/heads/*:refs/remotes/lop/*" \
|
|
-c remote.lop.url="file://$(pwd)/lop" \
|
|
-c promisor.acceptfromserver=All \
|
|
--no-local --filter="blob:limit=5k" server client &&
|
|
test_when_finished "rm -rf client" &&
|
|
|
|
# Check that the largest object is still missing on the server
|
|
check_missing_objects server 1 "$oid"
|
|
'
|
|
|
|
test_expect_success "clone with promisor.advertise set to 'false'" '
|
|
git -C server config promisor.advertise false &&
|
|
|
|
# Clone from server to create a client
|
|
GIT_NO_LAZY_FETCH=0 git clone -c remote.lop.promisor=true \
|
|
-c remote.lop.fetch="+refs/heads/*:refs/remotes/lop/*" \
|
|
-c remote.lop.url="file://$(pwd)/lop" \
|
|
-c promisor.acceptfromserver=All \
|
|
--no-local --filter="blob:limit=5k" server client &&
|
|
test_when_finished "rm -rf client" &&
|
|
|
|
# Check that the largest object is not missing on the server
|
|
check_missing_objects server 0 "" &&
|
|
|
|
# Reinitialize server so that the largest object is missing again
|
|
initialize_server 1 "$oid"
|
|
'
|
|
|
|
test_expect_success "clone with promisor.acceptfromserver set to 'None'" '
|
|
git -C server config promisor.advertise true &&
|
|
|
|
# Clone from server to create a client
|
|
GIT_NO_LAZY_FETCH=0 git clone -c remote.lop.promisor=true \
|
|
-c remote.lop.fetch="+refs/heads/*:refs/remotes/lop/*" \
|
|
-c remote.lop.url="file://$(pwd)/lop" \
|
|
-c promisor.acceptfromserver=None \
|
|
--no-local --filter="blob:limit=5k" server client &&
|
|
test_when_finished "rm -rf client" &&
|
|
|
|
# Check that the largest object is not missing on the server
|
|
check_missing_objects server 0 "" &&
|
|
|
|
# Reinitialize server so that the largest object is missing again
|
|
initialize_server 1 "$oid"
|
|
'
|
|
|
|
test_expect_success "init + fetch with promisor.advertise set to 'true'" '
|
|
git -C server config promisor.advertise true &&
|
|
|
|
test_when_finished "rm -rf client" &&
|
|
mkdir client &&
|
|
git -C client init &&
|
|
git -C client config remote.lop.promisor true &&
|
|
git -C client config remote.lop.fetch "+refs/heads/*:refs/remotes/lop/*" &&
|
|
git -C client config remote.lop.url "file://$(pwd)/lop" &&
|
|
git -C client config remote.server.url "file://$(pwd)/server" &&
|
|
git -C client config remote.server.fetch "+refs/heads/*:refs/remotes/server/*" &&
|
|
git -C client config promisor.acceptfromserver All &&
|
|
GIT_NO_LAZY_FETCH=0 git -C client fetch --filter="blob:limit=5k" server &&
|
|
|
|
# Check that the largest object is still missing on the server
|
|
check_missing_objects server 1 "$oid"
|
|
'
|
|
|
|
test_expect_success "clone with promisor.advertise set to 'true' but don't delete the client" '
|
|
git -C server config promisor.advertise true &&
|
|
|
|
# Clone from server to create a client
|
|
GIT_NO_LAZY_FETCH=0 git clone -c remote.lop.promisor=true \
|
|
-c remote.lop.fetch="+refs/heads/*:refs/remotes/lop/*" \
|
|
-c remote.lop.url="file://$(pwd)/lop" \
|
|
-c promisor.acceptfromserver=All \
|
|
--no-local --filter="blob:limit=5k" server client &&
|
|
|
|
# Check that the largest object is still missing on the server
|
|
check_missing_objects server 1 "$oid"
|
|
'
|
|
|
|
test_expect_success "setup for subsequent fetches" '
|
|
# Generate new commit with large blob
|
|
test-tool genrandom bar 10240 >template/bar &&
|
|
git -C template add bar &&
|
|
git -C template commit -m bar &&
|
|
|
|
# Fetch new commit with large blob
|
|
git -C server fetch origin &&
|
|
git -C server update-ref HEAD FETCH_HEAD &&
|
|
git -C server rev-parse HEAD >expected_head &&
|
|
|
|
# Repack everything twice and remove .promisor files before
|
|
# each repack. This makes sure everything gets repacked
|
|
# into a single packfile. The second repack is necessary
|
|
# because the first one fetches from lop and creates a new
|
|
# packfile and its associated .promisor file.
|
|
|
|
rm -f server/objects/pack/*.promisor &&
|
|
git -C server -c repack.writebitmaps=false repack -a -d &&
|
|
rm -f server/objects/pack/*.promisor &&
|
|
git -C server -c repack.writebitmaps=false repack -a -d &&
|
|
|
|
# Unpack everything
|
|
rm pack-* &&
|
|
mv server/objects/pack/pack-* . &&
|
|
packfile=$(ls pack-*.pack) &&
|
|
git -C server unpack-objects --strict <"$packfile" &&
|
|
|
|
# Copy new large object to lop
|
|
obj_bar="HEAD:bar" &&
|
|
oid_bar="$(git -C server rev-parse $obj_bar)" &&
|
|
copy_to_lop "$oid_bar" &&
|
|
|
|
# Reinitialize server so that the 2 largest objects are missing
|
|
printf "%s\n" "$oid" "$oid_bar" >expected_missing.txt &&
|
|
initialize_server 2 expected_missing.txt &&
|
|
|
|
# Create one more client
|
|
cp -r client client2
|
|
'
|
|
|
|
test_expect_success "subsequent fetch from a client when promisor.advertise is true" '
|
|
git -C server config promisor.advertise true &&
|
|
|
|
GIT_NO_LAZY_FETCH=0 git -C client pull origin &&
|
|
|
|
git -C client rev-parse HEAD >actual &&
|
|
test_cmp expected_head actual &&
|
|
|
|
cat client/bar >/dev/null &&
|
|
|
|
check_missing_objects server 2 expected_missing.txt
|
|
'
|
|
|
|
test_expect_success "subsequent fetch from a client when promisor.advertise is false" '
|
|
git -C server config promisor.advertise false &&
|
|
|
|
GIT_NO_LAZY_FETCH=0 git -C client2 pull origin &&
|
|
|
|
git -C client2 rev-parse HEAD >actual &&
|
|
test_cmp expected_head actual &&
|
|
|
|
cat client2/bar >/dev/null &&
|
|
|
|
check_missing_objects server 1 "$oid"
|
|
'
|
|
|
|
test_done
|