From bc3e20ab99e246d8602a0d8b7e7d80be5212d6c4 Mon Sep 17 00:00:00 2001 From: Peter Smith Date: Tue, 1 Aug 2023 11:23:25 +1000 Subject: [PATCH v1] Simplify worker type checks --- src/backend/replication/logical/worker.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index dd353fd..10b5ea7 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -3851,7 +3851,7 @@ apply_worker_exit(void) * subscription is still active, and so that we won't leak that hash table * entry if it isn't. */ - if (!am_tablesync_worker()) + if (am_leader_apply_worker()) ApplyLauncherForgetWorkerStartTime(MyLogicalRepWorker->subid); proc_exit(0); @@ -3894,8 +3894,9 @@ maybe_reread_subscription(void) MySubscription->name))); /* Ensure we remove no-longer-useful entry for worker's start time */ - if (!am_tablesync_worker() && !am_parallel_apply_worker()) + if (am_leader_apply_worker()) ApplyLauncherForgetWorkerStartTime(MyLogicalRepWorker->subid); + proc_exit(0); } @@ -4465,8 +4466,9 @@ InitializeApplyWorker(void) MyLogicalRepWorker->subid))); /* Ensure we remove no-longer-useful entry for worker's start time */ - if (!am_tablesync_worker() && !am_parallel_apply_worker()) + if (!am_leader_apply_worker()) ApplyLauncherForgetWorkerStartTime(MyLogicalRepWorker->subid); + proc_exit(0); } @@ -4735,7 +4737,7 @@ DisableSubscriptionAndExit(void) CommitTransactionCommand(); /* Ensure we remove no-longer-useful entry for worker's start time */ - if (!am_tablesync_worker() && !am_parallel_apply_worker()) + if (am_leader_apply_worker()) ApplyLauncherForgetWorkerStartTime(MyLogicalRepWorker->subid); /* Notify the subscription has been disabled and exit */ -- 1.8.3.1