Skip to content

align the behavior when opening "packed-refs"

shejialuo git 5 versions – In review

Get series with b4
b4 am aCS7O8tNekg_u9Wp@ArchLinux

Versions newest first · linked by author and title

  1. v5 Latest3 patches 5 repliesIn review
  2. v43 patches 4 repliesSuperseded
  3. v33 patches 13 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v24 patches12 repliesSuperseded
v14 patches11 repliesSuperseded

Changes in v5 from the cover letter

1. Improve the commit message in the first patch to be more clear:
1. Talk about the current behavior, what error we would report if "packed-refs" is empty.
2. To align with the runtime behavior, we should skip checking the content of "packed-refs".
3. Why do we need to report to the user when the "packed-refs" is empty
2. Fix grammar issue in the last patch.

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3packed-backend: fsck should warn when "packed-refs" file is emptyDocumentation/fsck-msgids.adoc fsck.h refs/packed-backend.c +1 more+33 -00 replies
2/3packed-backend: extract snapshot allocation in `load_contents`refs/packed-backend.c+31 -220 replies
3/3packed-backend: mmap large "packed-refs" file during fsckrefs/packed-backend.c+7 -120 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.

Read the v5 thread

Cover letter [PATCH v5 0/3] align the behavior when opening "packed-refs"

Hi All:

As discussed in [1], we need to use mmap mechanism to open large "packed_refs" file to save the memory usage. This patch mainly does the following things:

1: Fix an issue that we would report an error when the "packed-refs" file is empty, which does not align with the runtime behavior. 2-4: Extract some logic from the existing code and then use these created helper functions to let fsck code to use mmap necessarily

[1] https://lore.kernel.org/git/[email protected]

Really thank Peff and Patrick to suggest me to do above change.

---

Change in v2:

1. Update the commit message of [PATCH 1/4]. And use redirection to create an empty file instead of using touch.
2. Don't use if for the refactored function in [PATCH 3/4] and then update the commit message to align with the new function name.
3. Enhance the commit message of [PATCH 4/4].

---

Change in v3:

1. Drop the patch which creates a new function "munmap_temporary_snapshot". As discussed, there is no need to munmap the file during fsck.
2. Allocate snapshot variable in the stack instead of heap.
3. Fix rebase issue, remove unneeded code to check the file size explicitly.

---

Change in v4:

1. Report the "emptyPackedRefsFile(INFO)" to the user when the "packed-refs" is empty instead of ONLY skipping checking the content and update the shell script and commit message.
2. Apply Peff's advice to make [PATCH v3 2/3] more clear.

---

Change in v5:

1. Improve the commit message in the first patch to be more clear:
1. Talk about the current behavior, what error we would report if "packed-refs" is empty.
2. To align with the runtime behavior, we should skip checking the content of "packed-refs".
3. Why do we need to report to the user when the "packed-refs" is empty
2. Fix grammar issue in the last patch.

Thanks,
Jialuo

shejialuo (3):
packed-backend: fsck should warn when "packed-refs" file is empty
packed-backend: extract snapshot allocation in load_contents
packed-backend: mmap large "packed-refs" file during fsck

 Documentation/fsck-msgids.adoc |  6 +++
 fsck.h                         |  1 +
 refs/packed-backend.c          | 73 ++++++++++++++++++++--------------
 t/t0602-reffiles-fsck.sh       | 17 ++++++++
 4 files changed, 67 insertions(+), 30 deletions(-)

Range-diff against v4:
1: 75636c9c85 ! 1: 3487692a03 packed-backend: fsck should warn when "packed-refs" file is empty
@@ Metadata
## Commit message ##
packed-backend: fsck should warn when "packed-refs" file is empty

- During fsck, an empty "packed-refs" gives an error; this is unwarranted.
- The runtime code paths would accept an empty "packed-refs" file, such as
- "create_snapshot" would simply return the "snapshot" without checking
- the content of "packed-refs".
+ We assume the "packed-refs" won't be empty and instead has at least one
+ line in it (even when there are no refs packed, there is the file header
+ line). Because there is no terminating LF in the empty file, we will
+ report "packedRefEntryNotTerminated(ERROR)" to the user.

- And we should also skip checking the content of "packed-refs" when it is
- empty during fsck. However, we should think about whether we need to
- report something to the users in this case.
+ However, the runtime code paths would accept an empty "packed-refs"
+ file, for example, "create_snapshot" would simply return the "snapshot"
+ without checking the content of "packed-refs". So, we should skip
+ checking the content of "packed-refs" when it is empty during fsck.

After 694b7a1999 (repack_without_ref(): write peeled refs in the rewritten file, 2013-04-22), we would always write a header into the
- "packed-refs" file where we would never create empty file since then.
- Because we only create empty "packed-refs" in the very early versions,
- we may tighten this rule in the future. In order to notify the users
- about this, we should at least report an warning to the users.
+ "packed-refs" file. So, versions of Git that are not too ancient never
+ write such an empty "packed-refs" file.

- But we need to consider the fsck message type carefully, it is not
- appropriate that we use "FSCK_ERROR". This is because we would
- definitely break the compatibility. Let's create a "FSCK_INFO" message
- id EMPTY_PACKED_REFS_FILE" to indicate that "packed-refs" is empty.
+ As an empty file often indicates a sign of a filesystem-level issue, the
+ way we want to resolve this inconsistency is not make everybody totally
+ silent but notice and report the anomaly.
+
+ Let's create a "FSCK_INFO" message id "EMPTY_PACKED_REFS_FILE" to report
+ to the users that "packed-refs" is empty.

2:  1a5893379d = 2:  0d050849bc packed-backend: extract snapshot allocation in `load_contents`
3:  31e272db7e ! 3:  fe5ffec8fb packed-backend: mmap large "packed-refs" file during fsck

@@ Commit message
current codebase.

As we have introduced the helper function "allocate_snapshot_buffer", we
- could simple use this function to use mmap mechanism.
+ can simply use this function to use mmap mechanism.

Signature · 1 line
2.49.0