Re: [PATCH v2 1/1] git-p4: Add --checkpoint-period option to sync/clone
On Fri, Sep 16, 2016 at 11:19 AM, Lars Schneiderwrote: > > > This looks interesting! I ran into the same issue and added a parameter to > the p4 commands to retry (patch not yet proposed to the mailing list): > https://github.com/autodesk-forks/git/commit/fcfc96a7814935ee6cefb9d69e44def30a90eabb I was unaware of the retry flag to the p4 command, that seems like a useful trick too. I think both approaches might pair nicely together (p4 optimistically retrying, but still falling back to the latest git checkpoint if we exhaust our N retry attempts). > Would it make sense to print the "git-p4 resume command" in case an error > happens and checkpoints are written? I was thinking something like this would be a good idea and would certainly aide in usability. Resuming a sync is fairly straight-forward (just re-execute the same command). Resuming a clone is a bit more problematic, today if a depot path argument is provided to the sync or clone command (and it is always required for clone), no attempt is made to examine the existing git branches and limit to only Perforce changes missing from git. There is a lingering TODO in the script where we check the presence of the depot path argument, with a suggestion that we should always make an attempt to continue building upon existing history when it is available. I think there might be a few edge cases around this behavior that I'd need to think through. But, if I'm able to address the TODO, then printing the command to resume the import should be pretty straight-forward. I'll continue working on that next week.
Re: [PATCH v2 1/1] git-p4: Add --checkpoint-period option to sync/clone
> On 15 Sep 2016, at 23:17, Ori Rawlingswrote: > > Importing a long history from Perforce into git using the git-p4 tool > can be especially challenging. The `git p4 clone` operation is based > on an all-or-nothing transactionality guarantee. Under real-world > conditions like network unreliability or a busy Perforce server, > `git p4 clone` and `git p4 sync` operations can easily fail, forcing a > user to restart the import process from the beginning. The longer the > history being imported, the more likely a fault occurs during the > process. Long enough imports thus become statistically unlikely to ever > succeed. > > The underlying git fast-import protocol supports an explicit checkpoint > command. The idea here is to optionally allow the user to force an > explicit checkpoint every seconds. If the sync/clone operation fails > branches are left updated at the appropriate commit available during the > latest checkpoint. This allows a user to resume importing Perforce > history while only having to repeat at most approximately seconds > worth of import activity. This looks interesting! I ran into the same issue and added a parameter to the p4 commands to retry (patch not yet proposed to the mailing list): https://github.com/autodesk-forks/git/commit/fcfc96a7814935ee6cefb9d69e44def30a90eabb Would it make sense to print the "git-p4 resume command" in case an error happens and checkpoints are written? Cheers, Lars