promisor-remote: try accepted remotes before others in get_direct()

When a server advertises promisor remotes and the client accepts some
of them, those remotes carry the server's intent: 'fetch missing
objects preferably from here', and the client agrees with that for the
remotes it accepts.

However promisor_remote_get_direct() actually iterates over all
promisor remotes in list order, which is the order they appear in the
config files (except perhaps for the one appearing in the
`extensions.partialClone` config variable which is tried last).

This means an existing, but not accepted, promisor remote, could be
tried before the accepted ones, which does not reflect the intent of
the agreement between client and server.

If the client doesn't care about what the server suggests, it should
accept nothing and rely on its remotes as they are already configured.

To better reflect the agreement between client and server, let's make
promisor_remote_get_direct() try the accepted promisor remotes before
the non-accepted ones.

Concretely, let's extract a try_promisor_remotes() helper and call it
twice from promisor_remote_get_direct():

- first with an `accepted_only=true` argument to try only the accepted
  remotes,
- then with `accepted_only=false` to fall back to any remaining remote.

Ensuring that accepted remotes are preferred will be even more
important if in the future a mechanism is developed to allow the
client to auto-configure remotes that the server advertises. This will
in particular avoid fetching from the server (which is already
configured as a promisor remote) before trying the auto-configured
remotes, as these new remotes would likely appear at the end of the
config file, and as the server might not appear in the
`extensions.partialClone` config variable.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/gitprotocol-v2.adoc b/Documentation/gitprotocol-v2.adoc
index f985cb4c4749533f4653ae5c2eeec1551e9218bb..4fcb1a7bda1be723256565debd3666df97fa0877 100644 (file)
--- a/Documentation/gitprotocol-v2.adoc
+++ b/Documentation/gitprotocol-v2.adoc
@@ -848,6 +848,10 @@ advertised, it can reply with "promisor-remote=<pr-names>" where
 where `pr-name` is the urlencoded name of a promisor remote the server
 advertised and the client accepts.
 
+The promisor remotes that the client accepted will be tried before the
+other configured promisor remotes when the client attempts to fetch
+missing objects.
+
 Note that, everywhere in this document, the ';' and ',' characters
 MUST be encoded if they appear in `pr-name` or `field-value`.
 

diff --git a/promisor-remote.c b/promisor-remote.c
index 96fa215b06a9249b7533c63bd69dd612003b1c9c..7ce7d22f952e70f5f6ab87cb4474dff5dcbe3a72 100644 (file)
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -268,11 +268,35 @@ static int remove_fetched_oids(struct repository *repo,
        return remaining_nr;
 }
 
