Skip to content

Commit ad01ac1

Browse files
johncbowmanLIM Coding Assistant
andcommitted
hlink: re-root a hard-link group whose root is in a released file list
Address the review comment on commit 350425a (#1144): "This will still abort when the hard-link group spans incremental file-list chunks. Re-root the group without retaining released file-list indices." When a group spans chunks, a member's F_HL_PREV can point into a file-list that is released before the member's finish_hard_link() walks the completion chain, and the fatal flist_for_ndx() call aborts the transfer. Two changes in finish_hard_link(): 1. The completion-chain lookup now uses the graceful (NULL) variant of flist_for_ndx() and stops the walk when an index is no longer in a live file-list. The chain only moves to earlier ndx values, so once one is released, everything further back is already finished and there is nothing left to re-link. No live file retains a released index: the finishing file's F_HL_PREV is reset on entry, and each walked member's F_HL_PREV is pointed at the finishing file. 2. A duplicate finish (the group already recorded as finished at some path) now re-roots the group at the newly finished file instead of keeping the recorded path. A duplicate finish only happens when the recorded root could not be hard-linked (e.g. EMLINK, EXDEV) and that member was written as a regular file, so that member's inode is the only one the group can still link to; later members then link to this live file instead of the stale root. The abort is reproducible locally with a small chunk-spanning fixture whose first file-list is under MIN_FILECNT_LOOKAHEAD/2, both on the series base 8718cd2 and with only commit 350425a applied: the hard-link lookahead at the top of generate_files() then matches the extra file-list before the group leader is itemized, so the members' F_HL_PREV pointers into the leader's file-list survive the match, and the fatal lookup aborts deterministically: "File-list index 3 not in 11 - 13 (finish_hard_link)" with "protocol incompatibility" (code 2). With this commit the same run completes with rc 23 and the group re-rooted on a fresh inode; a simulated WAN delay for the last member gives the identical abort/fix behavior (fixture and full evidence in the description of #1144). Also verified: a 1200-file chunk-spanning EMLINK fixture with the destination inode pinned at the ext4 65000-link cap completes in 0.2 s with rc 23 and the group re-rooted on a fresh inode; the single-flist EMLINK fixture takes 0.15 s, rc 23, all 101 members on one fresh inode; the hard-link regression tree is all rc 0 with no spurious output; the upstream hardlink/link-dest/keep-dirlinks suite (9 tests) passes. Co-authored-by: LIM Coding Assistant <298007100+statefullm@users.noreply.github.com>
1 parent 350425a commit ad01ac1

1 file changed

Lines changed: 19 additions & 10 deletions

File tree

‎hlink.c‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,15 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
528528

529529
while ((ndx = prev_ndx) >= 0) {
530530
int val;
531-
flist = flist_for_ndx(ndx, "finish_hard_link");
531+
flist = flist_for_ndx(ndx, NULL);
532+
if (!flist) {
533+
/* The group can span file-lists, and the list holding an
534+
* earlier member may have been released by the time this
535+
* finish runs. The chain only moves to earlier ndx
536+
* values, so everything from here on is already finished
537+
* and there is nothing left to re-link. */
538+
break;
539+
}
532540
file = flist->files[ndx - flist->ndx_start];
533541
file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
534542
prev_ndx = F_HL_PREV(file);
@@ -559,16 +567,17 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
559567
exit_cleanup(RERR_MESSAGEIO);
560568
}
561569
if (CVAL(node->data, 0) != 0) {
562-
/* A finished leader was already recorded for this group.
563-
* This can happen when an earlier member of the group failed
564-
* to hard-link (e.g. EMLINK or EXDEV) and was written as a
565-
* regular file, then finished. Keep the original leader's
566-
* path and tolerate the duplicate finish instead of aborting
567-
* the whole transfer. (Upstream: RsyncProject/rsync#741.) */
570+
/* An earlier member of this group already finished and
571+
* recorded its path as the group's root. That member
572+
* could not be hard-linked to the original root (e.g.
573+
* EMLINK or EXDEV), so it was written as a regular
574+
* file: it, not the stale root, is the only inode this
575+
* group can still link to. Re-root the group here so
576+
* that later members link to this live file.
577+
* (Upstream: RsyncProject/rsync#741.) */
568578
rprintf(FINFO,
569-
"hlink: group %d already finished at path=%s (%s); ignoring duplicate finish\n",
570-
gnum, (char*)node->data, f_name(file, prev_name));
571-
return;
579+
"hlink: group %d already finished at %s; re-rooting at %s (%s)\n",
580+
gnum, (char*)node->data, our_name, f_name(file, prev_name));
572581
}
573582
free(node->data);
574583
node->data = strdup(our_name);

0 commit comments

Comments
 (0)