threads / patch / 48043

patch, 2 partsMake partial clone/fetch work when transfer.fsckobjects=1

Subject: [PATCH 0/2] Make partial clone/fetch work when transfer.fsckobjects=1

## tl;dr

6 messages between Mar 14, 2018 and Mar 15, 2018. Diffs are folded; open one to read it.

replies: 5people: 2as markdown or json

Jonathan Tan· Mar 14, 2018, 18:42 UTC · lore

One of my colleagues noticed that we obtain a "fatal: did not receive expected object" error when partial-cloning (that is, with --filter set) if transfer.fsckobjects is true. Here's a fix for that.

Jonathan Tan (2):
  index-pack: support checking objects but not links
  fetch-pack: do not check links for partial fetch
 Documentation/git-index-pack.txt |  3 +++
 builtin/index-pack.c             |  6 ++++--
 fetch-pack.c                     | 13 +++++++++++--
 t/t5302-pack-index.sh            |  5 +++++
 t/t5616-partial-clone.sh         | 11 +++++++++++
 5 files changed, 34 insertions(+), 4 deletions(-)
-- 
2.16.2.520.gd0db9edba.dirty
Jonathan Tan· Mar 14, 2018, 18:42 UTC · re: Jonathan Tan · lore

[PATCH 1/2] index-pack: support checking objects but not links

The index-pack command currently supports the --check-self-contained-and-connected argument, for internal use only, that instructs it to only check for broken links and not broken objects. For partial clones, we need the inverse, so add a --fsck-objects argument that checks for broken objects and not broken links, also for internal use only.

This will be used by fetch-pack in a subsequent patch.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
 Documentation/git-index-pack.txt | 3 +++
 builtin/index-pack.c             | 6 ++++--
 t/t5302-pack-index.sh            | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)
Show changes to 3 files +12 −2

Documentation/git-index-pack.txt, builtin/index-pack.c, t/t5302-pack-index.sh

diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index 1b4b65d66..138edb47b 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -77,6 +77,9 @@ OPTIONS
 --check-self-contained-and-connected::
 	Die if the pack contains broken links. For internal use only.
 
+--fsck-objects::
+	Die if the pack contains broken objects. For internal use only.
+
 --threads=<n>::
 	Specifies the number of threads to spawn when resolving
 	deltas. This requires that index-pack be compiled with
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 59878e70b..f46cb5967 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -827,7 +827,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
 		free(has_data);
 	}
 
