openstack
/
os-loganalyze
Code Issues Proposed changes

Report object sizes from swift when writing index 

As with the reporting of file size for on disk files report the file
size for objects in swift.

Change-Id: Ife8e1a9c7b9b793aafc1e85648c24adeac3fca2a
This commit is contained in:
Clark Boylan 2015-10-07 13:20:57 -07:00
parent a9b91f6a05
commit aab3f8b234
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_loganalyze/generator.py
View File

@ -256,17 +256,17 @@ class IndexIterableBuffer(collections.Iterable):
delimiter='/')
for f in files:
size = sizeof_fmt(f.get('bytes', 0))
if 'subdir' in f:
fname = os.path.relpath(f['subdir'], self.logname)
fname = fname + '/' if f['subdir'][-1] == '/' else \
fname
else:
fname = os.path.relpath(f['name'], self.logname)
# TODO(clarkb) get size from swift and write it here.
file_set.add((
os.path.join('/', self.logname, fname),
fname,
"NA"
size
))
except Exception:
import traceback

18
os_loganalyze/tests/test_wsgi.py
View File

@ -106,7 +106,8 @@ def fake_get_container_factory(_swift_index_items=None):
if i[-1] == '/':
index_items.append({'subdir': os.path.join(prefix, i)})
else:
index_items.append({'name': os.path.join(prefix, i)})
index_items.append({'name': os.path.join(prefix, i),
'bytes': 4200})
elif _swift_index_items == []:
name = prefix[len('non-existent/'):]
p = os.path.join(base.samples_path('samples'), name)
@ -115,7 +116,8 @@ def fake_get_container_factory(_swift_index_items=None):
index_items.append(
{'subdir': os.path.join(prefix, i + '/')})
else:
index_items.append({'name': os.path.join(prefix, i)})
index_items.append({'name': os.path.join(prefix, i),
'bytes': 4200})
else:
# No swift container data.
pass
@ -416,12 +418,12 @@ class TestWsgiSwift(TestWsgiDisk):
self.assertEqual(
' <tr><td><a href="/non-existent/console.html.gz">'
'console.html.gz</a></td><td style="text-align: right">'
'NA</td></tr>',
'4.1KB</td></tr>',
full_lines[9])
self.assertEqual(
' <tr><td><a href="/non-existent/wsgi_plain.conf">'
'wsgi_plain.conf</a></td><td style="text-align: right">'
'NA</td></tr>',
'4.1KB</td></tr>',
full_lines[-5])
self.assertEqual('</html>', full_lines[-1])
@ -444,11 +446,11 @@ class TestWsgiSwift(TestWsgiDisk):
self.assertIn('samples/</title>', full_lines[3])
self.assertEqual(
' <tr><td><a href="/samples/a">a</a></td>'
'<td style="text-align: right">NA</td></tr>',
'<td style="text-align: right">4.1KB</td></tr>',
full_lines[9])
self.assertEqual(
' <tr><td><a href="/samples/b">b</a></td>'
'<td style="text-align: right">NA</td></tr>',
'<td style="text-align: right">4.1KB</td></tr>',
full_lines[11])
self.assertEqual(
' <tr><td><a href="/samples/console.html.gz">'
@ -457,7 +459,7 @@ class TestWsgiSwift(TestWsgiDisk):
full_lines[13])
self.assertEqual(
' <tr><td><a href="/samples/dir/">dir/</a></td>'
'<td style="text-align: right">NA</td></tr>',
'<td style="text-align: right">0.0B</td></tr>',
full_lines[17])
self.assertEqual(
' <tr><td><a href="/samples/wsgi_plain.conf">'
@ -466,6 +468,6 @@ class TestWsgiSwift(TestWsgiDisk):
full_lines[-7])
self.assertEqual(
' <tr><td><a href="/samples/z">z</a></td>'
'<td style="text-align: right">NA</td></tr>',
'<td style="text-align: right">4.1KB</td></tr>',
full_lines[-5])
self.assertEqual('</html>', full_lines[-1])