Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f44f61b

Browse files
committed
Start resolver before receiver.
Trying to unstuck logical slot creation after basebackup.
1 parent ecd9649 commit f44f61b

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/state.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ MtmGetCurrentStatus()
10361036
nodemask_t
10371037
MtmGetConnectedNodeMask()
10381038
{
1039-
return mtm_state->connected_mask;
1039+
return mtm_state->connected_mask & mtm_state->dmq_senders_mask;
10401040
}
10411041

10421042
nodemask_t
@@ -1582,6 +1582,10 @@ MtmMonitor(Datum arg)
15821582

15831583
dmq_stream_subscribe("txreq");
15841584

1585+
/* Launch resolver */
1586+
Assert(resolver == NULL);
1587+
resolver = ResolverStart(db_id, user_id);
1588+
15851589
for (;;)
15861590
{
15871591
int rc;
@@ -1635,11 +1639,6 @@ MtmMonitor(Datum arg)
16351639
config_valid = true;
16361640
}
16371641

1638-
/* Launch resolver after we added dmq destinations */
1639-
// XXX: that's because of current use of Mtm->peers[].dmq_dest_id
1640-
if (resolver == NULL)
1641-
resolver = ResolverStart(db_id, user_id);
1642-
16431642
// XXX: add tx start/stop to clear mcxt?
16441643
check_status_requests(mtm_cfg);
16451644

tests/lib/bank_client.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ def __init__(self, dsns, n_accounts=100000):
8888

8989
self.initdb()
9090

91+
print('initialized')
92+
9193
self.nodes_state_fields = ["id", "disabled", "disconnected", "catchUp", "slotLag",
9294
"avgTransDelay", "lastStatusChange", "oldestSnapshot", "SenderPid",
9395
"SenderStartTime ", "ReceiverPid", "ReceiverStartTime", "connStr"]
@@ -168,7 +170,7 @@ def create_extension(self):
168170
cur = conn.cursor()
169171
cur.execute("select mtm.init_cluster($$%s$$, $${%s}$$);" %
170172
("dbname=regression user=pg host=node1",
171-
'"dbname=regression user=pg host=node2"'))
173+
'"dbname=regression user=pg host=node2", "dbname=regression user=pg host=node3"'))
172174
conn.commit()
173175
cur.close()
174176
conn.close()

0 commit comments

Comments
 (0)