Jonathan Tan <jonathantanmy@xxxxxxxxxx> writes:
> When the connectivity check after a fetch fails, an error message
> "<remote> did not send all necessary objects" is printed. That error
> message is printed regardless of the reason of failure: in particular,
> that message may be printed if the connectivity check fails because a
> local object is missing. (The connectivity check reads local objects too
> because it compares the set of objects that the remote claims to send
> against the set of objects that our refs directly or indirectly
> reference.)
>
> Since it is not necessarily true that the remote did not send all
> necessary objects, update the error message to be something that more
> correctly reflects the situation.
>
> The updated error message is admittedly vague and one alternative
> solution would be to update the revision walking code to be able to more
> precisely specify if a bad object is supposed to be available locally or
> supposed to have been sent by the remote. That would likely require, in
> the revision walking code, to delay parsing any object until all its
> children has been parsed, which seems to be a significant undertaking.
>
While that is all true, I do not think the posted patch as-is is a
good idea. After all, object missing on our side locally before you
start "git fetch" is a local repository corruption, which ought to
be a much rarer event than a still in development and in flux server
end sending nonsense packfiles, no?
At least, "they didn't do X" would give the user somewhere to start
investigation (e.g. complain to the server folks about the error,
stating where they started from and what they tried to fetch). The
new message may be playing it "safe" by not saying anything you are
not absolutely sure about, but that is much less useful to the users
who got the message.
Now, when check_connected() fails early in store_updated_refs(), we
haven't updated the remote-tracking refs to point at the tips we
obtained, have we?
One thing we could do is to run "git fsck" to see if the local
history is broken. We may have added unreferenced objects that have
come from the remote end, but having dangling or unreachable objects
is not an error, while it is a sure sign of repository corruption if
there are missing objects. Because we haven't update any of the
refs (local or remote-tracking), we still should be able to see if
the problem is on our end at this point
If "o" or "X" (in the illustrated history in my review of your v1)
is found to be missing by "git fsck" (or "git fsck A"), then you
know that the server end is not the culprit (or at least may not be
the sole culprit) for this connectivity check failure. If "git
fsck" reports no missing objects, then what was found to be missing
is not "X" but is "x" or "B", and we are more certain that the
remote end is more likely to be problematic.
As it is on the error codepath, we could even automatically run fsck
to figure out if we have objects missing after giving an initial
diagnosis, but at least it would be easy to give an advice at this
point in the code to run fsck after seeing a failure from this
fetch.
As you have two places that show the error, perhaps the first step
is to introduce a helper function:
int diagnose_check_connected_error(const char *url)
{
return error(_("%s may not have sent necessary objects"),
url ? url : "remote");
}
and call it instead of calling error() in the places you touched in
v2.
As a follow up step, then, we could do something like
int diagnose_check_connected_error(const char *url)
{
+ static const char advice[] =
+ N_("run 'git fsck' to see if your repository "
+ "is missing objects; if it passes, the problem is "
+ "on the remote end");
+
+ advise_if_enabled(ADVICE_CONNECTIVETY_FAILURE, advice);
return error(_("%s may not have sent necessary objects"),
url ? url : "remote");
}
or if we are more ambitious, actually run "git fsck" via the run_command()
API for the user.
