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

Fixed gevent related test failures

solar/dblayer/model.py

@@ -181,6 +181,7 @@ def requires_clean_state(_type):
 
 
 def check_state_for(_type, obj):
+    with obj._lock:
         state = obj._c.db_ch_state.get(_type)
         if state:
             if True:
@@ -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,6 +856,10 @@ class Model(object):
             raise DBLayerException("Object already exists in cache"
                                    " cannot create second")
         data['key'] = key
+
+        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

solar/dblayer/solar_models.py

@@ -398,12 +398,12 @@ class InputsFieldWrp(IndexFieldWrp):
             return self._cache[full_name]
         except KeyError:
             pass
+        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)
-        with self.inputs_index_cache as c:
             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