-	if (strict) {
+	if (strict || do_fsck_object) {
 		read_lock();
 		if (type == OBJ_BLOB) {
 			struct blob *blob = lookup_blob(oid);
@@ -853,7 +853,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
 			if (do_fsck_object &&
 			    fsck_object(obj, buf, size, &fsck_options))
 				die(_("Error in object"));
-			if (fsck_walk(obj, NULL, &fsck_options))
+			if (strict && fsck_walk(obj, NULL, &fsck_options))
 				die(_("Not all child objects of %s are reachable"), oid_to_hex(&obj->oid));
 
 			if (obj->type == OBJ_TREE) {
@@ -1688,6 +1688,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 			} else if (!strcmp(arg, "--check-self-contained-and-connected")) {
 				strict = 1;
 				check_self_contained_and_connected = 1;
+			} else if (!strcmp(arg, "--fsck-objects")) {
+				do_fsck_object = 1;
 			} else if (!strcmp(arg, "--verify")) {
 				verify = 1;
 			} else if (!strcmp(arg, "--verify-stat")) {
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index c2fc584da..d695a6082 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -262,4 +262,9 @@ EOF
     grep "^warning:.* expected .tagger. line" err
 '
 
+test_expect_success 'index-pack --fsck-objects also warns upon missing tagger in tag' '
+    git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
+    grep "^warning:.* expected .tagger. line" err
+'
+
 test_done

-- 
2.16.2.520.gd0db9edba.dirty
Jonathan Tan· Mar 14, 2018, 18:42 UTC · re: Jonathan Tan · lore

[PATCH 2/2] fetch-pack: do not check links for partial fetch

When doing a partial clone or fetch with transfer.fsckobjects=1, use the --fsck-objects instead of the --strict flag when invoking index-pack so that links are not checked, only objects. This is because incomplete links are expected when doing a partial clone or fetch.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
 fetch-pack.c             | 13 +++++++++++--
 t/t5616-partial-clone.sh | 11 +++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
Show changes to 2 files +22 −2

fetch-pack.c, t/t5616-partial-clone.sh

diff --git a/fetch-pack.c b/fetch-pack.c
index d97461296..1d6117565 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -886,8 +886,17 @@ static int get_pack(struct fetch_pack_args *args,
 	    ? fetch_fsck_objects
 	    : transfer_fsck_objects >= 0
 	    ? transfer_fsck_objects
-	    : 0)
-		argv_array_push(&cmd.args, "--strict");
+	    : 0) {
+		if (args->from_promisor)
+			/*
+			 * We cannot use --strict in index-pack because it
+			 * checks both broken objects and links, but we only
+			 * want to check for broken objects.
+			 */
+			argv_array_push(&cmd.args, "--fsck-objects");
+		else
+			argv_array_push(&cmd.args, "--strict");
+	}
 
 	cmd.in = demux.out;
 	cmd.git_cmd = 1;
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 29d863118..cee556536 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -143,4 +143,15 @@ test_expect_success 'manual prefetch of missing objects' '
 	test_line_count = 0 observed.oids
 '
 
+test_expect_success 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects' '
+	git init src &&
+	test_commit -C src x &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
+
+	GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \
+		clone --filter="blob:none" "file://$(pwd)/src" dst &&
+	grep "git index-pack.*--fsck-objects" trace
+'
+
 test_done

-- 
2.16.2.520.gd0db9edba.dirty
Junio C Hamano· Mar 14, 2018, 21:55 UTC · re: Jonathan Tan · lore

Re: [PATCH 2/2] fetch-pack: do not check links for partial fetch

Jonathan Tan <jonathantanmy@google.com> writes:
> When doing a partial clone or fetch with transfer.fsckobjects=1, use the
> --fsck-objects instead of the --strict flag when invoking index-pack so
> that links are not checked, only objects. This is because incomplete
> links are expected when doing a partial clone or fetch.

It is expected that _some_ links are missing, but this makes me wonder if we can do better than disabling the connectivity check altogether. Does "git fetch" lack sufficient information to attempt the connectivity check, and when (and only when) it hits a broken link, see if that is because the connectivity check traversal is crossing a "partial" fetch boundary, or something along that line?

Show 51 quoted lines
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
>  fetch-pack.c             | 13 +++++++++++--
>  t/t5616-partial-clone.sh | 11 +++++++++++
>  2 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/fetch-pack.c b/fetch-pack.c
> index d97461296..1d6117565 100644
> --- a/fetch-pack.c
> +++ b/fetch-pack.c
> @@ -886,8 +886,17 @@ static int get_pack(struct fetch_pack_args *args,
>  	    ? fetch_fsck_objects
>  	    : transfer_fsck_objects >= 0
>  	    ? transfer_fsck_objects
> -	    : 0)
> -		argv_array_push(&cmd.args, "--strict");
> +	    : 0) {
> +		if (args->from_promisor)
> +			/*
> +			 * We cannot use --strict in index-pack because it
> +			 * checks both broken objects and links, but we only
> +			 * want to check for broken objects.
> +			 */
> +			argv_array_push(&cmd.args, "--fsck-objects");
> +		else
> +			argv_array_push(&cmd.args, "--strict");
> +	}
>  
>  	cmd.in = demux.out;
>  	cmd.git_cmd = 1;
> diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
> index 29d863118..cee556536 100755
> --- a/t/t5616-partial-clone.sh
> +++ b/t/t5616-partial-clone.sh
> @@ -143,4 +143,15 @@ test_expect_success 'manual prefetch of missing objects' '
>  	test_line_count = 0 observed.oids
>  '
>  
> +test_expect_success 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects' '
> +	git init src &&
> +	test_commit -C src x &&
> +	test_config -C src uploadpack.allowfilter 1 &&
> +	test_config -C src uploadpack.allowanysha1inwant 1 &&
> +
> +	GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \
> +		clone --filter="blob:none" "file://$(pwd)/src" dst &&
> +	grep "git index-pack.*--fsck-objects" trace
> +'
> +
>  test_done
Jonathan Tan· Mar 14, 2018, 22:24 UTC · re: Junio C Hamano · lore

Re: [PATCH 2/2] fetch-pack: do not check links for partial fetch

On Wed, 14 Mar 2018 14:55:31 -0700 Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines
> Jonathan Tan <jonathantanmy@google.com> writes:
> 
> > When doing a partial clone or fetch with transfer.fsckobjects=1, use the
> > --fsck-objects instead of the --strict flag when invoking index-pack so
> > that links are not checked, only objects. This is because incomplete
> > links are expected when doing a partial clone or fetch.
> 
> It is expected that _some_ links are missing, but this makes me
> wonder if we can do better than disabling the connectivity check
> altogether.  Does "git fetch" lack sufficient information to attempt
> the connectivity check, and when (and only when) it hits a broken
> link, see if that is because the connectivity check traversal is
> crossing a "partial" fetch boundary, or something along that line?

Our only definition (currently) for the "partial" fetch boundary is whether an object in a promisor packfile (a packfile obtained from the promisor remote) references it, so I think that checking for crossing a "partial" fetch boundary does not add anything. This is because by that definition, any missing links observed from objects newly fetched from the promisor remote cross a "partial" fetch boundary (since all objects fetched in this way "promise" all objects that they refer to).

But it is true that we might be able to do better in checking, for example, that a packfile fetched using a blob size limit contains all referenced trees (that is, only blobs are allowed to be missing).

Junio C Hamano· Mar 15, 2018, 17:15 UTC · re: Jonathan Tan · lore

Re: [PATCH 2/2] fetch-pack: do not check links for partial fetch

Jonathan Tan <jonathantanmy@google.com> writes:
> Our only definition (currently) for the "partial" fetch boundary is
> whether an object in a promisor packfile (a packfile obtained from the
> promisor remote) references it, so I think that checking for crossing a
> "partial" fetch boundary does not add anything.

Ah, that's a perfect answer. When we find a link that leads to a missing object in a pack after receiving it from a remote repository that gives us promises, the missing object must be available from the remote repository by definition. Makes perfect sense ;-)

Thanks.

← back to recent threads