This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1447

basepack: fix _getavailablepackfiles sizes
ClosedPublic

Authored by phillco on Nov 17 2017, 6:02 PM.
Tags
None
Subscribers
singhsrb

Details

Reviewers
quark
singhsrb
Group Reviewers
Restricted Project
Commits
rFBHGX9ad311f5e369: basepack: fix _getavailablepackfiles sizes
Summary

osutil.listdir yields (filename, type, stat), not (filename, size, stat), so we
need to look at the stat.st_size value to get the size. (Previously, we were
summing the file type codes :/)

This should fix packfile metrics.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Nov 17 2017, 6:02 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 17 2017, 6:02 PM
quark accepted this revision.Nov 17 2017, 6:08 PM
This revision is now accepted and ready to land.Nov 17 2017, 6:08 PM
singhsrb accepted this revision.Nov 17 2017, 6:09 PM
singhsrb added a subscriber: singhsrb.

Totally missed that in the review. Sorry about that!

Revision Contents
Changeset List

PathPackages
Mremotefilelog/basepack.py (4 lines)

Diff 3622

remotefilelog/basepack.py

""" """
indexsuffixlen = len(self.INDEXSUFFIX) indexsuffixlen = len(self.INDEXSUFFIX)
packsuffixlen = len(self.PACKSUFFIX) packsuffixlen = len(self.PACKSUFFIX)
ids = set() ids = set()
sizes = defaultdict(lambda: 0) sizes = defaultdict(lambda: 0)
mtimes = defaultdict(lambda: []) mtimes = defaultdict(lambda: [])
try: try:
for filename, size, stat in osutil.listdir(self.path, stat=True): for filename, type, stat in osutil.listdir(self.path, stat=True):
id = None id = None
if filename[-indexsuffixlen:] == self.INDEXSUFFIX: if filename[-indexsuffixlen:] == self.INDEXSUFFIX:
id = filename[:-indexsuffixlen] id = filename[:-indexsuffixlen]
elif filename[-packsuffixlen:] == self.PACKSUFFIX: elif filename[-packsuffixlen:] == self.PACKSUFFIX:
id = filename[:-packsuffixlen] id = filename[:-packsuffixlen]
# Since we expect to have two files corresponding to each ID # Since we expect to have two files corresponding to each ID
# (the index file and the pack file), we can yield once we see # (the index file and the pack file), we can yield once we see
# it twice. # it twice.
if id: if id:
sizes[id] += size # Sum both files' sizes together sizes[id] += stat.st_size # Sum both files' sizes together
mtimes[id].append(stat.st_mtime) mtimes[id].append(stat.st_mtime)
if id in ids: if id in ids:
yield (os.path.join(self.path, id), max(mtimes[id]), yield (os.path.join(self.path, id), max(mtimes[id]),
sizes[id]) sizes[id])
else: else:
ids.add(id) ids.add(id)
except OSError as ex: except OSError as ex:
if ex.errno != errno.ENOENT: if ex.errno != errno.ENOENT: