Mercurial > hgsubversion
view tests/fixtures/move_into_trunk.svndump @ 1233:0d0132cba155
editor: fix edge case with in memory file-store size limit
There are a few cases where we will set a single file into to the
editor's FileStore object more than once. Notably, for copied and
then modified files, we will set it at least twice. Three times if
editing fails (which it can for symlinks).
If we pass the in-memory storage limit in between the first (or second
if editing fails) time we set the file and the last time we set the
file, we will write the data to the in memory store the first time and
the file store the last time. We didn't remove it form the in-memory
store though, and we always prefer reading from the in-memory store.
This means we can sometimes end up with the wrong version of a file.
This is fairly unlikely to happen in normal use since you need to hit
the memory limit between two writes to the store for the same file.
We only write a file multiple times if a) the file (and not one of
it's parent directories) is copied and then modified or b) editing
fails. From what I can tell, it's only common for editing to fail for
symlinks, and they ten to be relatively small data that is unlikely to
push over the limit. Finally, the default limit is 100MB which I
would expect to be most often either well over (source code) or well
under (binaries or automated changes) the size of the changes files in
a single commit.
The easiest way to reproduce this is to set the in-memory cache size
to 0 and then commit a copied and modified symlink. The empty-string
version from the failed editing will be the one that persists. I
happened to stumble upon this while trying (and failing) to test a
bug-fix for a related bug with identical symptoms (empty simlink). I
have seen this in the wild, once, but couldn't reproduce it at the
time. The repo in question is quite large and quite active, so I am
quite confident in my estimation that this is a real, but very rare,
problem.
The test changes attached to this was mneant to test a related bug,
but turned out not to actually cover the bug in question. They did
trigger this bug though, and are worthwhile to test, so I kept them.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Mon, 07 Apr 2014 17:51:59 -0700 |
parents | 1086bd6f6aa4 |
children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 124c25c6-3b41-4c6b-a3a3-a0c9809dc9cb Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-08-14T19:08:00.090868Z PROPS-END Revision-number: 1 Prop-content-length: 111 Content-length: 111 K 7 svn:log V 10 Add files. K 10 svn:author V 9 anonymous K 8 svn:date V 27 2010-08-14T19:09:04.290181Z PROPS-END Node-path: A Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 16 Text-content-md5: 98475036dc73d318982805bf4b16e8b2 Text-content-sha1: d7dff2b1ef48b9c20c23d7b3a08b557957cec3c9 Content-length: 26 PROPS-END This is a file. Node-path: B Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 22 Text-content-md5: d54ff73404ed6041a3bd66850b061bff Text-content-sha1: 4bdb40dfd6ec75cb730e678b5d7786e30170c5fb Content-length: 32 PROPS-END This is another file. Revision-number: 2 Prop-content-length: 111 Content-length: 111 K 7 svn:log V 10 Add trunk. K 10 svn:author V 9 anonymous K 8 svn:date V 27 2010-08-14T19:09:23.652445Z PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 3 Prop-content-length: 113 Content-length: 113 K 7 svn:log V 12 Move a file. K 10 svn:author V 9 anonymous K 8 svn:date V 27 2010-08-14T19:09:33.945291Z PROPS-END Node-path: trunk/A Node-kind: file Node-action: add Node-copyfrom-rev: 1 Node-copyfrom-path: A Text-copy-source-md5: 98475036dc73d318982805bf4b16e8b2 Text-copy-source-sha1: d7dff2b1ef48b9c20c23d7b3a08b557957cec3c9 Node-path: A Node-action: delete Revision-number: 4 Prop-content-length: 122 Content-length: 122 K 7 svn:log V 18 Move another file. K 10 svn:author V 9 anonymous K 8 svn:date V 27 2010-08-14T19:10:03.135714Z PROPS-END Node-path: trunk/B Node-kind: file Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: B Text-copy-source-md5: d54ff73404ed6041a3bd66850b061bff Text-copy-source-sha1: 4bdb40dfd6ec75cb730e678b5d7786e30170c5fb Node-path: B Node-action: delete