Mercurial > public > mercurial-scm > hg
comparison mercurial/streamclone.py @ 29917:f32f8bf5dc4c
streamclone: force @filecache properties to be reloaded from file
Before this patch, consumev1() invokes repo.invalidate() after closing
transaction, to force @filecache properties to be reloaded from files
at next access, because streamclone writes data into files directly.
But this doesn't work as expected in the case below:
1. at closing transaction, repo._refreshfilecachestats() refreshes
file stat of each @filecache properties with streamclone-ed files
This means that in-memory properties are treated as valid.
2. but streamclone doesn't changes in-memory properties
This means that in-memory properties are actually invalid.
3. repo.invalidate() just forces to examine file stat of @filecache
properties at the first access after it
Such examination should concludes that reloading from file isn't
needed, because file stat was already refreshed at (1).
Therefore, invalid in-memory cached properties (2) are
unintentionally treated as valid (1).
This patch invokes repo.invalidate() with clearfilecache=True, to
force @filecache properties to be reloaded from file at next access.
BTW, it is accidental that repo.invalidate() without
clearfilecache=True in streamclone case seems to work as expected
before this patch.
If transaction is started via "filtered repo" object,
repo._refreshfilecachestats() tries to refresh file stat of each
@filecache properties on "filtered repo" object, even though all of
them are stored into "unfiltered repo" object.
In this case, repo._refreshfilecachestats() does nothing
unintentionally, but this unexpected behavior causes reloading
@filecache properties after repo.invalidate().
This is reason why this patch should be applied before making
_refreshfilecachestats() correctly refresh file stat of @filecache
properties.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Mon, 12 Sep 2016 03:06:28 +0900 |
parents | ed75909c4c67 |
children | 519a02267f90 |
comparison
equal
deleted
inserted
replaced
29916:8a658b8b795a | 29917:f32f8bf5dc4c |
---|---|
321 repo.ui.progress(_('clone'), handled_bytes, | 321 repo.ui.progress(_('clone'), handled_bytes, |
322 total=bytecount, unit=_('bytes')) | 322 total=bytecount, unit=_('bytes')) |
323 ofp.write(chunk) | 323 ofp.write(chunk) |
324 | 324 |
325 # Writing straight to files circumvented the inmemory caches | 325 # Writing straight to files circumvented the inmemory caches |
326 repo.invalidate() | 326 repo.invalidate(clearfilecache=True) |
327 | 327 |
328 elapsed = time.time() - start | 328 elapsed = time.time() - start |
329 if elapsed <= 0: | 329 if elapsed <= 0: |
330 elapsed = 0.001 | 330 elapsed = 0.001 |
331 repo.ui.progress(_('clone'), None) | 331 repo.ui.progress(_('clone'), None) |