xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-23 01:53:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix deleted logs breaking partial buffer rebuild

Browse Source 
When the read_recent_text ran off a cliff looking for buffer data,
it left the current textfile handle in a bad state.  This caused
the buffer rebuild to fail completely in a scenario where all the
current logs put together don't have enough data to satisfy the
buffer.  Fix this by making the handle more obviously broken, and
repairing while seeking out data.
This commit is contained in:
Jarrod Johnson 2016-03-25 16:44:28 -04:00
parent 6504acecad
commit 2dd6c31513
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
confluent_server/confluent/log.py
View File

@ -625,6 +625,8 @@ class Logger(object):
binfile = open(binpath, mode='r')
textfile = open(textpath, mode='r')
except IOError:
binfile = None
textfile = None
break
flock(binfile, LOCK_SH)
flock(textfile, LOCK_SH)
@ -649,11 +651,15 @@ class Logger(object):
textdata = ''
while offsets:
(offset, length, textpath) = offsets.pop()
if textfile is None:
textfile = open(textpath, mode='r')
flock(textfile, LOCK_SH)
if textfile.name != textpath:
try:
flock(textfile, LOCK_UN)
textfile.close()
textfile = open(textpath, mode='r')
flock(textfile, LOCK_SH)
except (ValueError, IOError) as e:
break
try: