Fallback to file system if we fail to query the index

1 files changed, 11 insertions, 10 deletions

diff --git a/src/olpc/datastore/datastore.py b/src/olpc/datastore/datastore.py
index 76b771c..03b5930 100644
--- a/src/olpc/datastore/datastore.py
+++ b/src/olpc/datastore/datastore.py
@@ -191,16 +191,7 @@ class DataStore(dbus.service.Object):
         logging.debug('datastore.find %r' % query)
         t = time.time()
 
-        if not layoutmanager.get_instance().index_updated:
-            logging.warning('Index updating, returning all entries')
-
-            uids = layoutmanager.get_instance().find_all()
-            count = len(uids)
-
-            offset = query.get('offset', 0)
-            limit = query.get('limit', MAX_QUERY_LIMIT)
-            uids = uids[offset:offset + limit]
-        else:
+        if layoutmanager.get_instance().index_updated:
             try:
                 uids, count = self._index_store.find(query)
             except Exception:
@@ -212,6 +203,16 @@ class DataStore(dbus.service.Object):
                 self._index_store.open_index()
                 self._rebuild_index()
 
+        if not layoutmanager.get_instance().index_updated:
+            logging.warning('Index updating, returning all entries')
+
+            uids = layoutmanager.get_instance().find_all()
+            count = len(uids)
+
+            offset = query.get('offset', 0)
+            limit = query.get('limit', MAX_QUERY_LIMIT)
+            uids = uids[offset:offset + limit]
+
         entries = []
         for uid in uids:
             metadata = self._metadata_store.retrieve(uid, properties)