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

Commit b3df93a

Browse files
committed
start resolver after monitor started dmq suscriptions
1 parent 3450aea commit b3df93a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/resolver.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ scatter_status_requests(MtmConfig *mtm_cfg)
400400
MtmInitMessage(&msg, MSG_POLL_REQUEST);
401401
strncpy(msg.gid, tx->gid, GIDSIZE);
402402

403+
// XXX
403404
MtmLock(LW_SHARED);
404405
dest_id = Mtm->dmq_dest_ids[node_id - 1];
405406
MtmUnlock();

src/state.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,7 @@ MtmMonitor(Datum arg)
12211221
user_id;
12221222
MtmConfig *mtm_cfg = NULL;
12231223
BackgroundWorkerHandle *receivers[MTM_MAX_NODES];
1224-
BackgroundWorkerHandle *resolver;
1224+
BackgroundWorkerHandle *resolver = NULL;
12251225

12261226
memset(receivers, '\0', MTM_MAX_NODES * sizeof(BackgroundWorkerHandle *));
12271227

@@ -1297,11 +1297,6 @@ MtmMonitor(Datum arg)
12971297
pubsub_change_cb,
12981298
(Datum) 0);
12991299

1300-
/* Now start all other necessary workers */
1301-
1302-
/* Launch resolver */
1303-
resolver = ResolverStart(db_id, user_id);
1304-
13051300
dmq_stream_subscribe("txreq");
13061301

13071302
for (;;)
@@ -1357,6 +1352,11 @@ MtmMonitor(Datum arg)
13571352
config_valid = true;
13581353
}
13591354

1355+
/* Launch resolver after we added dmq destinations */
1356+
// XXX: that's because of current use of Mtm->dmq_dest_ids[]
1357+
if (resolver == NULL)
1358+
resolver = ResolverStart(db_id, user_id);
1359+
13601360
check_status_requests(mtm_cfg);
13611361

13621362
rc = WaitLatch(MyLatch,

0 commit comments

Comments
 (0)