0

world: retry chunk read on OSError too

Closes #1790.

If a chunk fails reading due to an underlying operating system
IO error, we can invoke the retry logic too. No clue what could
cause this to happen beyond hardware faults.

Also lower the sleep time to 0.25s down from 0.5s because half a
second of sleeping for each chunk this happens on seems incredibly
overkill.

Making the nbt code raise a CorruptChunkError in this case also means
that failing to read a chunk due to an IOError is not a fatal error
anymore, it'll simply skip it and move on.
This commit is contained in:
Nicolas F
2020-06-25 15:30:54 +02:00
parent c53268e8fe
commit 1355f8c49e
2 changed files with 8 additions and 6 deletions

View File

@@ -1355,12 +1355,11 @@ class RegionSet(object):
except nbt.CorruptionError as e:
tries -= 1
if tries > 0:
# Flush the region cache to possibly read a new region file
# header
logging.debug("Encountered a corrupt chunk at %s,%s. Flushing cache and retrying", x, z)
#logging.debug("Error was:", exc_info=1)
# Flush the region cache to possibly read a new region file header
logging.debug("Encountered a corrupt chunk or read error at %s,%s. "
"Flushing cache and retrying", x, z)
del self.regioncache[regionfile]
time.sleep(0.5)
time.sleep(0.25)
continue
else:
logging.warning("The following was encountered while reading from %s:", self.regiondir)