Mercurial > hgsubversion
view tests/fixtures/symlinks.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 | b3128fec5d54 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: bcc1a3f4-ccae-49ba-b1c5-003ce86e3e31 Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2008-12-15T21:58:13.685247Z PROPS-END Revision-number: 1 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 init project K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:13.747067Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 add symlinks K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:14.243223Z PROPS-END Node-path: trunk/a Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3 Text-content-sha1: 3f786850e387550fdab836ed7e6dc881de23001b Content-length: 12 PROPS-END a Node-path: trunk/d Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk/d/linka Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: c118dba188202a1efc975bef6064180b Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Content-length: 39 K 11 svn:special V 1 * PROPS-END link a Node-path: trunk/linka Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: c118dba188202a1efc975bef6064180b Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Content-length: 39 K 11 svn:special V 1 * PROPS-END link a Node-path: trunk/linka2 Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 6 Text-content-md5: c118dba188202a1efc975bef6064180b Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Content-length: 39 K 11 svn:special V 1 * PROPS-END link a Revision-number: 3 Prop-content-length: 117 Content-length: 117 K 7 svn:log V 15 moving symlinks K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:17.162148Z PROPS-END Node-path: trunk/d2 Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/d Prop-content-length: 34 Content-length: 34 K 13 svn:mergeinfo V 0 PROPS-END Node-path: trunk/linkaa Node-kind: file Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk/linka Text-copy-source-md5: c118dba188202a1efc975bef6064180b Text-copy-source-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Prop-content-length: 57 Content-length: 57 K 11 svn:special V 1 * K 13 svn:mergeinfo V 0 PROPS-END Node-path: trunk/linka Node-action: delete Node-path: trunk/d Node-action: delete Revision-number: 4 Prop-content-length: 117 Content-length: 117 K 7 svn:log V 15 update symlinks K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:18.188491Z PROPS-END Node-path: trunk/d2/linka Node-kind: file Node-action: change Text-content-length: 6 Text-content-md5: e9292b8c4fca95ac8c70b4ae040d0b79 Text-content-sha1: 7325442a5f7383205e66db563025d51535883784 Content-length: 6 link b Node-path: trunk/linkaa Node-kind: file Node-action: change Text-content-length: 6 Text-content-md5: e9292b8c4fca95ac8c70b4ae040d0b79 Text-content-sha1: 7325442a5f7383205e66db563025d51535883784 Content-length: 6 link b Revision-number: 5 Prop-content-length: 110 Content-length: 110 K 7 svn:log V 9 undo link K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-12-15T21:58:19.297689Z PROPS-END Node-path: trunk/d2/linka Node-action: delete Node-path: trunk/linka2 Node-kind: file Node-action: replace Prop-content-length: 10 Text-content-length: 6 Text-content-md5: edc3d3797971f12c7f5e1d106dd5cee2 Text-content-sha1: eff1098d818d1f471af4a2cbdb0223e4e030a158 Content-length: 16 PROPS-END data2 Node-path: trunk/linkaa Node-kind: file Node-action: change Prop-content-length: 34 Text-content-length: 5 Text-content-md5: 6137cde4893c59f76f005a8123d8e8e6 Text-content-sha1: c5d84736ba451747dd5f0eb9d17e104f3697ef47 Content-length: 39 K 13 svn:mergeinfo V 0 PROPS-END data Revision-number: 6 Prop-content-length: 116 Content-length: 116 K 7 svn:log V 15 recreate a link K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-11-08T14:57:19.667088Z PROPS-END Node-path: trunk/linka3 Node-kind: file Node-action: add Prop-content-length: 59 Text-content-length: 6 Text-content-md5: c118dba188202a1efc975bef6064180b Text-content-sha1: 41f94e4692313bf7f7c92aa600002f1dff93d6bf Content-length: 65 K 11 svn:special V 1 * K 14 svn:needs-lock V 1 * PROPS-END link a Revision-number: 7 Prop-content-length: 128 Content-length: 128 K 7 svn:log V 27 delete property from a link K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-11-08T14:57:40.331635Z PROPS-END Node-path: trunk/linka3 Node-kind: file Node-action: change Prop-content-length: 33 Content-length: 33 K 11 svn:special V 1 * PROPS-END Revision-number: 8 Prop-content-length: 145 Content-length: 145 K 7 svn:log V 44 add an uglily named file and a symlink to it K 10 svn:author V 6 danchr K 8 svn:date V 27 2010-11-08T15:11:12.267958Z PROPS-END Node-path: trunk/link to this Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 0 Text-content-md5: d41d8cd98f00b204e9800998ecf8427e Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 Content-length: 10 PROPS-END Node-path: trunk/linka4 Node-kind: file Node-action: add Prop-content-length: 33 Text-content-length: 17 Text-content-md5: aecd1324085a1fc5b7aa8950f92dcfb9 Text-content-sha1: d22de0907c0b1878b057c873092e82fd9c50849b Content-length: 50 K 11 svn:special V 1 * PROPS-END link link to this