[Sugar-devel] [PATCH 7/7] datastore: handle low-disk and ENOSPC conditions gracefully
Martin Langhoff
martin at laptop.org
Fri Sep 21 17:47:00 EDT 2012
With this commit, the datastore comes up even on ENOSPC and very
tight disk conditions, and allows entry deletions even when at
ENOSPC.
- Be conservative
- ds or index flags are dirty -> rebuild
- less than 5MB available -> rebuild
- migrated or upgraded -> rebuild
- Only skip an index rebuild if things look very clean
and good. Skipping the index rebuild is an optimization.
- If a straight index open fails, we attempt a rebuild.
- Updating a partial index is unreliable, always rebuild
- When rebuilding the index, the new index is placed on a tmpdir
(on Fedora and OLPC builds, this is a tmpfs). It is only moved
to disk if we are not in low-disk-space-available conditions.
Signed-off-by: Martin Langhoff <martin at laptop.org>
---
This is v2 of the patch, making sure the move to internal disk
works in more cases, and that failure is recorded.
Thanks Sam for the report!
---
src/carquinyol/datastore.py | 89 +++++++++++++++++++++++++++++++++++--------
1 file changed, 73 insertions(+), 16 deletions(-)
diff --git a/src/carquinyol/datastore.py b/src/carquinyol/datastore.py
index 01d175e..a859dfe 100644
--- a/src/carquinyol/datastore.py
+++ b/src/carquinyol/datastore.py
@@ -23,6 +23,8 @@ import uuid
import time
import os
import shutil
+import subprocess
+import tempfile
import dbus
import dbus.service
@@ -44,6 +46,7 @@ DS_LOG_CHANNEL = 'org.laptop.sugar.DataStore'
DS_SERVICE = "org.laptop.sugar.DataStore"
DS_DBUS_INTERFACE = "org.laptop.sugar.DataStore"
DS_OBJECT_PATH = "/org/laptop/sugar/DataStore"
+MIN_INDEX_FREE_BYTES = 1024 * 1024 * 5
logger = logging.getLogger(DS_LOG_CHANNEL)
@@ -70,35 +73,53 @@ class DataStore(dbus.service.Object):
root_path = layoutmanager.get_instance().get_root_path()
self._cleanflag = os.path.join(root_path, 'ds_clean')
- if migrated:
+ if initiated:
+ logging.debug('Initiate datastore')
self._rebuild_index()
+ self._index_store.flush()
+ self._mark_clean()
return
- try:
- self._index_store.open_index()
- except Exception:
- logging.exception('Failed to open index, will rebuild')
+ if migrated:
self._rebuild_index()
+ self._mark_clean()
return
- if initiated:
- logging.debug('Initiate datastore')
- self._index_store.flush()
- elif not self._index_store.index_updated:
- logging.debug('Index is not up-to-date, will update')
- self._update_index()
+ rebuild = False
+ stat = os.statvfs(root_path)
+ da = stat.f_bavail * stat.f_bsize
+
+ if not self._index_store.index_updated:
+ logging.warn('Index is not up-to-date')
+ rebuild = True
elif not os.path.exists(self._cleanflag):
- logging.debug('DS state is not clean, will update')
- self._update_index()
- self._mark_clean()
+ logging.warn('DS state is not clean')
+ rebuild = True
+ elif da < MIN_INDEX_FREE_BYTES:
+ logging.warn('Disk space tight for index')
+ rebuild = True
+
+ if rebuild:
+ logging.warn('Trigger index rebuild')
+ self._rebuild_index()
+ else:
+ # fast path
+ try:
+ self._index_store.open_index()
+ except:
+ logging.exception('Failed to open index')
+ # try...
+ self._rebuild_index()
+ self._mark_clean()
+ return
def _mark_clean(self):
try:
f = open(self._cleanflag, 'w')
os.fsync(f.fileno())
f.close()
- except Exception:
+ except:
logging.exception("Could not mark the datastore clean")
def _mark_dirty(self):
@@ -135,8 +156,44 @@ class DataStore(dbus.service.Object):
"""Remove and recreate index."""
self._index_store.close_index()
self._index_store.remove_index()
- self._index_store.open_index()
+
+ # rebuild the index in tmpfs to better handle ENOSPC
+ temp_index_path = tempfile.mkdtemp(prefix='sugar-datastore-index-')
+ logger.warn('Rebuilding index in %s' % temp_index_path)
+ self._index_store.open_index(temp_path=temp_index_path)
self._update_index()
+ self._index_store.close_index()
+
+ on_disk=False
+
+ # can we fit the index on disk? get disk usage in bytes...
+ index_du = subprocess.check_output(['/usr/bin/du', '-bs',
+ temp_index_path])
+ index_du = int(index_du.split('\t')[0])
+ # disk available, in bytes
+ index_path = layoutmanager.get_instance().get_index_path()
+ stat = os.statvfs(index_path)
+ da = stat.f_bavail * stat.f_bsize
+ if da > (index_du * 1.2) and da > MIN_INDEX_FREE_BYTES: # 20% room for growth
+ logger.warn('Attempting to move tempfs index to disk')
+ # move to internal disk
+ try:
+ if os.path.exists(index_path):
+ shutil.rmtree(index_path)
+ shutil.copytree(temp_index_path, index_path)
+ shutil.rmtree(temp_index_path)
+ on_disk = True
+ except Exception as e:
+ logger.exception('Error copying tempfs index to disk,'
+ 'revert to using tempfs index.')
+ else:
+ logger.warn("Not enough disk space, using tempfs index")
+
+ if on_disk:
+ self._index_store.open_index()
+ else:
+ self._index_store.open_index(temp_path=temp_index_path)
+
def _update_index(self):
"""Find entries that are not yet in the index and add them."""
--
1.7.10.4
More information about the Sugar-devel
mailing list