Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix problem creating ZIP archive with lots of entries #2006

Merged
merged 2 commits into from
May 5, 2023

Conversation

smithdh
Copy link
Contributor

@smithdh smithdh commented May 4, 2023

Intended to fix #2004. Initially in draft.

@amadio amadio requested a review from abh3 May 4, 2023 15:24
@amadio amadio added this to the v5.5.5 milestone May 4, 2023
@smithdh smithdh force-pushed the issue-2004 branch 3 times, most recently from a404f53 to 1ebf100 Compare May 4, 2023 19:55
@abh3
Copy link
Member

abh3 commented May 4, 2023

Let me know when this is ready for review.

@smithdh smithdh force-pushed the issue-2004 branch 2 times, most recently from 053e26a to 9b2df93 Compare May 4, 2023 20:42
@smithdh
Copy link
Contributor Author

smithdh commented May 4, 2023

Thanks Andy. I'd been making some last changes; but it's ready, I'll move it out of draft now, so it could be reviewed. I expect depending on the feedback we can consider this, or not, for including in 5.5.5 (since that's targeted for tagging tomorrow).

@smithdh smithdh marked this pull request as ready for review May 4, 2023 20:49
Copy link
Member

@abh3 abh3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see anything wrong here. The question is does this use checkpointing? If so, perhaps one needs to enable checkpointing on the server and see if another problem crops up, The checkpointing allows additions to the zip archive in-place.

@abh3
Copy link
Member

abh3 commented May 5, 2023

Oh yes. while I didn't specifically approve, I am OK if you feel that my comment is not applicable. Just ask Guilherme to merge it.

@smithdh
Copy link
Contributor Author

smithdh commented May 5, 2023

(I just made a force-push, only changed a typo in code comment).

Thank you. I just checked that it does appear to work on a server with checkpointing enabled (in the no error case); infact appending against an existing archive fails against a server without checkpointing enabled. But, following on from your comment, we could verify more. e.g. that the checkpointing is giving the protection we want: keeping the archive valid if there's a problem during addition of files (I saw we don't use the kXR_ckpXeq->kXR_write sequenced version of write during CloseArchive and I'm not sure if that will properly preserve integrity if the checkpoint changes are discarded; and I didn't try to change that in this PR).

I'll suggest to Guilherme to merge, so we can address #2004 now.

@abh3
Copy link
Member

abh3 commented May 5, 2023 via email

@amadio amadio merged commit ba9a395 into xrootd:master May 5, 2023
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Trouble creating a ZIP archive with lots of entries
3 participants