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/doc.ja/src/sgml/memcache.sgml b/doc.ja/src/sgml/memcache.sgml
index ee9c4316a2d02686a7412f02801ec42acc486eea..6ec5e3997cf81e21b3a184eb8c311d4d5d557c2e 100644 (file)
--- a/doc.ja/src/sgml/memcache.sgml
+++ b/doc.ja/src/sgml/memcache.sgml
@@ -109,9 +109,9 @@ from the in memory cache is extremely fast.
        </para>
        <para>
          <!--
-              This parameter can be changed by reloading the <productname>Pgpool-II</> configurations.
+            This parameter can only be set at server start.
            -->
-         このパラメータは<productname>Pgpool-II</>の設定を再読み込みすることで変更可能です。
+         このパラメータはサーバ起動時にのみ設定可能です。
 </para>
 </listitem>
 </varlistentry>

diff --git a/doc/src/sgml/memcache.sgml b/doc/src/sgml/memcache.sgml
index 640f2a56ecc90924f13201ca62436de8593ad91d..0983b4a430a988138d78096d7b8ec81ff8bae7ae 100644 (file)
--- a/doc/src/sgml/memcache.sgml
+++ b/doc/src/sgml/memcache.sgml
@@ -67,8 +67,7 @@
            Default is off.
          </para>
          <para>
-            This parameter can be changed by reloading
-            the <productname>Pgpool-II</productname> configurations.
+            This parameter can only be set at server start.
          </para>
        </listitem>
       </varlistentry>

diff --git a/src/config/pool_config_variables.c b/src/config/pool_config_variables.c
index 8a6c83b73f2a45d734b28d70d428f8e9f5292d75..4e0fffe63f8f1096148a6892b310407cd16669ef 100644 (file)
--- a/src/config/pool_config_variables.c
+++ b/src/config/pool_config_variables.c
@@ -499,7 +499,7 @@ static struct config_bool ConfigureNamesBool[] =
        },
 
        {
-               {"memory_cache_enabled", CFGCXT_RELOAD, CACHE_CONFIG,
+               {"memory_cache_enabled", CFGCXT_INIT, CACHE_CONFIG,
                        "Enables the memory cache functionality.",
                        CONFIG_VAR_TYPE_BOOL, false, 0
                },

diff --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
index 2e7497a1ce80feea066573271a95b8559afe98d6..7c6b763a6b613da1563d87dc0599626efaed422b 100644 (file)
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -747,6 +747,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-logical b/src/sample/pgpool.conf.sample-logical
index 24d7c539ec77c5ff67c6198181f15d8b780c2332..7dc4ed2867fa7e67c940c38ddfdc856598c0aacb 100644 (file)
--- a/src/sample/pgpool.conf.sample-logical
+++ b/src/sample/pgpool.conf.sample-logical
@@ -725,6 +725,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 f89adbfd76a7e1c0539a0b81f8f2444458eb9257..a0195f7787bbf20097e669f5c38ab0417efd3e81 100644 (file)
--- a/src/sample/pgpool.conf.sample-master-slave
+++ b/src/sample/pgpool.conf.sample-master-slave
@@ -745,6 +745,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 256db784ba61b7c3711407048fa55c004145add0..6fef5d8062664d8e2e4feb61b1fda5a939b88da9 100644 (file)
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -744,6 +744,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 4f55eff469df674e8479231a64df9ba068b29f77..b45147383b00c54295cbfa632b70d35992c0b343 100644 (file)
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -744,6 +744,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