Merge pull request #421 from pigmej/fix-gevent-errors

Fixed gevent related test failures

solar/dblayer/model.py

@@ -181,16 +181,17 @@ def _inner2(obj, *args, **kwargs):
 
 
 def check_state_for(_type, obj):
-    state = obj._c.db_ch_state.get(_type)
-    if state:
-        if True:
-            # TODO: solve it
-            obj.save_all_lazy()
-            state = obj._c.db_ch_state.get(_type)
-            if not state:
-                return
-        raise Exception("Dirty state, save all %r objects first" %
-                        obj.__class__)
+    with obj._lock:
+        state = obj._c.db_ch_state.get(_type)
+        if state:
+            if True:
+                # TODO: solve it
+                obj.save_all_lazy()
+                state = obj._c.db_ch_state.get(_type)
+                if not state:
+                    return
+            raise Exception("Dirty state, save all %r objects first" %
+                            obj.__class__)
 
 
 @total_ordering
@@ -731,6 +732,8 @@ class Model(object):
 
     _local = get_local()()
 
+    _lock = RLock()  # for class objs
+
     def __init__(self, key=None):
         self._modified_fields = set()
         # TODO: that _indexes_changed should be smarter
@@ -853,9 +856,13 @@ def from_dict(cls, key, data=None):
             raise DBLayerException("Object already exists in cache"
                                    " cannot create second")
         data['key'] = key
-        riak_obj = cls.bucket.new(key, data={})
-        obj = cls.from_riakobj(riak_obj)
-        obj._new = True
+
+        with cls._c.obj_cache._lock:
+            if key in cls._c.obj_cache:
+                return cls._c.obj_cache.get(key)
+            riak_obj = cls.bucket.new(key, data={})
+            obj = cls.from_riakobj(riak_obj)
+            obj._new = True
 
         for field in cls._model_fields:
             # if field is cls._pkey_field:
@@ -901,7 +908,7 @@ def save_all_lazy(cls):
                 to_save.save()
             except DBLayerException:
                 continue
-            cls._c.lazy_save.clear()
+        cls._c.lazy_save.clear()
 
     @clears_state_for('index')
     def save(self, force=False):

solar/dblayer/solar_models.py

@@ -398,12 +398,12 @@ def _get_field_val(self, name, other=None):
             return self._cache[full_name]
         except KeyError:
             pass
-        check_state_for('index', self._instance)
-        fname = self.fname
-        my_name = self._instance.key
-        self._has_own_input(name)
-        ind_name = '{}_recv_bin'.format(fname)
         with self.inputs_index_cache as c:
+            check_state_for('index', self._instance)
+            fname = self.fname
+            my_name = self._instance.key
+            self._has_own_input(name)
+            ind_name = '{}_recv_bin'.format(fname)
             kwargs = dict(startkey='{}|'.format(my_name),
                           endkey='{}|~'.format(my_name),
                           return_terms=True)

test-requirements.txt

@@ -9,3 +9,6 @@ os-testr
 
 # for computable inputs
 lupa
+
+# to test if everything works on gevent
+gevent