When processing events with addTufoEvents, defer the autoadds until a…

…fter the original nodes have been created. This addresses an issue where the autoadd'd events may have required props which are not included in autoadds.

synapse/cores/common.py

@@ -1760,6 +1760,7 @@ def addTufoEvents(self, form, propss):
 
                 adds = []
                 rows = []
+                allfulls = []
 
                 for props in chunk:
 
@@ -1773,7 +1774,7 @@ def addTufoEvents(self, form, propss):
                     fulls['tufo:form'] = form
 
                     if self.autoadd:
-                        self._runToAdd(fulls)
+                        allfulls.append(fulls)
 
                     # fire these immediately since we need them to potentially fill
                     # in values before we generate rows for the new tufo
@@ -1799,6 +1800,10 @@ def addTufoEvents(self, form, propss):
                     xact.fire('node:add', form=form, valu=valu, node=node)
                     xact.spliced('node:add', form=form, valu=valu, props=props)
 
+                if self.autoadd:
+                    for fulls in allfulls:
+                        self._runToAdd(fulls)
+
         return ret
 
     def _reqProps(self, form, fulls):