Mercurial > hgsubversion
view tests/fixtures/replace_branch_with_branch.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 | 2723152c8111 |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: 6c4a9db2-8b38-4988-bc82-df1f3bb0afcd Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2010-03-01T23:13:19.505202Z PROPS-END Revision-number: 1 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 7 initial K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:20.066689Z 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 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 Revision-number: 2 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 7 branch1 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:23.056920Z PROPS-END Node-path: branches/branch1 Node-kind: dir Node-action: add Node-copyfrom-rev: 1 Node-copyfrom-path: trunk Revision-number: 3 Prop-content-length: 118 Content-length: 118 K 7 svn:log V 16 add b to branch1 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:25.099593Z PROPS-END Node-path: branches/branch1/b Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 3b5d5c3712955042212316173ccf37be Text-content-sha1: 89e6c98d92887913cadf06b2adb97f26cde4849b Content-length: 12 PROPS-END b Node-path: branches/branch1/d Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: e29311f6f1bf1af907f9ef9f44b8328b Text-content-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff Content-length: 12 PROPS-END d Node-path: branches/branch1/dir Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: branches/branch1/dir/e Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 9ffbf43126e33be52cd2bf7e01d627f9 Text-content-sha1: 094e3afb2fe8dfe82f63731cdcd3b999f4856cff Content-length: 12 PROPS-END e Node-path: branches/branch1/f Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 9a8ad92c50cae39aa2c5604fd0ab6d8c Text-content-sha1: a9fcd54b25e7e863d72cd47c08af46e61b74b561 Content-length: 12 PROPS-END f Node-path: branches/branch1/g Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: f5302386464f953ed581edac03556e55 Text-content-sha1: a5938ace3f424be1a26904781cdb06d55b614e6b Content-length: 12 PROPS-END g Revision-number: 4 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 7 branch2 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:27.051018Z PROPS-END Node-path: branches/branch2 Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: trunk Revision-number: 5 Prop-content-length: 118 Content-length: 118 K 7 svn:log V 16 add c to branch2 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2010-03-01T23:13:29.108780Z PROPS-END Node-path: branches/branch2/c Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 2cd6ee2c70b0bde53fbe6cac3c8b8bb1 Text-content-sha1: 2b66fd261ee5c6cfc8de7fa466bab600bcfe4f69 Content-length: 12 PROPS-END c Node-path: branches/branch2/dir Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: branches/branch2/dir/e Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 3 Text-content-md5: c18e1214a2500c0c3636092222f8a850 Text-content-sha1: 4a078b075f259063b9a730521378f70ec3223238 Content-length: 13 PROPS-END e2 Node-path: branches/branch2/f Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 3 Text-content-md5: 575c5638d60271457e54ab7d07309502 Text-content-sha1: 1c49a440c352f3473efa9512255033b94dc7def0 Content-length: 13 PROPS-END f2 Revision-number: 6 Prop-content-length: 102 Content-length: 102 K 7 svn:log V 4 blah K 10 svn:author V 4 evil K 8 svn:date V 27 2010-03-01T23:13:31.520483Z PROPS-END Node-path: branches/branch1 Node-kind: dir Node-action: delete Node-path: branches/branch1 Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch2 Node-path: branches/branch1/a Node-kind: file Node-action: delete Node-path: branches/branch1/a Node-kind: file Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/d Text-copy-source-md5: e29311f6f1bf1af907f9ef9f44b8328b Text-copy-source-sha1: e983f374794de9c64e3d1c1de1d490c0756eeeff Node-path: branches/branch1/dir Node-kind: dir Node-action: delete Node-path: branches/branch1/dir Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/dir Node-path: branches/branch1/dir2 Node-kind: dir Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/dir Node-path: branches/branch1/f Node-kind: file Node-action: delete Node-path: branches/branch1/f Node-kind: file Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/f Text-copy-source-md5: 9a8ad92c50cae39aa2c5604fd0ab6d8c Text-copy-source-sha1: a9fcd54b25e7e863d72cd47c08af46e61b74b561 Node-path: branches/branch1/g Node-kind: file Node-action: add Node-copyfrom-rev: 5 Node-copyfrom-path: branches/branch1/g Text-copy-source-md5: f5302386464f953ed581edac03556e55 Text-copy-source-sha1: a5938ace3f424be1a26904781cdb06d55b614e6b