Index: pgpool.conf.sample
===================================================================
RCS file: /cvsroot/pgpool/pgpool-II/pgpool.conf.sample,v
retrieving revision 1.46
diff -c -r1.46 pgpool.conf.sample
*** pgpool.conf.sample	1 Jul 2011 10:47:14 -0000	1.46
--- pgpool.conf.sample	6 Jul 2011 10:49:30 -0000
***************
*** 50,60 ****
--- 50,64 ----
  #backend_port0 = 5432              # Port number for backend 0
  #backend_weight0 = 1               # Weight for backend 0 (only in load balancing mode)
  #backend_data_directory0 = '/data' # Data directory for backend 0
+ #backend_flag0 = 'ALLOW_TO_FAILOVER'
+                                    # Controls various backend behavior
+                                    # ALLOW_TO_FAILOVER or DISALLOW_TO_FAILOVER
  
  #backend_hostname1 = 'host2'
  #backend_port1 = 5433
  #backend_weight1 = 1
  #backend_data_directory1 = '/data1'
+ #backend_flag1 = 'ALLOW_TO_FAILOVER'
  
  # - Authentication -
  
***************
*** 148,154 ****
  
  
  #------------------------------------------------------------------------------
! # CONNECTION POOLING MODE
  #------------------------------------------------------------------------------
  
  connection_cache = on              # Activate connection pools
--- 152,158 ----
  
  
  #------------------------------------------------------------------------------
! # CONNECTION POOLING
  #------------------------------------------------------------------------------
  
  connection_cache = on              # Activate connection pools
***************
*** 187,217 ****
                                     # On disagreement with the packet kind
                                     # sent from backend, degenerate the node
                                     # which is most likely "minority"
!                                    # If false, just force to exit this session
  
  failover_if_affected_tuples_mismatch = off
                                     # On disagreement with the number of affected
                                     # tuples in UPDATE/DELETE queries, then
                                     # degenerate the node which is most likely
                                     # "minority".
!                                    # If false, just abort the transaction to
                                     # keep the consistency
  
- # - Online recovery -
- 
- recovery_user = 'nobody'           # Online recovery user
- recovery_password = ''             # Online recovery password
- recovery_1st_stage_command = ''    # Executes a command in first stage
- recovery_2nd_stage_command = ''    # Executes a command in second stage
- recovery_timeout = 90              # Timeout in seconds to wait for the
-                                    # recovering node's postmaster to start up
-                                    # 0 means no wait
- client_idle_limit_in_recovery = 0  # Client is disconnected after being idle
-                                    # for that many seconds in the second stage
-                                    # of online recovery
-                                    # 0 means no disconnection
-                                    # -1 means immediate disconnection
- 
  
  #------------------------------------------------------------------------------
  # LOAD BALANCING MODE
--- 191,206 ----
                                     # On disagreement with the packet kind
                                     # sent from backend, degenerate the node
                                     # which is most likely "minority"
!                                    # If off, just force to exit this session
  
  failover_if_affected_tuples_mismatch = off
                                     # On disagreement with the number of affected
                                     # tuples in UPDATE/DELETE queries, then
                                     # degenerate the node which is most likely
                                     # "minority".
!                                    # If off, just abort the transaction to
                                     # keep the consistency
  
  
  #------------------------------------------------------------------------------
  # LOAD BALANCING MODE
***************
*** 247,263 ****
                                     # Disabled (0) by default
                                     # Health check should be enabled
  
- # - Health check -
- 
- health_check_period = 0            # Health check period
-                                    # Disabled (0) by default
- health_check_timeout = 20          # Health check timeout
-                                    # 0 means no timeout
- health_check_user = 'nobody'       # Health check user
- 
  # - Special commands -
  
! failover_command = ''              # Executes this command at failover
                                     # Special values:
                                     #   %d = node id
                                     #   %h = host name
--- 236,244 ----
                                     # Disabled (0) by default
                                     # Health check should be enabled
  
  # - Special commands -
  
! follow_master_command = ''         # Executes this command after master failover
                                     # Special values:
                                     #   %d = node id
                                     #   %h = host name
***************
*** 268,274 ****
                                     #   %M = old master node id
                                     #   %P = old primary node id
                                     #   %% = '%' character
! failback_command = ''              # Executes this command at failback.
                                     # Special values:
                                     #   %d = node id
                                     #   %h = host name
--- 249,294 ----
                                     #   %M = old master node id
                                     #   %P = old primary node id
                                     #   %% = '%' character
