external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2912 from citusdata/MaxBackends_max_wal_senders 

Update TotalProcCount to match update in InitializeMaxBackends in pg12
pull/2914/head
Philip Dubé 2019-08-29 14:16:38 +00:00 committed by GitHub
parent cbecf97c84 32ef459025
commit dd57232ba3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/distributed/transaction/backend_data.c
View File

@ -28,6 +28,9 @@
#include "distributed/tuplestore.h"
#include "nodes/execnodes.h"
#include "postmaster/autovacuum.h" /* to access autovacuum_max_workers */
#if PG_VERSION_NUM >= 120000
#include "replication/walsender.h"
#endif
#include "storage/ipc.h"
#include "storage/lmgr.h"
#include "storage/lwlock.h"
@ -518,9 +521,10 @@ BackendManagementShmemInit(void)
totalProcs = TotalProcCount();
for (backendIndex = 0; backendIndex < totalProcs; ++backendIndex)
{
backendManagementShmemData->backends[backendIndex].citusBackend.
initiatorNodeIdentifier = -1;
SpinLockInit(&backendManagementShmemData->backends[backendIndex].mutex);
BackendData *backendData =
&backendManagementShmemData->backends[backendIndex];
backendData->citusBackend.initiatorNodeIdentifier = -1;
SpinLockInit(&backendData->mutex);
}
}
@ -587,12 +591,16 @@ TotalProcCount(void)
* We prefer to maintain space for auxiliary procs or preperad transactions in
* the backend space because they could be blocking processes and our current
* implementation of distributed deadlock detection could process them
* as a regular backend. In the future, we could consider chaning deadlock
* detection algorithm to ignore auxiliary procs or preperad transactions and
* save same space.
* as a regular backend. In the future, we could consider changing deadlock
* detection algorithm to ignore auxiliary procs or prepared transactions and
* save some space.
*/
totalProcs = maxBackends + NUM_AUXILIARY_PROCS + max_prepared_xacts;
#if PG_VERSION_NUM >= 120000
totalProcs += max_wal_senders;
#endif
return totalProcs;
}