Test writers are removed from RTs per database

boltstub/parsing.py

@@ -1050,7 +1050,6 @@ def can_be_skipped(self, channel):
 
 
 class ConditionalBlock(Block):
-
     def __init__(self, conditions: List[str], blocks: List[Block],
                  line_number: int):
         super().__init__(line_number)
@@ -1120,7 +1119,7 @@ def can_consume_after_reset(self, channel) -> bool:
         block = self._probe_selection(channel, None)
         if not block:
             return False
-        return block.can_consume(channel)
+        return block.can_consume_after_reset(channel)
         pass
 
     def has_deterministic_end(self):

tests/stub/routing/scripts/v3/router_adb_then_bdb.script

@@ -0,0 +1,21 @@
+!: BOLT #VERSION#
+!: AUTO RESET
+!: ALLOW RESTART
+!: PY request = 0
+
+C: HELLO {"scheme": "basic", "credentials": "c", "principal": "p", "user_agent": "007"#EXTR_HELLO_ROUTING_PROPS#}
+S: SUCCESS {"server": "#SERVER_AGENT#", "connection_id": "bolt-123456789"}
+*: RESET
+{*
+    IF: request < 2
+    {{
+        C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": #ROUTINGCTX#} {"[mode]": "r"}
+        S: SUCCESS {"fields": ["ttl", "servers"]}
+        C: PULL_ALL
+        S: RECORD [1000, [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]]
+           SUCCESS {"type": "r"}
+        PY: request += 1
+        *: RESET
+    }}
+*}
+?: GOODBYE

tests/stub/routing/scripts/v3/writer_tx_yielding_failure_on_2nd_run.script

@@ -0,0 +1,26 @@
+!: BOLT #VERSION#
+
+A: HELLO {"{}": "*"}
+*: RESET
+
+C: RUN "RETURN 1 AS n" {} {}
+S: SUCCESS {"fields": ["n"]}
+C: PULL_ALL
+S: RECORD [1]
+   SUCCESS {"type": "r"}
+
+*: RESET
+
+C: BEGIN {}
+S: SUCCESS {}
+C: RUN "RETURN 1 AS n" {} {}
+S: FAILURE #FAILURE#
+{?
+    C: PULL_ALL
+    S: IGNORED
+?}
+C: RESET
+S: SUCCESS {}
+
+*: RESET
+?: GOODBYE

tests/stub/routing/scripts/v3/writer_yielding_failure_on_2nd_run.script

@@ -0,0 +1,24 @@
+!: BOLT #VERSION#
+
+A: HELLO {"{}": "*"}
+*: RESET
+
+C: RUN "RETURN 1 AS n" {} {}
+S: SUCCESS {"fields": ["n"]}
+C: PULL_ALL
+S: RECORD [1]
+   SUCCESS {"type": "r"}
+
+*: RESET
+
+C: RUN "RETURN 1 AS n" {} {}
+S: FAILURE #FAILURE#
+{?
+    C: PULL_ALL
+    S: IGNORED
+?}
+C: RESET
+S: SUCCESS {}
+
+*: RESET
+?: GOODBYE

tests/stub/routing/scripts/v4x1/router_adb_then_bdb.script

@@ -0,0 +1,38 @@
+!: BOLT #VERSION#
+!: AUTO RESET
+!: ALLOW RESTART
+!: PY request = 0
+
+C: HELLO {"scheme": "basic", "credentials": "c", "principal": "p", "user_agent": "007", "routing": #ROUTINGCTX#}
+S: SUCCESS {"server": "#SERVER_AGENT#", "connection_id": "bolt-123456789"}
+*: RESET
+IF: request == 0
+{{
+    C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": #ROUTINGCTX#, "database": "adb"} {"[mode]": "r", "db": "system", "[bookmarks]": "*"}
+    S: SUCCESS {"fields": ["ttl", "servers"]}
+    C: PULL {"n": -1}
+    S: RECORD [1000, [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]]
+       SUCCESS {"type": "r"}
+    PY: request = 1
+    *: RESET
+    {?
+        C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": #ROUTINGCTX#, "database": "bdb"} {"[mode]": "r", "db": "system", "[bookmarks]": "*"}
+        S: SUCCESS {"fields": ["ttl", "servers"]}
+        C: PULL {"n": -1}
+        S: RECORD [1000, [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]]
+           SUCCESS {"type": "r"}
+        PY: request = 2
+        *: RESET
+    ?}
+}}
+ELIF: request == 1
+{{
+    C: RUN "CALL dbms.routing.getRoutingTable($context, $database)" {"context": #ROUTINGCTX#, "database": "bdb"} {"[mode]": "r", "db": "system", "[bookmarks]": "*"}
+    S: SUCCESS {"fields": ["ttl", "servers"]}
+    C: PULL {"n": -1}
+    S: RECORD [1000, [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]]
+       SUCCESS {"type": "r"}
+    PY: request = 2
+    *: RESET
+}}
+?: GOODBYE

tests/stub/routing/scripts/v4x3/router_adb_then_bdb.script

@@ -0,0 +1,29 @@
+!: BOLT #VERSION#
+!: AUTO RESET
+!: ALLOW RESTART
+!: PY request = 0
+
+C: HELLO {"scheme": "basic", "credentials": "c", "principal": "p", "user_agent": "007", "routing": #ROUTINGCTX# , "[patch_bolt]": "*"}
+S: SUCCESS {"server": "#SERVER_AGENT#", "connection_id": "bolt-123456789"}
+*: RESET
+IF: request == 0
+{{
+    C: ROUTE #ROUTINGCTX# "*" "adb"
+    S: SUCCESS { "rt": { "ttl": 1000, "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+    PY: request = 1
+    *: RESET
+    {?
+        C: ROUTE #ROUTINGCTX# "*" "bdb"
+        S: SUCCESS { "rt": { "ttl": 1000, "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+        PY: request = 2
+        *: RESET
+    ?}
+}}
+ELIF: request == 1
+{{
+    C: ROUTE #ROUTINGCTX# "*" "bdb"
+    S: SUCCESS { "rt": { "ttl": 1000, "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+    PY: request = 2
+    *: RESET
+}}
+?: GOODBYE

tests/stub/routing/scripts/v4x4/router_adb_then_bdb.script

@@ -0,0 +1,29 @@
+!: BOLT #VERSION#
+!: AUTO RESET
+!: ALLOW RESTART
+!: PY request = 0
+
+C: HELLO {"scheme": "basic", "credentials": "c", "principal": "p", "user_agent": "007", "routing": #ROUTINGCTX#, "[patch_bolt]": "*"}
+S: SUCCESS {"server": "#SERVER_AGENT#", "connection_id": "bolt-123456789"}
+*: RESET
+IF: request == 0
+{{
+    C: ROUTE #ROUTINGCTX# "*" {"db": "adb"}
+    S: SUCCESS { "rt": { "ttl": 1000, "db": "adb", "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+    PY: request = 1
+    *: RESET
+    {?
+        C: ROUTE #ROUTINGCTX# "*" {"db": "bdb"}
+        S: SUCCESS { "rt": { "ttl": 1000, "db": "bdb", "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+        PY: request = 2
+        *: RESET
+    ?}
+}}
+ELIF: request == 1
+{{
+    C: ROUTE #ROUTINGCTX# "*" {"db": "bdb"}
+    S: SUCCESS { "rt": { "ttl": 1000, "db": "bdb", "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+    PY: request = 2
+    *: RESET
+}}
+?: GOODBYE

tests/stub/routing/scripts/v5x0/router_adb_then_bdb.script

@@ -0,0 +1,29 @@
+!: BOLT #VERSION#
+!: AUTO RESET
+!: ALLOW RESTART
+!: PY request = 0
+
+C: HELLO {"scheme": "basic", "credentials": "c", "principal": "p", "user_agent": "007", "routing": #ROUTINGCTX#}
+S: SUCCESS {"server": "#SERVER_AGENT#", "connection_id": "bolt-123456789"}
+*: RESET
+IF: request == 0
+{{
+    C: ROUTE #ROUTINGCTX# "*" {"db": "adb"}
+    S: SUCCESS { "rt": { "ttl": 1000, "db": "adb", "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+    PY: request = 1
+    *: RESET
+    {?
+        C: ROUTE #ROUTINGCTX# "*" {"db": "bdb"}
+        S: SUCCESS { "rt": { "ttl": 1000, "db": "bdb", "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+        PY: request = 2
+        *: RESET
+    ?}
+}}
+ELIF: request == 1
+{{
+    C: ROUTE #ROUTINGCTX# "*" {"db": "bdb"}
+    S: SUCCESS { "rt": { "ttl": 1000, "db": "bdb", "servers": [{"addresses": ["#HOST#:9000"], "role":"ROUTE"}, {"addresses": ["#HOST#:9010", "#HOST#:9011"], "role":"READ"}, {"addresses": ["#HOST#:9020", "#HOST#:9021"], "role":"WRITE"}]}}
+    PY: request = 2
+    *: RESET
+}}
+?: GOODBYE

tests/stub/routing/scripts/v5x0/writer_tx_yielding_failure_on_2nd_run.script

@@ -0,0 +1,26 @@
+!: BOLT #VERSION#
+
+A: HELLO {"{}": "*"}
+*: RESET
+
+C: RUN "RETURN 1 AS n" {} {"db": "adb"}
+S: SUCCESS {"fields": ["n"]}
+C: PULL {"n": 1000}
+S: RECORD [1]
+   SUCCESS {"type": "r"}
+
+*: RESET
+
+C: BEGIN {"db": "bdb"}
+S: SUCCESS {}
+C: RUN "RETURN 1 AS n" {} {}
+S: FAILURE #FAILURE#
+{?
+    C: PULL {"n": 1000}
+    S: IGNORED
+?}
+C: RESET
+S: SUCCESS {}
+
+*: RESET
+?: GOODBYE

tests/stub/routing/scripts/v5x0/writer_yielding_failure_on_2nd_run.script

@@ -0,0 +1,23 @@
+!: BOLT #VERSION#
+
+A: HELLO {"{}": "*"}
+*: RESET
+
+C: RUN "RETURN 1 AS n" {} {"db": "adb"}
+S: SUCCESS {"fields": ["n"]}
+C: PULL {"n": 1000}
+S: RECORD [1]
+   SUCCESS {"type": "r"}
+
+*: RESET
+
+C: RUN "RETURN 1 AS n" {} {"db": "bdb"}
+S: FAILURE #FAILURE#
+{?
+    # Drivers might pipeline RUN and PULL
+    C: PULL {"n": 1000}
+    S: IGNORED
+?}
+
+*: RESET
+?: GOODBYE

tests/stub/routing/test_routing_v3.py

@@ -35,6 +35,7 @@ def get_vars(self, host=None):
         return v
 
     adb = None
+    bdb = None
 
     def route_call_count(self, server):
         return server.count_requests(