synapse 2.209.0__tar.gz → 2.210.0__tar.gz

{synapse-2.209.0/synapse.egg-info → synapse-2.210.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: synapse
-Version: 2.209.0
+Version: 2.210.0
 Summary: Synapse Intelligence Analysis Framework
 Author-email: The Vertex Project LLC <root@vertex.link>
 License-Expression: Apache-2.0
@@ -49,7 +49,7 @@ Requires-Dist: idna<3.11,>=3.6
 Requires-Dist: python-dateutil<3.0,>=2.8
 Requires-Dist: pytz<2025.3,>=2023.3
 Requires-Dist: beautifulsoup4[html5lib]<5.0,>=4.11.1
-Requires-Dist: orjson<4.0,>=3.10.15
+Requires-Dist: vtx-yyjson<5.0.0,>=4.3.0
 Provides-Extra: dev
 Requires-Dist: pytest<8.0.0,>=7.2.0; extra == "dev"
 Requires-Dist: autopep8<3.0.0,>=2.0.4; extra == "dev"

{synapse-2.209.0 → synapse-2.210.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'synapse'
-version = '2.209.0'
+version = '2.210.0'
 authors = [
     { name = 'The Vertex Project LLC', email = 'root@vertex.link'},
 ]
@@ -53,7 +53,7 @@ dependencies = [
     'python-dateutil>=2.8,<3.0',
     'pytz>=2023.3,<2025.3',
     'beautifulsoup4[html5lib]>=4.11.1,<5.0',
-    'orjson>=3.10.15,<4.0'
+    'vtx-yyjson>=4.3.0,<5.0.0',
 ]
 
 [project.optional-dependencies]

{synapse-2.209.0 → synapse-2.210.0}/synapse/lib/cell.py

@@ -2220,14 +2220,24 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
 
             logger.debug(f'HANDOFF: Connected to {s_urlhelp.sanitizeUrl(turl)}{_dispname}.')
 
-            if self.iden != await cell.getCellIden(): # pragma: no cover
+            cellinfo = await cell.getCellInfo()
+            cnfo = cellinfo.get('cell')
+            if self.iden != cnfo.get('iden'):  # pragma: no cover
                 mesg = 'Mirror handoff remote cell iden does not match!'
                 raise s_exc.BadArg(mesg=mesg)
 
-            if self.runid == await cell.getCellRunId(): # pragma: no cover
+            if self.runid == cnfo.get('run'): # pragma: no cover
                 mesg = 'Cannot handoff mirror leadership to myself!'
                 raise s_exc.BadArg(mesg=mesg)
 
+            ahalead = cnfo.get('aha', {}).get('leader')
+            mirror_url = turl
+            if turl.startswith('aha://') and ahalead is not None:
+                ahauser = self.conf.get('aha:user')
+                if ahauser is not None:
+                    ahauser = f'{ahauser}@'
+                mirror_url = f'aha://{ahauser}{ahalead}...'
+
             logger.debug(f'HANDOFF: Obtaining nexus lock{_dispname}.')
 
             async with self.nexslock:
@@ -2247,8 +2257,8 @@ class Cell(s_nexus.Pusher, s_telepath.Aware):
                 logger.debug(f'HANDOFF: Setting the service as inactive{_dispname}.')
                 await self.setCellActive(False)
 
-                logger.debug(f'HANDOFF: Configuring service to sync from new leader{_dispname}.')
-                self.modCellConf({'mirror': turl})
+                logger.debug(f'HANDOFF: Configuring service to sync from new leader{_dispname} @ {s_urlhelp.sanitizeUrl(mirror_url)}.')
+                self.modCellConf({'mirror': mirror_url})
 
                 logger.debug(f'HANDOFF: Restarting the nexus{_dispname}.')
                 await self.nexsroot.startup()

{synapse-2.209.0 → synapse-2.210.0}/synapse/lib/coro.py

@@ -175,6 +175,11 @@ def create_task(coro):
 
     return task
 
+async def await_bg_tasks():
+    if not bgtasks:
+        return []
+    return await asyncio.gather(*tuple(bgtasks), return_exceptions=True)
+
 class GenrHelp:
 
     def __init__(self, genr):

{synapse-2.209.0 → synapse-2.210.0}/synapse/lib/json.py

@@ -7,7 +7,7 @@ from typing import Any, BinaryIO, Callable, Iterator, Optional
 
 from synapse.vendor.cpython.lib.json import detect_encoding
 
-import orjson
+import yyjson
 
 import synapse.exc as s_exc
 
@@ -37,8 +37,9 @@ def loads(s: str | bytes) -> Any:
             deserializing the provided data.
     '''
     try:
-        return orjson.loads(s)
-    except orjson.JSONDecodeError as exc:
+        return yyjson.Document(s, flags=yyjson.ReaderFlags.BIGNUM_AS_RAW).as_obj
+
+    except (ValueError, TypeError) as exc:
         extra = {'synapse': {'fn': 'loads', 'reason': str(exc)}}
         logger.warning('Using fallback JSON deserialization. Please report this to Vertex.', extra=extra)
         return _fallback_loads(s)
@@ -70,6 +71,33 @@ def _fallback_dumps(obj: Any, sort_keys: bool = False, indent: bool = False, def
     except TypeError as exc:
         raise s_exc.MustBeJsonSafe(mesg=exc.args[0])
 
+def _dumps(obj, sort_keys=False, indent=False, default=None, newline=False):
+    rflags = 0
+    wflags = 0
+
+    if sort_keys:
+        rflags |= yyjson.ReaderFlags.SORT_KEYS
+
+    if indent:
+        wflags |= yyjson.WriterFlags.PRETTY_TWO_SPACES
+
+    if newline:
+        wflags |= yyjson.WriterFlags.WRITE_NEWLINE_AT_END
+
+    if isinstance(obj, bytes):
+        mesg = 'Object of type bytes is not JSON serializable'
+        raise s_exc.MustBeJsonSafe(mesg=mesg)
+
+    # Raw strings have to be double-quoted. This is because the default behavior for `yyjson.Document`
+    #  is to attempt to parse the string as a serialized JSON string into objects, so we escape string
+    # values so we can get the JSON encoded string as output.
+    if isinstance(obj, str) and obj not in ('null', 'true', 'false'):
+        # TODO in 3xx convert this into obj = f'''"{obj.replace('"', '\\"')}"'''
+        obj = ''.join(('"', obj.replace('"', '\\"'), '"'))
+
+    doc = yyjson.Document(obj, default=default, flags=rflags)
+    return doc.dumps(flags=wflags).encode()
+
 def dumps(obj: Any, sort_keys: bool = False, indent: bool = False, default: Optional[Callable] = None, newline: bool = False) -> bytes:
     '''
     Serialize a python object to byte string.
@@ -89,24 +117,9 @@ def dumps(obj: Any, sort_keys: bool = False, indent: bool = False, default: Opti
     Raises:
         synapse.exc.MustBeJsonSafe: This exception is raised when a python object cannot be serialized.
     '''
-    opts = 0
-
-    if indent:
-        opts |= orjson.OPT_INDENT_2
-
-    if sort_keys:
-        opts |= orjson.OPT_SORT_KEYS
-
-    if newline:
-        opts |= orjson.OPT_APPEND_NEWLINE
-
     try:
-        return orjson.dumps(obj, option=opts, default=default)
-
-    except orjson.JSONEncodeError as exc:
-        if not isinstance(exc.__cause__, UnicodeEncodeError):
-            raise s_exc.MustBeJsonSafe(mesg=exc.args[0])
-
+        return _dumps(obj, sort_keys=sort_keys, indent=indent, default=default, newline=newline)
+    except UnicodeEncodeError as exc:
         extra = {'synapse': {'fn': 'dumps', 'reason': str(exc)}}
         logger.warning('Using fallback JSON serialization. Please report this to Vertex.', extra=extra)
 
@@ -117,6 +130,10 @@ def dumps(obj: Any, sort_keys: bool = False, indent: bool = False, default: Opti
 
         return ret
 
+    except (TypeError, ValueError) as exc:
+        mesg = f'{exc.__class__.__name__}: {exc}'
+        raise s_exc.MustBeJsonSafe(mesg=mesg)
+
 def dump(obj: Any, fp: BinaryIO, sort_keys: bool = False, indent: bool = False, default: Optional[Callable] = None, newline: bool = False) -> None:
     '''
     Serialize a python object to a file-like object opened in binary mode.
@@ -217,8 +234,17 @@ def reqjsonsafe(item: Any, strict: bool = False) -> None:
     '''
     if strict:
         try:
-            orjson.dumps(item)
+            _dumps(item)
+
+        except s_exc.MustBeJsonSafe:
+            raise
+
+        except UnicodeEncodeError as exc:
+            mesg = str(exc)
+            raise s_exc.MustBeJsonSafe(mesg=mesg)
+
         except Exception as exc:
-            raise s_exc.MustBeJsonSafe(mesg=exc.args[0])
+            mesg = f'{exc.__class__.__name__}: {exc}'
+            raise s_exc.MustBeJsonSafe(mesg=mesg)
     else:
         dumps(item)

{synapse-2.209.0 → synapse-2.210.0}/synapse/lib/nexus.py

@@ -506,6 +506,7 @@ class NexsRoot(s_base.Base):
 
     async def runMirrorLoop(self, proxy):
 
+        cellinfo = None
         try:
             cellinfo = await proxy.getCellInfo()
             features = cellinfo.get('features', {})
@@ -536,6 +537,11 @@ class NexsRoot(s_base.Base):
 
         while not proxy.isfini:
 
+            if cellinfo:
+                ahaname = cellinfo.get('cell').get('aha', {}).get('name')
+                if ahaname:
+                    logger.info(f'Mirror communicating with aha service {ahaname}')
+
             try:
 
                 if self.readonly:

{synapse-2.209.0 → synapse-2.210.0}/synapse/lib/storm.py

@@ -174,6 +174,14 @@ Examples:
     cron.at --dt 20181231Z2359 {[inet:ipv4=1]}
 '''
 
+viewdeldescr = '''
+Delete a view from the cortex.
+
+Notes:
+    Deleting a view with the `view.del` command does not delete any of the layers in the view.
+    To delete layers, you must use the `layer.del` command separately.
+'''
+
 wgetdescr = '''Retrieve bytes from a URL and store them in the axon. Yields inet:urlfile nodes.
 
 Examples:
@@ -656,7 +664,7 @@ stormcmds = (
     },
     {
         'name': 'view.del',
-        'descr': 'Delete a view from the cortex.',
+        'descr': viewdeldescr,
         'cmdargs': (
             ('iden', {'help': 'Iden of the view to delete.'}),
         ),
@@ -2056,7 +2064,7 @@ class Runtime(s_base.Base):
                     continue
 
                 if len(nodes) == 1:
-                    mesg = 'Ambiguous value for single node lookup: {propname}^={valu}'
+                    mesg = f'Ambiguous value for single node lookup: {propname}{cmpr}{valu}'
                     raise s_exc.StormRuntimeError(mesg=mesg)
 
                 nodes.append(node)

{synapse-2.209.0 → synapse-2.210.0}/synapse/lib/stormlib/auth.py

@@ -901,12 +901,14 @@ class User(s_stormtypes.Prim):
                   ),
                   'returns': {'type': 'null', }}},
         {'name': 'tell', 'desc': 'Send a tell notification to a user.',
+         'deprecated': {'eolvers': 'v3.0.0'},
          'type': {'type': 'function', '_funcname': '_methUserTell',
                   'args': (
                       {'name': 'text', 'type': 'str', 'desc': 'The text of the message to send.', },
                   ),
                   'returns': {'type': 'null', }}},
         {'name': 'notify', 'desc': 'Send an arbitrary user notification.',
+         'deprecated': {'eolvers': 'v3.0.0'},
          'type': {'type': 'function', '_funcname': '_methUserNotify',
                   'args': (
                       {'name': 'mesgtype', 'type': 'str', 'desc': 'The notification type.', },
@@ -1153,6 +1155,8 @@ class User(s_stormtypes.Prim):
         return await self.value()
 
     async def _methUserTell(self, text):
+        s_common.deprecated('user.tell()', '2.210.0', '3.0.0')
+        await self.runt.snap.warnonce('user.tell() is deprecated.')
         self.runt.confirm(('tell', self.valu), default=True)
         mesgdata = {
             'text': await s_stormtypes.tostr(text),
@@ -1161,6 +1165,8 @@ class User(s_stormtypes.Prim):
         return await self.runt.snap.core.addUserNotif(self.valu, 'tell', mesgdata)
 
     async def _methUserNotify(self, mesgtype, mesgdata):
+        s_common.deprecated('user.notify()', '2.210.0', '3.0.0')
+        await self.runt.snap.warnonce('user.notify() is deprecated.')
         if not self.runt.isAdmin():
             mesg = '$user.notify() method requires admin privs.'
             raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)

{synapse-2.209.0 → synapse-2.210.0}/synapse/lib/stormlib/notifications.py

@@ -1,4 +1,6 @@
 import synapse.exc as s_exc
+import synapse.common as s_common
+
 import synapse.lib.stormtypes as s_stormtypes
 
 @s_stormtypes.registry.registerLib
@@ -12,6 +14,7 @@ class NotifyLib(s_stormtypes.Lib):
             Yield (<indx>, <mesg>) tuples for a user's notifications.
 
             ''',
+            'deprecated': {'eolvers': 'v3.0.0'},
             'type': {
                 'type': 'function', '_funcname': 'list',
                 'args': (
@@ -28,6 +31,7 @@ class NotifyLib(s_stormtypes.Lib):
             Delete a previously delivered notification.
 
             ''',
+            'deprecated': {'eolvers': 'v3.0.0'},
             'type': {
                 'type': 'function', '_funcname': '_del',
                 'args': (
@@ -44,6 +48,7 @@ class NotifyLib(s_stormtypes.Lib):
             Return a notification by ID (or ``(null)`` ).
 
             ''',
+            'deprecated': {'eolvers': 'v3.0.0'},
             'type': {
                 'type': 'function', '_funcname': 'get',
                 'args': (
@@ -55,20 +60,21 @@ class NotifyLib(s_stormtypes.Lib):
             },
         },
     )
+    _storm_lib_deprecation = {'eolvers': 'v3.0.0'}
 
     def getObjLocals(self):
         return {
             'get': self.get,
             'del': self._del,
             'list': self.list,
-            # 'bytime':
-            # 'bytype':
         }
 
     @s_stormtypes.stormfunc(readonly=True)
     async def get(self, indx):
         indx = await s_stormtypes.toint(indx)
         mesg = await self.runt.snap.core.getUserNotif(indx)
+        s_common.deprecated('$lib.notifications.get()', '2.210.0', '3.0.0')
+        await self.runt.snap.warnonce('$lib.notifications.get() is deprecated.')
         if mesg[0] != self.runt.user.iden and not self.runt.isAdmin():
             mesg = 'You may only get notifications which belong to you.'
             raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
@@ -77,6 +83,8 @@ class NotifyLib(s_stormtypes.Lib):
     async def _del(self, indx):
         indx = await s_stormtypes.toint(indx)
         mesg = await self.runt.snap.core.getUserNotif(indx)
+        s_common.deprecated('$lib.notifications.del()', '2.210.0', '3.0.0')
+        await self.runt.snap.warnonce('$lib.notifications.del() is deprecated.')
         if mesg[0] != self.runt.user.iden and not self.runt.isAdmin():
             mesg = 'You may only delete notifications which belong to you.'
             raise s_exc.AuthDeny(mesg=mesg, user=self.runt.user.iden, username=self.runt.user.name)
@@ -85,5 +93,7 @@ class NotifyLib(s_stormtypes.Lib):
     @s_stormtypes.stormfunc(readonly=True)
     async def list(self, size=None):
         size = await s_stormtypes.toint(size, noneok=True)
+        s_common.deprecated('$lib.notifications.list()', '2.210.0', '3.0.0')
+        await self.runt.snap.warnonce('$lib.notifications.list() is deprecated.')
         async for mesg in self.runt.snap.core.iterUserNotifs(self.runt.user.iden, size=size):
             yield mesg

{synapse-2.209.0 → synapse-2.210.0}/synapse/lib/version.py

@@ -223,6 +223,6 @@ def reqVersion(valu, reqver,
 ##############################################################################
 # The following are touched during the release process by bumpversion.
 # Do not modify these directly.
-version = (2, 209, 0)
+version = (2, 210, 0)
 verstring = '.'.join([str(x) for x in version])
-commit = '0e5089f5b2e5da0d93c93a99943ebbd5fdb6cb4c'
+commit = 'e43efa9d9c2257ff05fe47988a323e16896fdf50'

synapse-2.210.0/synapse/models/entity.py

@@ -0,0 +1,42 @@
+import synapse.lib.module as s_module
+
+class EntityModule(s_module.CoreModule):
+
+    def getModelDefs(self):
+        return (('entity', {
+
+            'types': (
+                ('entity:name', ('str', {'onespace': True, 'lower': True}), {
+                    'doc': 'A name used to refer to an entity.'}),
+
+                ('entity:actor', ('ndef', {'forms': ('ou:org', 'ps:person', 'ps:contact', 'risk:threat')}), {
+                    'doc': 'An entity which has initiative to act.'}),
+
+                ('entity:relationship:type:taxonomy', ('taxonomy', {}), {
+                    'interfaces': ('meta:taxonomy', ),
+                    'doc': 'A hierarchical taxonomy of entity relationship types.'}),
+
+                ('entity:relationship', ('guid', {}), {
+                    'doc': 'A directional relationship between two actor entities.'}),
+            ),
+
+            'forms': (
+                ('entity:name', {}, ()),
+
+                ('entity:relationship:type:taxonomy', {}, ()),
+                ('entity:relationship', {}, (
+
+                    ('type', ('entity:relationship:type:taxonomy', {}), {
+                        'doc': 'The type of relationship.'}),
+
+                    ('period', ('ival', {}), {
+                        'doc': 'The time period when the relationship existed.'}),
+
+                    ('source', ('entity:actor', {}), {
+                        'doc': 'The source entity in the relationship.'}),
+
+                    ('target', ('entity:actor', {}), {
+                        'doc': 'The target entity in the relationship.'}),
+                )),
+            ),
+        }),)

{synapse-2.209.0 → synapse-2.210.0}/synapse/models/inet.py

@@ -3802,6 +3802,9 @@ class InetModule(s_module.CoreModule):
                         ('attachments', ('array', {'type': 'inet:service:message:attachment', 'uniq': True, 'sorted': True}), {
                             'doc': 'An array of files attached to the message.'}),
 
+                        ('hashtags', ('array', {'type': 'inet:web:hashtag', 'uniq': True, 'sorted': True, 'split': ','}), {
+                            'doc': 'An array of hashtags mentioned within the message.'}),
+
                         ('place', ('geo:place', {}), {
                             'doc': 'The place that the message was sent from.'}),
 
@@ -3823,6 +3826,11 @@ class InetModule(s_module.CoreModule):
 
                         ('type', ('inet:service:message:type:taxonomy', {}), {
                             'doc': 'The type of message.'}),
+
+                        ('mentions', ('array', {'type': 'ndef',
+                                                'typeopts': {'forms': ('inet:service:account', 'inet:service:group')},
+                                                'uniq': True, 'sorted': True}), {
+                            'doc': 'Contactable entities mentioned within the message.'}),
                     )),
 
                     ('inet:service:message:link', {}, (
@@ -3863,6 +3871,9 @@ class InetModule(s_module.CoreModule):
 
                         ('period', ('ival', {}), {
                             'doc': 'The time period where the channel was available.'}),
+
+                        ('topic', ('media:topic', {}), {
+                            'doc': 'The visible topic of the channel.'}),
                     )),
 
                     ('inet:service:thread', {}, (

{synapse-2.209.0 → synapse-2.210.0}/synapse/models/person.py

@@ -490,13 +490,20 @@ class PsModule(s_module.CoreModule):
                     ('crypto:address', ('crypto:currency:address', {}), {
                         'doc': 'A crypto currency address associated with the contact.'
                     }),
-
                     ('lang', ('lang:language', {}), {
                         'alts': ('langs',),
                         'doc': 'The language specified for the contact.'}),
-
                     ('langs', ('array', {'type': 'lang:language'}), {
                         'doc': 'An array of alternative languages specified for the contact.'}),
+                    ('banner', ('file:bytes', {}), {
+                        'doc': 'The file representing the banner for the contact.'}),
+                    ('passwd', ('inet:passwd', {}), {
+                        'doc': 'The current password for the contact.'}),
+                    ('website', ('inet:url', {}), {
+                        'doc': 'A related URL specified by the contact (e.g., a personal or company web '
+                               'page, blog, etc.).'}),
+                    ('websites', ('array', {'type': 'inet:url', 'uniq': True, 'sorted': True}), {
+                        'doc': 'Alternative related URLs specified by the contact.'}),
                 )),
                 ('ps:vitals', {}, (
                     ('asof', ('time', {}), {

{synapse-2.209.0 → synapse-2.210.0}/synapse/tests/test_cortex.py

@@ -152,12 +152,12 @@ class CortexTest(s_t_utils.SynTest):
                         self.false((await core01.getCellInfo())['cell']['uplink'])
                         # Note: The following mirror may change when SYN-7659 is addressed and greater
                         # control over the topology update is available during the promotion process.
-                        self.eq((await core00.getCellInfo())['cell']['mirror'], 'aha://01.cortex.synapse')
+                        self.eq((await core00.getCellInfo())['cell']['mirror'], 'aha://root@cortex...')
                         self.none((await core01.getCellInfo())['cell']['mirror'])
 
                         mods00 = s_common.yamlload(core00.dirn, 'cell.mods.yaml')
                         mods01 = s_common.yamlload(core01.dirn, 'cell.mods.yaml')
-                        self.eq(mods00, {'mirror': 'aha://01.cortex.synapse'})
+                        self.eq(mods00, {'mirror': 'aha://root@cortex...'})
                         self.eq(mods01, {'mirror': None})
 
                         await core00.nodes('[inet:ipv4=5.5.5.5]')
@@ -8367,7 +8367,7 @@ class CortexBasicTest(s_t_utils.SynTest):
                     dirn01 = s_common.genpath(dirn, 'cell01')
 
                     core00 = await base.enter_context(self.addSvcToAha(aha, '00.core', s_cortex.Cortex, dirn=dirn00))
-                    provinfo = {'mirror': '00.core'}
+                    provinfo = {'mirror': 'core'}
                     core01 = await base.enter_context(self.addSvcToAha(aha, '01.core', s_cortex.Cortex, dirn=dirn01, provinfo=provinfo))
 
                     self.len(1, await core00.nodes('[inet:asn=0]'))

{synapse-2.209.0 → synapse-2.210.0}/synapse/tests/test_lib_aha.py

@@ -781,7 +781,7 @@ class AhaTest(s_test.SynTest):
                         self.false(axon3.isactive)
                         self.eq('aha://root@axon...', axon03.conf.get('mirror'))
 
-                        retn, outp = await self.execToolMain(s_a_list._main, [aha.getLocalUrl()])
+                        retn, outp = await self.execToolMain(s_a_list.main, [aha.getLocalUrl()])
                         self.eq(retn, 0)
                         outp.expect('Service              network                        leader')
                         outp.expect('00.axon              synapse                        True')

{synapse-2.209.0 → synapse-2.210.0}/synapse/tests/test_lib_cell.py

@@ -2238,7 +2238,7 @@ class CellTest(s_t_utils.SynTest):
                             self.false(core00.isactive)
 
                             modinfo = s_common.yamlload(core00.dirn, 'cell.mods.yaml')
-                            self.isin('01.core', modinfo.get('mirror', ''))
+                            self.eq('aha://root@core...', modinfo.get('mirror', ''))
                             modinfo = s_common.yamlload(core01.dirn, 'cell.mods.yaml')
                             self.none(modinfo.get('mirror'))
 
@@ -2321,7 +2321,7 @@ class CellTest(s_t_utils.SynTest):
                             self.false(core00.isactive)
 
                             modinfo = s_common.yamlload(core00.dirn, 'cell.mods.yaml')
-                            self.isin('01.core', modinfo.get('mirror', ''))
+                            self.eq('aha://root@core...', modinfo.get('mirror', ''))
                             modinfo = s_common.yamlload(core01.dirn, 'cell.mods.yaml')
                             self.none(modinfo.get('mirror'))
 
@@ -2333,7 +2333,7 @@ class CellTest(s_t_utils.SynTest):
                             modinfo = s_common.yamlload(core00.dirn, 'cell.mods.yaml')
                             self.none(modinfo.get('mirror'))
                             modinfo = s_common.yamlload(core01.dirn, 'cell.mods.yaml')
-                            self.isin('00.core', modinfo.get('mirror', ''))
+                            self.eq('aha://root@core...', modinfo.get('mirror', ''))
 
                             # Backup the mirror (core01) which points to the core00
                             async with await axon00.upload() as upfd:
@@ -3285,6 +3285,7 @@ class CellTest(s_t_utils.SynTest):
                     dirn00 = s_common.genpath(dirn, '00.cell')
                     dirn01 = s_common.genpath(dirn, '01.cell')
                     dirn02 = s_common.genpath(dirn, '02.cell')
+                    dirn0002 = s_common.genpath(dirn, '00.02.cell')
 
                     cell00 = await base.enter_context(self.addSvcToAha(aha, '00.cell', s_cell.Cell, dirn=dirn00))
                     cell01 = await base.enter_context(self.addSvcToAha(aha, '01.cell', s_cell.Cell, dirn=dirn01,
@@ -3301,24 +3302,43 @@ class CellTest(s_t_utils.SynTest):
                         await cell01.handoff('some://url')
                     self.isin('01.cell is not the current leader', cm.exception.get('mesg'))
 
-                    # Note: The following behavior may change when SYN-7659 is addressed and greater
-                    # control over the topology update is available during the promotion process.
-                    # Promote 02.cell -> Promote 01.cell -> Promote 00.cell -> BadState exception
+                    # Promote 02.cell -> Promote 01.cell -> Promote 00.cell, without breaking the configured topology
                     await cell02.promote(graceful=True)
                     self.false(cell00.isactive)
+                    self.eq(cell00.conf.get('mirror'), 'aha://root@cell...')
                     self.false(cell01.isactive)
+                    self.eq(cell01.conf.get('mirror'), 'aha://root@cell...')
                     self.true(cell02.isactive)
+                    self.none(cell02.conf.get('mirror'))
                     await cell02.sync()
 
                     await cell01.promote(graceful=True)
                     self.false(cell00.isactive)
+                    self.eq(cell00.conf.get('mirror'), 'aha://root@cell...')
                     self.true(cell01.isactive)
+                    self.none(cell01.conf.get('mirror'))
                     self.false(cell02.isactive)
+                    self.eq(cell02.conf.get('mirror'), 'aha://root@cell...')
                     await cell02.sync()
 
+                    await cell00.promote(graceful=True)
+                    self.true(cell00.isactive)
+                    self.none(cell00.conf.get('mirror'))
+                    self.false(cell01.isactive)
+                    self.eq(cell01.conf.get('mirror'), 'aha://root@cell...')
+                    self.false(cell02.isactive)
+                    self.eq(cell02.conf.get('mirror'), 'aha://root@cell...')
+                    await cell02.sync()
+
+                    # A follower of a follower cannot be promoted up since its leader is not the active cell.
+                    cell0002 = await base.enter_context(self.addSvcToAha(aha, '00.02.cell', s_cell.Cell, dirn=dirn0002,
+                                                                      provinfo={'mirror': '02.cell'}))
+                    self.false(cell0002.isactive)
+                    self.eq(cell0002.conf.get('mirror'), 'aha://root@02.cell...')
                     with self.raises(s_exc.BadState) as cm:
-                        await cell00.promote(graceful=True)
-                    self.isin('02.cell is not the current leader', cm.exception.get('mesg'))
+                        await cell0002.promote(graceful=True)
+                    mesg = 'ahaname=02.cell is not the current leader and cannot handoff leadership to aha://00.02.cell.synapse.'
+                    self.isin(mesg, cm.exception.get('mesg'))
 
     async def test_cell_get_aha_proxy(self):
 

{synapse-2.209.0 → synapse-2.210.0}/synapse/tests/test_lib_coro.py

@@ -212,3 +212,26 @@ class CoroTest(s_t_utils.SynTest):
 
         with self.raises(Exception):
             await s_coro._parserforked(newp)
+
+    async def test_lib_coro_create_task(self):
+
+        async def sleep(n):
+            await asyncio.sleep(n)
+            if n == 0:
+                return 1 / 0
+            return n
+
+        s_coro.create_task(sleep(0.1))
+        s_coro.create_task(sleep(0.15))
+        s_coro.create_task(sleep(0.2))
+        self.len(3, s_coro.bgtasks)
+        results = await s_coro.await_bg_tasks()
+        self.eq(set(results), {0.1, 0.15, 0.2})
+        self.len(0, s_coro.bgtasks)
+        results = await s_coro.await_bg_tasks()
+        self.eq(results, [])
+
+        s_coro.create_task(sleep(0))
+        results = await s_coro.await_bg_tasks()
+        self.len(1, results)
+        self.isinstance(results[0], ZeroDivisionError)