This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5386

remotefilelog: rely on progress helper for keeping track of position
ClosedPublic

Authored by martinvonz on Dec 5 2018, 12:40 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG74e3df766052: remotefilelog: rely on progress helper for keeping track of position
Summary

The progress helper class keeps track of its current position, so we
don't need a "count" variable for that.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 5 2018, 12:40 PM
Closed by commit rHG74e3df766052: remotefilelog: rely on progress helper for keeping track of position (authored by martinvonz). · Explain WhyDec 6 2018, 6:41 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 12747

hgext/remotefilelog/fileserverclient.py

idmap[fullid] = file idmap[fullid] = file
cache.request(request) cache.request(request)
progress = self.ui.makeprogress(_('downloading'), total=total) progress = self.ui.makeprogress(_('downloading'), total=total)
progress.update(0) progress.update(0)
missed = [] missed = []
count = 0
while True: while True:
missingid = cache.receiveline() missingid = cache.receiveline()
if not missingid: if not missingid:
missedset = set(missed) missedset = set(missed)
for missingid in idmap: for missingid in idmap:
if not missingid in missedset: if not missingid in missedset:
missed.append(missingid) missed.append(missingid)
self.ui.warn(_("warning: cache connection closed early - " + self.ui.warn(_("warning: cache connection closed early - " +
"falling back to server\n")) "falling back to server\n"))
break break
if missingid == "0": if missingid == "0":
break break
if missingid.startswith("_hits_"): if missingid.startswith("_hits_"):
# receive progress reports # receive progress reports
parts = missingid.split("_") parts = missingid.split("_")
count += int(parts[2]) progress.increment(int(parts[2]))
progress.update(count)
continue continue
missed.append(missingid) missed.append(missingid)
global fetchmisses global fetchmisses
fetchmisses += len(missed) fetchmisses += len(missed)
fromcache = total - len(missed) fromcache = total - len(missed)
count = [fromcache]
progress.update(fromcache, total=total) progress.update(fromcache, total=total)
self.ui.log("remotefilelog", "remote cache hit rate is %r of %r\n", self.ui.log("remotefilelog", "remote cache hit rate is %r of %r\n",
fromcache, total, hit=fromcache, total=total) fromcache, total, hit=fromcache, total=total)
oldumask = os.umask(0o002) oldumask = os.umask(0o002)
try: try:
# receive cache misses from master # receive cache misses from master
if missed: if missed:
def progresstick():
count[0] += 1
progress.update(count[0])
# When verbose is true, sshpeer prints 'running ssh...' # When verbose is true, sshpeer prints 'running ssh...'
# to stdout, which can interfere with some command # to stdout, which can interfere with some command
# outputs # outputs
verbose = self.ui.verbose verbose = self.ui.verbose
self.ui.verbose = False self.ui.verbose = False
try: try:
with self._connect() as conn: with self._connect() as conn:
remote = conn.peer remote = conn.peer
if remote.capable( if remote.capable(
constants.NETWORK_CAP_LEGACY_SSH_GETFILES): constants.NETWORK_CAP_LEGACY_SSH_GETFILES):
if not isinstance(remote, _sshv1peer): if not isinstance(remote, _sshv1peer):
raise error.Abort('remotefilelog requires ssh ' raise error.Abort('remotefilelog requires ssh '
'servers') 'servers')
step = self.ui.configint('remotefilelog', step = self.ui.configint('remotefilelog',
'getfilesstep') 'getfilesstep')
getfilestype = self.ui.config('remotefilelog', getfilestype = self.ui.config('remotefilelog',
'getfilestype') 'getfilestype')
if getfilestype == 'threaded': if getfilestype == 'threaded':
_getfiles = _getfiles_threaded _getfiles = _getfiles_threaded
else: else:
_getfiles = _getfiles_optimistic _getfiles = _getfiles_optimistic
_getfiles(remote, self.receivemissing, progresstick, _getfiles(remote, self.receivemissing,
missed, idmap, step) progress.increment, missed, idmap, step)
elif remote.capable("x_rfl_getfile"): elif remote.capable("x_rfl_getfile"):
if remote.capable('batch'): if remote.capable('batch'):
batchdefault = 100 batchdefault = 100
else: else:
batchdefault = 10 batchdefault = 10
batchsize = self.ui.configint( batchsize = self.ui.configint(
'remotefilelog', 'batchsize', batchdefault) 'remotefilelog', 'batchsize', batchdefault)
_getfilesbatch( _getfilesbatch(
remote, self.receivemissing, progresstick, remote, self.receivemissing, progress.increment,
missed, idmap, batchsize) missed, idmap, batchsize)
else: else:
raise error.Abort("configured remotefilelog server" raise error.Abort("configured remotefilelog server"
" does not support remotefilelog") " does not support remotefilelog")
self.ui.log("remotefilefetchlog", self.ui.log("remotefilefetchlog",
"Success\n", "Success\n",
fetched_files = count[0] - fromcache, fetched_files = progress.pos - fromcache,
total_to_fetch = total - fromcache) total_to_fetch = total - fromcache)
except Exception: except Exception:
self.ui.log("remotefilefetchlog", self.ui.log("remotefilefetchlog",
"Fail\n", "Fail\n",
fetched_files = count[0] - fromcache, fetched_files = progress.pos - fromcache,
total_to_fetch = total - fromcache) total_to_fetch = total - fromcache)
raise raise
finally: finally:
self.ui.verbose = verbose self.ui.verbose = verbose
# send to memcache # send to memcache
request = "set\n%d\n%s\n" % (len(missed), "\n".join(missed)) request = "set\n%d\n%s\n" % (len(missed), "\n".join(missed))
cache.request(request) cache.request(request)