mirror of
https://github.com/postgres/postgres.git
synced 2025-10-24 01:29:19 +03:00
Use data directory inode number, not port, to select SysV resource keys.
This approach provides a much tighter binding between a data directory and the associated SysV shared memory block (and SysV or named-POSIX semaphores, if we're using those). Key collisions are still possible, but only between data directories stored on different filesystems, so the situation should be negligible in practice. More importantly, restarting the postmaster with a different port number no longer risks failing to identify a relevant shared memory block, even when postmaster.pid has been removed. A standalone backend is likewise much more certain to detect conflicting leftover backends. (In the longer term, we might now think about deprecating the port as a cluster-wide value, so that one postmaster could support sockets with varying port numbers. But that's for another day.) The hazards fixed here apply only on Unix systems; our Windows code paths already use identifiers derived from the data directory path name rather than the port. src/test/recovery/t/017_shm.pl, which intends to test key-collision cases, has been substantially rewritten since it can no longer use two postmasters with identical port numbers to trigger the case. Instead, use Perl's IPC::SharedMem module to create a conflicting shmem segment directly. The test script will be skipped if that module is not available. (This means that some older buildfarm members won't run it, but I don't think that that results in any meaningful coverage loss.) Patch by me; thanks to Noah Misch and Peter Eisentraut for discussion and review. Discussion: https://postgr.es/m/16908.1557521200@sss.pgh.pa.us
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
#include <semaphore.h>
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include "miscadmin.h"
|
||||
#include "storage/ipc.h"
|
||||
@@ -181,10 +182,6 @@ PGSemaphoreShmemSize(int maxSemas)
|
||||
* are acquired here or in PGSemaphoreCreate, register an on_shmem_exit
|
||||
* callback to release them.
|
||||
*
|
||||
* The port number is passed for possible use as a key (for Posix, we use
|
||||
* it to generate the starting semaphore name). In a standalone backend,
|
||||
* zero will be passed.
|
||||
*
|
||||
* In the Posix implementation, we acquire semaphores on-demand; the
|
||||
* maxSemas parameter is just used to size the arrays. For unnamed
|
||||
* semaphores, there is an array of PGSemaphoreData structs in shared memory.
|
||||
@@ -196,8 +193,22 @@ PGSemaphoreShmemSize(int maxSemas)
|
||||
* we don't have to expose the counters to other processes.)
|
||||
*/
|
||||
void
|
||||
PGReserveSemaphores(int maxSemas, int port)
|
||||
PGReserveSemaphores(int maxSemas)
|
||||
{
|
||||
struct stat statbuf;
|
||||
|
||||
/*
|
||||
* We use the data directory's inode number to seed the search for free
|
||||
* semaphore keys. This minimizes the odds of collision with other
|
||||
* postmasters, while maximizing the odds that we will detect and clean up
|
||||
* semaphores left over from a crashed postmaster in our own directory.
|
||||
*/
|
||||
if (stat(DataDir, &statbuf) < 0)
|
||||
ereport(FATAL,
|
||||
(errcode_for_file_access(),
|
||||
errmsg("could not stat data directory \"%s\": %m",
|
||||
DataDir)));
|
||||
|
||||
#ifdef USE_NAMED_POSIX_SEMAPHORES
|
||||
mySemPointers = (sem_t **) malloc(maxSemas * sizeof(sem_t *));
|
||||
if (mySemPointers == NULL)
|
||||
@@ -215,7 +226,7 @@ PGReserveSemaphores(int maxSemas, int port)
|
||||
|
||||
numSems = 0;
|
||||
maxSems = maxSemas;
|
||||
nextSemKey = port * 1000;
|
||||
nextSemKey = statbuf.st_ino;
|
||||
|
||||
on_shmem_exit(ReleaseSemaphores, 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user