database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Fix a race condition that caused pg_database_size() and pg_tablespace_size()

Browse Source 
to fail if an object was removed between calls to ReadDir() and stat().
Per discussion in pgsql-hackers.

http://archives.postgresql.org/pgsql-hackers/2007-03/msg00671.php

Bug report and patch by Michael Fuhr.
This commit is contained in:
Alvaro Herrera
2007-03-11 05:22:00 +00:00
parent 5acde74e1a
commit 576027bb3f
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/utils/adt/dbsize.c
View File

@ -5,7 +5,7 @@
* Copyright (c) 2002-2007, PostgreSQL Global Development Group * Copyright (c) 2002-2007, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.11 2007/02/27 23:48:07 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.12 2007/03/11 05:22:00 alvherre Exp $
* *
*/ */
@ -52,10 +52,14 @@ db_dir_size(const char *path)
snprintf(filename, MAXPGPATH, "%s/%s", path, direntry->d_name); snprintf(filename, MAXPGPATH, "%s/%s", path, direntry->d_name);
if (stat(filename, &fst) < 0) if (stat(filename, &fst) < 0)
ereport(ERROR, {
(errcode_for_file_access(), if (errno == ENOENT)
errmsg("could not stat file \"%s\": %m", filename))); continue;
else
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not stat file \"%s\": %m", filename)));
}
dirsize += fst.st_size; dirsize += fst.st_size;
} }
@ -174,9 +178,14 @@ calculate_tablespace_size(Oid tblspcOid)
snprintf(pathname, MAXPGPATH, "%s/%s", tblspcPath, direntry->d_name); snprintf(pathname, MAXPGPATH, "%s/%s", tblspcPath, direntry->d_name);
if (stat(pathname, &fst) < 0) if (stat(pathname, &fst) < 0)
ereport(ERROR, {
(errcode_for_file_access(), if (errno == ENOENT)
errmsg("could not stat file \"%s\": %m", pathname))); continue;
else
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not stat file \"%s\": %m", pathname)));
}
if (fst.st_mode & S_IFDIR) if (fst.st_mode & S_IFDIR)
totalsize += db_dir_size(pathname); totalsize += db_dir_size(pathname);