Two years ago Magnus submitted a patch to parse all the configuration
files in a directory. After some discussion I tried to summarize what I
thought the most popular ideas were for moving that forward:
http://archives.postgresql.org/pgsql-hackers/2009-10/msg01452.php
http://archives.postgresql.org/pgsql-hackers/2009-10/msg01631.php
And I've now cleared the bit rot and updated that patch to do what was
discussed. Main feature set:
-Called by specifying "includedir <directory>". No changes to the
shipped postgresql.conf yet.
-Takes an input directory name
-If it's not an absolute path, considers that relative to the -D option
(if specified) or PGDATA, the same logic used to locate the
postgresql.conf (unless a full path to it is used)
-Considers all names in that directory that end with *.conf [Discussion
concluded more flexibility here would be of limited value relative to
how it complicates the implementation]
-Loops over the files found in sorted order by name
The idea here is that it will be easier to write tools that customize
the database configuration if they can just write a new file out, rather
than needing to parse the whole configuration file first. This would
allow Apache style configuration directories. My end goal here is to
see all of the work initdb does pushed into a new file included by this
scheme. People could then expect a functionally empty postgresql.conf
except for an includedir, and the customization would go into 00initdb.
Getting some agreement on that is not necessary for this feature to go
in though; one step at a time.
Here's an example showing this working, including rejection of a
spurious editor backup file in the directory:
$ cat $PGDATA/postgresql.conf | grep ^work_mem
$ tail -n 1 $PGDATA/postgresql.conf
includedir='conf.d'
$ ls $PGDATA/conf.d
00config.conf 00config.conf~
$ cat $PGDATA/conf.d/00config.conf
work_mem=4MB
$ cat $PGDATA/conf.d/00config.conf~
work_mem=2MB
$ psql -c "select name,setting,sourcefile,sourceline from pg_settings
where name='work_mem'"
name | setting |
sourcefile | sourceline
----------+---------+-------------------------------------------------------+------------
work_mem | 4096 |
/home/gsmith/pgwork/data/confdir/conf.d/00config.conf | 1
No docs in here yet. There's one ugly bit of code here I was hoping
(but failed) to avoid. Right now the server doesn't actually save the
configuration directory anywhere. Once you leave the initial read in
SelectConfigFiles, that information is gone, and you only have the
configfile. I decided to make that configdir into a global value.
Seemed easier than trying to pass it around, given how many SIGHUP paths
could lead to this new code.
I can see some potential confusion here in one case. Let's say someone
specifies a full path to their postgresql.conf file. They might assume
that the includedir was relative to the directory that file is in.
Let's say configfile is /etc/sysconfig/pgsql/postgresql.conf ; a user
might think that "includedir conf.d" from there would reference
/etc/sysconfig/pgsql/conf.d instead of the $PGDATA/conf.d you actually
get. Wavering on how to handle that is one reason I didn't try
documenting this yet, the decision I made here may not actually be the
right one.
--
Greg Smith 2ndQuadrant US g...@2ndquadrant.com Baltimore, MD
PostgreSQL Training, Services, and 24x7 Support www.2ndQuadrant.us
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index a094c7a..25e1a07 100644
*** a/src/backend/utils/misc/guc-file.l
--- b/src/backend/utils/misc/guc-file.l
*************** ParseConfigFp(FILE *fp, const char *conf
*** 512,518 ****
}
/* OK, process the option name and value */
! if (guc_name_compare(opt_name, "include") == 0)
{
/*
* An include directive isn't a variable and should be processed
--- 512,535 ----
}
/* OK, process the option name and value */
! if (guc_name_compare(opt_name, "includedir") == 0)
! {
! /*
! * An includedir directive isn't a variable and should be processed
! * immediately.
! */
! unsigned int save_ConfigFileLineno = ConfigFileLineno;
!
! if (!ParseConfigDirectory(opt_value, config_file,
! depth + 1, elevel,
! head_p, tail_p))
! OK = false;
! yy_switch_to_buffer(lex_buffer);
! ConfigFileLineno = save_ConfigFileLineno;
! pfree(opt_name);
! pfree(opt_value);
! }
! else if (guc_name_compare(opt_name, "include") == 0)
{
/*
* An include directive isn't a variable and should be processed
*************** ParseConfigFp(FILE *fp, const char *conf
*** 599,604 ****
--- 616,727 ----
return OK;
}
+ static int
+ comparestr(const void *a, const void *b)
+ {
+ return strcmp(*(char **) a, *(char **) b);
+ }
+
+ /*
+ * Read and parse all config files in a subdirectory in alphabetical order
+ */
+ bool
+ ParseConfigDirectory(const char *includedir,
+ const char *calling_file,
+ int depth, int elevel,
+ ConfigVariable **head_p,
+ ConfigVariable **tail_p)
+ {
+ DIR *d;
+ struct dirent *de;
+ char directory[MAXPGPATH];
+ char **filenames = NULL;
+ int num_filenames = 0;
+ int size_filenames = 0;
+ bool status;
+
+ if (is_absolute_path(includedir))
+ sprintf(directory, "%s", includedir);
+ else
+ sprintf(directory, "%s/%s", configdir, includedir);
+ d = AllocateDir(directory);
+ if (d == NULL)
+ {
+ /*
+ * Not finding the configuration directory is not fatal, because we
+ * still have the main postgresql.conf file. Return true so the
+ * complete config parsing doesn't fail in this case. Also avoid
+ * logging this, since it can be a normal situtation.
+ */
+ return true;
+ }
+
+ /*
+ * Read the directory and put the filenames in an array, so we can sort
+ * them prior to processing the contents.
+ */
+ while ((de = ReadDir(d, directory)) != NULL)
+ {
+ struct stat st;
+ char filename[MAXPGPATH];
+
+ /*
+ * Only parse files with names ending in ".conf".
+ * This automatically excludes things like "." and "..", as well
+ * as backup files and editor debris.
+ */
+ if (strlen(de->d_name) < 6)
+ continue;
+ if (strcmp(de->d_name + strlen(de->d_name) - 5, ".conf") != 0)
+ continue;
+
+ snprintf(filename, MAXPGPATH, "%s/%s", directory, de->d_name);
+ if (stat(filename, &st) == 0)
+ {
+ if (!S_ISDIR(st.st_mode))
+ {
+ /* Add file to list */
+ if (num_filenames == size_filenames)
+ {
+ /* Increase size of array in blocks of 32 */
+ size_filenames += 32;
+ filenames = guc_realloc(elevel, filenames, size_filenames * sizeof(char *));
+ }
+ filenames[num_filenames] = strdup(filename);
+ num_filenames++;
+ }
+ }
+ }
+ if (num_filenames > 0)
+ {
+ int i;
+ qsort(filenames, num_filenames, sizeof(char *), comparestr);
+ for (i = 0; i < num_filenames; i++)
+ {
+ if (!ParseConfigFile(filenames[i], NULL,
+ 0, elevel,head_p, tail_p))
+ {
+ status = false;
+ goto cleanup;
+ }
+ }
+ }
+ status = true;
+
+ cleanup:
+ if (num_filenames > 0)
+ {
+ int i;
+
+ for (i = 0; i < num_filenames; i++)
+ {
+ free(filenames[i]);
+ }
+ free(filenames);
+ }
+ FreeDir(d);
+ return status;
+ }
/*
* Free a list of ConfigVariables, including the names and the values
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index da7b6d4..fc9b376 100644
*** a/src/backend/utils/misc/guc.c
--- b/src/backend/utils/misc/guc.c
*************** static int effective_io_concurrency;
*** 481,486 ****
--- 481,488 ----
/* should be static, but commands/variable.c needs to get at this */
char *role_string;
+ /* Needed for ProcessConfigFile calls, such as a config reload at SIGHUP */
+ char *configdir;
/*
* Displayable names for context types (enum GucContext)
*************** static bool validate_option_array_item(c
*** 3297,3303 ****
/*
* Some infrastructure for checking malloc/strdup/realloc calls
*/
! static void *
guc_malloc(int elevel, size_t size)
{
void *data;
--- 3299,3305 ----
/*
* Some infrastructure for checking malloc/strdup/realloc calls
*/
! void *
guc_malloc(int elevel, size_t size)
{
void *data;
*************** guc_malloc(int elevel, size_t size)
*** 3310,3316 ****
return data;
}
! static void *
guc_realloc(int elevel, void *old, size_t size)
{
void *data;
--- 3312,3318 ----
return data;
}
! void *
guc_realloc(int elevel, void *old, size_t size)
{
void *data;
*************** InitializeOneGUCOption(struct config_gen
*** 4007,4013 ****
bool
SelectConfigFiles(const char *userDoption, const char *progname)
{
- char *configdir;
char *fname;
struct stat stat_buf;
--- 4009,4014 ----
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index 8e3057a..af47e95 100644
*** a/src/include/utils/guc.h
--- b/src/include/utils/guc.h
*************** extern bool ParseConfigFp(FILE *fp, cons
*** 117,122 ****
--- 117,123 ----
int depth, int elevel,
ConfigVariable **head_p, ConfigVariable **tail_p);
extern void FreeConfigVariables(ConfigVariable *list);
+ extern char *configdir;
/*
* The possible values of an enum variable are specified by an array of
*************** extern const char *GetConfigOption(const
*** 302,307 ****
--- 303,313 ----
bool restrict_superuser);
extern const char *GetConfigOptionResetString(const char *name);
extern void ProcessConfigFile(GucContext context);
+ extern bool ParseConfigDirectory(const char *includedir,
+ const char *calling_file,
+ int depth, int elevel,
+ ConfigVariable **head_p,
+ ConfigVariable **tail_p);
extern void InitializeGUCOptions(void);
extern bool SelectConfigFiles(const char *userDoption, const char *progname);
extern void ResetAllOptions(void);
*************** extern void GUC_check_errcode(int sqlerr
*** 360,365 ****
--- 366,377 ----
/*
+ * Functions used for memory allocation in guc.
+ */
+ void *guc_malloc(int elevel, size_t size);
+ void *guc_realloc(int elevel, void *old, size_t size);
+
+ /*
* The following functions are not in guc.c, but are declared here to avoid
* having to include guc.h in some widely used headers that it really doesn't
* belong in.
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