! 
! 
! #------------------------------------------------------------------------------
! # PARALLEL MODE AND QUERY CACHE
! #------------------------------------------------------------------------------
! 
! parallel_mode = off                # Activates parallel query mode
!                                    # (change requires restart)
! enable_query_cache = off           # Activates query cache
!                                    # (change requires restart)
! 
! pgpool2_hostname = ''              # Set pgpool2 hostname 
!                                    # (change requires restart)
! 
! # - System DB info -
! 
! system_db_hostname  = 'localhost'   # (change requires restart)
! system_db_port = 5432               # (change requires restart)
! system_db_dbname = 'pgpool'         # (change requires restart)
! system_db_schema = 'pgpool_catalog' # (change requires restart)
! system_db_user = 'pgpool'           # (change requires restart)
! system_db_password = ''             # (change requires restart)
! 
! 
! #------------------------------------------------------------------------------
! # HEALTH CHECK
! #------------------------------------------------------------------------------
! 
! health_check_period = 0            # Health check period
!                                    # Disabled (0) by default
! health_check_timeout = 20          # Health check timeout
!                                    # 0 means no timeout
! health_check_user = 'nobody'       # Health check user
! 
! 
! #------------------------------------------------------------------------------
! # FAILOVER AND FAILBACK
! #------------------------------------------------------------------------------
! 
! failover_command = ''              # Executes this command at failover
                                     # Special values:
                                     #   %d = node id
                                     #   %h = host name
***************
*** 279,285 ****
                                     #   %M = old master node id
                                     #   %P = old primary node id
                                     #   %% = '%' character
! follow_master_command = ''         # Executes this command after master failover.
                                     # Special values:
                                     #   %d = node id
                                     #   %h = host name
--- 299,305 ----
                                     #   %M = old master node id
                                     #   %P = old primary node id
                                     #   %% = '%' character
! failback_command = ''              # Executes this command at failback.
                                     # Special values:
                                     #   %d = node id
                                     #   %h = host name
***************
*** 295,332 ****
                                     # backend communication socket fails
                                     # This is the same behaviour of pgpool-II
                                     # 2.2.x and previous releases
!                                    # If set to false, pgpool will report an
                                     # error and disconnect the session.
  
  
  #------------------------------------------------------------------------------
! # PARALLEL AND QUERY CACHE MODE
  #------------------------------------------------------------------------------
  
! parallel_mode = off                # Activates parallel query mode
!                                    # (change requires restart)
! enable_query_cache = off           # Activates query cache
!                                    # (change requires restart)
  
- pgpool2_hostname = ''              # Set pgpool2 hostname 
-                                    # (change requires restart)
  
! # - System DB info -
  
! system_db_hostname  = 'localhost'   # (change requires restart)
! system_db_port = 5432               # (change requires restart)
! system_db_dbname = 'pgpool'         # (change requires restart)
! system_db_schema = 'pgpool_catalog' # (change requires restart)
! system_db_user = 'pgpool'           # (change requires restart)
! system_db_password = ''             # (change requires restart)
  
- # Life time of relation cache in seconds. 0 means no cache
- # expiration(the default).
- # The relation cache is used for cache the query result against PostgreSQL
- # system catalog to obtain various information including table structures
- # or if it's a temporary table or not. The cache is maintained in a pgpool
- # child local memory and being kept as long as it survives.
- # If someone modify the table by using ALTER TABLE or some such, the relcache
- # is not consistent anymore.
- # For this purpose, cache_expiration controls the life time of the cache.
- relcache_expire = 0
--- 315,358 ----
                                     # backend communication socket fails
                                     # This is the same behaviour of pgpool-II
                                     # 2.2.x and previous releases
!                                    # If set to off, pgpool will report an
                                     # error and disconnect the session.
  
  
  #------------------------------------------------------------------------------
! # ONLINE RECOVERY
  #------------------------------------------------------------------------------
  
! recovery_user = 'nobody'           # Online recovery user
! recovery_password = ''             # Online recovery password
! recovery_1st_stage_command = ''    # Executes a command in first stage
! recovery_2nd_stage_command = ''    # Executes a command in second stage
! recovery_timeout = 90              # Timeout in seconds to wait for the
!                                    # recovering node's postmaster to start up
!                                    # 0 means no wait
! client_idle_limit_in_recovery = 0  # Client is disconnected after being idle
!                                    # for that many seconds in the second stage
!                                    # of online recovery
!                                    # 0 means no disconnection
!                                    # -1 means immediate disconnection
  
  
! #------------------------------------------------------------------------------
! # OTHERS
! #------------------------------------------------------------------------------
  
! relcache_expire = 0                # Life time of relation cache in seconds.
!                                    # 0 means no cache expiration(the default).
!                                    # The relation cache is used for cache the
!                                    # query result against PostgreSQL system
!                                    # catalog to obtain various information
!                                    # including table structures or if it's a
!                                    # temporary table or not. The cache is
!                                    # maintained in a pgpool child local memory
!                                    # and being kept as long as it survives.
!                                    # If someone modify the table by using
!                                    # ALTER TABLE or some such, the relcache is
!                                    # not consistent anymore.
!                                    # For this purpose, cache_expiration
!                                    # controls the life time of the cache.
  
