Fix configuration change timing regarding memory_cache_enabled.

This parameter must not be changed after Pgpool-II start but it was
possible to change by reloading.

diff --git a/src/config/pool_config.l b/src/config/pool_config.l
index 0780a2f7bbf9bb945093fb384288bddc596ca001..2871fd38e7e67dd256fa4137fb7c36ad30b8cc65 100644 (file)
--- a/src/config/pool_config.l
+++ b/src/config/pool_config.l
@@ -3020,7 +3020,7 @@ int pool_get_config(char *confpath, POOL_CONFIG_CONTEXT context)
                }
 
         else if (!strcmp(key, "memory_cache_enabled") &&
-                 CHECK_CONTEXT(INIT_CONFIG|RELOAD_CONFIG, context))
+                 CHECK_CONTEXT(INIT_CONFIG, context))
         {
             int v = eval_logical(yytext);
 

diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
index cb216024975d278fe80ca58b4c650d5d604a52b0..36d895bb97559df656faf95e2c943910076d0aaa 100644 (file)
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -644,6 +644,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default

diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
index dc8ff298092491fa2128645da5b39a73f55918a4..88961b0d8895aa1ca32c4c1fde19939fa22a911b 100644 (file)
--- a/src/sample/pgpool.conf.sample-master-slave
+++ b/src/sample/pgpool.conf.sample-master-slave
@@ -643,6 +643,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default

diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index af9fe3afbfbb31554e2a215574d27c4ad44e47a3..1da84636e3c9f491b7a3fa91c3705b03be17c48c 100644 (file)
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -642,6 +642,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default

diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index f80bce4fcb55b32c4444c326a315801baed48589..057266a399b84bd5392128d4cc33703d3d11ab0e 100644 (file)
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -643,6 +643,7 @@ check_unlogged_table = on
 #------------------------------------------------------------------------------
 memory_cache_enabled = off
                                                                   # If on, use the memory cache functionality, off by default
+                                   # (change requires restart)
 memqcache_method = 'shmem'
                                                                   # Cache storage method. either 'shmem'(shared memory) or
                                                                   # 'memcached'. 'shmem' by default