+static int try_promisor_remotes(struct repository *repo,
+                               struct object_id **remaining_oids,
+                               int *remaining_nr, int *to_free,
+                               bool accepted_only)
+{
+       struct promisor_remote *r = repo->promisor_remote_config->promisors;
+
+       for (; r; r = r->next) {
+               if (accepted_only != r->accepted)
+                       continue;
+               if (fetch_objects(repo, r->name, *remaining_oids, *remaining_nr) < 0) {
+                       if (*remaining_nr == 1)
+                               continue;
+                       *remaining_nr = remove_fetched_oids(repo, remaining_oids,
+                                                           *remaining_nr, *to_free);
+                       if (*remaining_nr) {
+                               *to_free = 1;
+                               continue;
+                       }
+               }
+               return 1; /* all fetched */
+       }
+       return 0;
+}
+
 void promisor_remote_get_direct(struct repository *repo,
                                const struct object_id *oids,
                                int oid_nr)
 {
-       struct promisor_remote *r;
        struct object_id *remaining_oids = (struct object_id *)oids;
        int remaining_nr = oid_nr;
        int to_free = 0;
@@ -283,19 +307,13 @@ void promisor_remote_get_direct(struct repository *repo,
 
        promisor_remote_init(repo);
 
-       for (r = repo->promisor_remote_config->promisors; r; r = r->next) {
-               if (fetch_objects(repo, r->name, remaining_oids, remaining_nr) < 0) {
-                       if (remaining_nr == 1)
-                               continue;
-                       remaining_nr = remove_fetched_oids(repo, &remaining_oids,
-                                                        remaining_nr, to_free);
-                       if (remaining_nr) {
-                               to_free = 1;
-                               continue;
-                       }
-               }
+       /* Try accepted remotes first (those the server told us to use) */
+       if (try_promisor_remotes(repo, &remaining_oids, &remaining_nr,
+                                &to_free, true))
+               goto all_fetched;
+       if (try_promisor_remotes(repo, &remaining_oids, &remaining_nr,
+                                &to_free, false))
                goto all_fetched;
-       }
 
        for (i = 0; i < remaining_nr; i++) {
                if (is_promisor_object(repo, &remaining_oids[i]))

diff --git a/t/t5710-promisor-remote-capability.sh b/t/t5710-promisor-remote-capability.sh
index 357822c01a7530207532553bf7092cc46235e77d..bf0eed9f10974252da7e6766749d75ec9a7ad1e7 100755 (executable)
--- a/t/t5710-promisor-remote-capability.sh
+++ b/t/t5710-promisor-remote-capability.sh
@@ -166,6 +166,75 @@ test_expect_success "init + fetch with promisor.advertise set to 'true'" '
        check_missing_objects server 1 "$oid"
 '
 
+test_expect_success "clone with two promisors but only one advertised" '
+       git -C server config promisor.advertise true &&
+       test_when_finished "rm -rf client unused_lop" &&
+
+       # Create a promisor that will be configured but not be used
+       git init --bare unused_lop &&
+
+       # Clone from server to create a client
+       GIT_TRACE="$(pwd)/trace" GIT_NO_LAZY_FETCH=0 git clone \
+               -c remote.unused_lop.promisor=true \
+               -c remote.unused_lop.fetch="+refs/heads/*:refs/remotes/unused_lop/*" \
+               -c remote.unused_lop.url="file://$(pwd)/unused_lop" \
+               -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 "unused_lop" appears before "lop" in the config
+       printf "remote.%s.promisor true\n" "unused_lop" "lop" "origin" >expect &&
+       git -C client config get --all --show-names --regexp "^remote\..*\.promisor$" >actual &&
+       test_cmp expect actual &&
+
+       # Check that "lop" was tried
+       test_grep " fetch lop " trace &&
+       # Check that "unused_lop" was not contacted
+       # This means "lop", the accepted promisor, was tried first
+       test_grep ! " fetch unused_lop " trace &&
+
+       # Check that the largest object is still missing on the server
+       check_missing_objects server 1 "$oid"
+'
+
+test_expect_success "init + fetch two promisors but only one advertised" '
+       git -C server config promisor.advertise true &&
+       test_when_finished "rm -rf client unused_lop" &&
+
+       # Create a promisor that will be configured but not be used
+       git init --bare unused_lop &&
+
+       mkdir client &&
+       git -C client init &&
+       git -C client config remote.unused_lop.promisor true &&
+       git -C client config remote.unused_lop.fetch "+refs/heads/*:refs/remotes/unused_lop/*" &&
+       git -C client config remote.unused_lop.url "file://$(pwd)/unused_lop" &&
+       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 &&
+
+       # Check that "unused_lop" appears before "lop" in the config
+       printf "remote.%s.promisor true\n" "unused_lop" "lop" >expect &&
+       git -C client config get --all --show-names --regexp "^remote\..*\.promisor$" >actual &&
+       test_cmp expect actual &&
+
+       GIT_TRACE="$(pwd)/trace" GIT_NO_LAZY_FETCH=0 git -C client fetch --filter="blob:limit=5k" server &&
+
+       # Check that "lop" was tried
+       test_grep " fetch lop " trace &&
+       # Check that "unused_lop" was not contacted
+       # This means "lop", the accepted promisor, was tried first
+       test_grep ! " fetch unused_lop " trace &&
+
+       # Check that the largest object is still missing on the server
+       check_missing_objects server 1 "$oid"
+'
+
 test_expect_success "clone with promisor.acceptfromserver set to 'KnownName'" '
        git -C server config promisor.advertise true &&
        test_when_finished "rm -rf client" &&