Fix some of the documented defaults for slon configuration values

Patch from  Richard Yen <richard.yen@enterprisedb.com>

10 files changed, 24 insertions, 24 deletions

diff --git a/clustertest/conf/slon.1.conf.sample b/clustertest/conf/slon.1.conf.sample
index e5cc2cdc..dcac5157 100644
--- a/clustertest/conf/slon.1.conf.sample
+++ b/clustertest/conf/slon.1.conf.sample
@@ -32,7 +32,7 @@ sync_interval_timeout=2000
 # a smaller batch.  And if there is only one SYNC available, even -g60 
 # will apply just that one. As soon as a subscriber catches up, it will 
 # apply every single SYNC by itself.
-# Range:  [0,100], default: 6
+# Range:  [0,10000], default: 20
 sync_group_maxsize=5
 
 # Size above which an sl_log_? row's log_cmddata is considered large.
diff --git a/clustertest/conf/slon.2.conf.sample b/clustertest/conf/slon.2.conf.sample
index e5cc2cdc..dcac5157 100644
--- a/clustertest/conf/slon.2.conf.sample
+++ b/clustertest/conf/slon.2.conf.sample
@@ -32,7 +32,7 @@ sync_interval_timeout=2000
 # a smaller batch.  And if there is only one SYNC available, even -g60 
 # will apply just that one. As soon as a subscriber catches up, it will 
 # apply every single SYNC by itself.
-# Range:  [0,100], default: 6
+# Range:  [0,10000], default: 20
 sync_group_maxsize=5
 
 # Size above which an sl_log_? row's log_cmddata is considered large.
diff --git a/clustertest/conf/slon.3.conf.sample b/clustertest/conf/slon.3.conf.sample
index e5cc2cdc..dcac5157 100644
--- a/clustertest/conf/slon.3.conf.sample
+++ b/clustertest/conf/slon.3.conf.sample
@@ -32,7 +32,7 @@ sync_interval_timeout=2000
 # a smaller batch.  And if there is only one SYNC available, even -g60 
 # will apply just that one. As soon as a subscriber catches up, it will 
 # apply every single SYNC by itself.
-# Range:  [0,100], default: 6
+# Range:  [0,10000], default: 20
 sync_group_maxsize=5
 
 # Size above which an sl_log_? row's log_cmddata is considered large.
diff --git a/clustertest/conf/slon.4.conf.sample b/clustertest/conf/slon.4.conf.sample
index e5cc2cdc..dcac5157 100644
--- a/clustertest/conf/slon.4.conf.sample
+++ b/clustertest/conf/slon.4.conf.sample
@@ -32,7 +32,7 @@ sync_interval_timeout=2000
 # a smaller batch.  And if there is only one SYNC available, even -g60 
 # will apply just that one. As soon as a subscriber catches up, it will 
 # apply every single SYNC by itself.
-# Range:  [0,100], default: 6
+# Range:  [0,10000], default: 20
 sync_group_maxsize=5
 
 # Size above which an sl_log_? row's log_cmddata is considered large.
diff --git a/clustertest/conf/slon.5.conf.sample b/clustertest/conf/slon.5.conf.sample
index e5cc2cdc..dcac5157 100644
--- a/clustertest/conf/slon.5.conf.sample
+++ b/clustertest/conf/slon.5.conf.sample
@@ -32,7 +32,7 @@ sync_interval_timeout=2000
 # a smaller batch.  And if there is only one SYNC available, even -g60 
 # will apply just that one. As soon as a subscriber catches up, it will 
 # apply every single SYNC by itself.
-# Range:  [0,100], default: 6
+# Range:  [0,10000], default: 20
 sync_group_maxsize=5
 
 # Size above which an sl_log_? row's log_cmddata is considered large.
diff --git a/doc/adminguide/slon.sgml b/doc/adminguide/slon.sgml
index c1296874..e9942382 100644
--- a/doc/adminguide/slon.sgml
+++ b/doc/adminguide/slon.sgml
@@ -170,7 +170,7 @@
     <listitem>
      <para>
       This controls the maximum <command>SYNC</command> group size,
-      <envar>sync_group_maxsize</envar>; defaults to 6.  Thus, if a
+      <envar>sync_group_maxsize</envar>; defaults to 20.  Thus, if a
       particular node is behind by 200 <command>SYNC</command>s, it
       will try to group them together into groups of a maximum size of
       <envar>sync_group_maxsize</envar>.  This can be expected to
@@ -178,7 +178,7 @@
       <command>COMMIT</command>.
      </para>
      <para>
-      The default of 6 is probably suitable for small systems that can
+      The default of 20 is probably suitable for small systems that can
       devote only very limited bits of memory to
       <application>slon</application>.  If you have plenty of memory,
       it would be reasonable to increase this, as it will increase the
diff --git a/doc/adminguide/slonconf.sgml b/doc/adminguide/slonconf.sgml
index 2b7f3847..e59a5b74 100644
--- a/doc/adminguide/slonconf.sgml
+++ b/doc/adminguide/slonconf.sgml
@@ -370,7 +370,7 @@
       </indexterm>
       <listitem>
         <para>Check for updates at least this often in milliseconds. 
-          Range: [10-60000], default 100
+          Range: [10-60000], default 2000
         </para>
 
         <para> This parameter is primarily of concern on nodes that
@@ -403,7 +403,7 @@
           high frequent <option>-s</option> check won't detect that.
           Thus, the need for
           <envar>sync_interval_timeout</envar>. Range: [0-120000],
-          default 1000
+          default 10000
         </para>
 
         <para> This parameter is likely to be primarily of concern on
diff --git a/src/slon/slon.c b/src/slon/slon.c
index 78b46e7d..7ae61392 100644
--- a/src/slon/slon.c
+++ b/src/slon/slon.c
@@ -111,10 +111,10 @@ Usage(char *const argv[])
 	fprintf(stderr, "    -h                    print usage message and exit\n");
 	fprintf(stderr, "    -v                    print version and exit\n");
 	fprintf(stderr, "    -d <debuglevel>       verbosity of logging (1..4)\n");
-	fprintf(stderr, "    -s <milliseconds>     SYNC check interval (default 10000)\n");
-	fprintf(stderr, "    -t <milliseconds>     SYNC interval timeout (default 60000)\n");
+	fprintf(stderr, "    -s <milliseconds>     SYNC check interval (default 2000)\n");
+	fprintf(stderr, "    -t <milliseconds>     SYNC interval timeout (default 10000)\n");
 	fprintf(stderr, "    -o <milliseconds>     desired subscriber SYNC processing time\n");
-	fprintf(stderr, "    -g <num>              maximum SYNC group size (default 6)\n");
+	fprintf(stderr, "    -g <num>              maximum SYNC group size (default 20)\n");
 	fprintf(stderr, "    -c <num>              how often to vacuum in cleanup cycles\n");
 	fprintf(stderr, "    -p <filename>         slon pid file\n");
 	fprintf(stderr, "    -f <filename>         slon configuration file\n");
diff --git a/tools/mkservice/slon-mkservice.sh b/tools/mkservice/slon-mkservice.sh
index 1b00ec22..6a1546dc 100644
--- a/tools/mkservice/slon-mkservice.sh
+++ b/tools/mkservice/slon-mkservice.sh
@@ -250,8 +250,8 @@ log_timestamp  0    # multilog will insert a tai64n timestamp
 # Event Tuning
 
 # Check for updates at least this often in milliseconds.
-# Range: [10-60000], default 100
-#sync_interval 100 
+# Range: [10-60000], default 2000
+#sync_interval=2000
 
 # Maximum amount of time in milliseconds before issuing a SYNC event, 
 # This prevents a possible race condition in which the action sequence is
@@ -263,16 +263,16 @@ log_timestamp  0    # multilog will insert a tai64n timestamp
 # activity suddenly stops, there will be no more sequence bumps, so the
 # high frequent -s check won't detect that. Thus, the need for
 # sync_interval_timeout.
-# Range: [0-120000], default 1000
-#sync_interval_timeout 1000 
+# Range: [0-120000], default 10000
+#sync_interval_timeout=10000
 
 # Maximum number of SYNC events to group together when/if a subscriber falls
 # behind. SYNCs are batched only if there are that many available and if they
 # are contiguous. Every other event type in between leads to a smaller batch.
 # And if there is only one SYNC available, even -g60 will apply just that one.
 # As soon as a subscriber catches up, it will apply every single SYNC by itself.
-# Range: [0,10000], default: 6
-#sync_group_maxsize 6
+# Range:  [0,100], default: 20
+#sync_group_maxsize=20
 
 # Sets how many cleanup cycles to run before a vacuum is done. 0 disables the
 # builtin vacuum, intended to be used with the pg_autovacuum daemon.
diff --git a/tools/mkslonconf.sh b/tools/mkslonconf.sh
index 20ba3ba1..58ec8a6c 100755
--- a/tools/mkslonconf.sh
+++ b/tools/mkslonconf.sh
@@ -36,12 +36,12 @@ cat <<_EOF_ > $conffile
 # Range: [0,100], default: 3
 #vac_frequency=3
 
-# Debug log level (higher value ==> more output).  Range: [0,4], default 2
+# Debug log level (higher value ==> more output).  Range: [0,4], default 0
 #log_level=2
 
 # Check for updates at least this often in milliseconds.
-# Range: [10-60000], default 100
-#sync_interval=1000
+# Range: [10-60000], default 2000
+#sync_interval=2000
 
 # Maximum amount of time in milliseconds before issuing a SYNC event, 
 # This prevents a possible race condition in which the action sequence 
@@ -53,7 +53,7 @@ cat <<_EOF_ > $conffile
 # next SYNC.  But if all application activity suddenly stops, 
 # there will be no more sequence bumps, so the high frequent -s check 
 # won't detect that.  Thus, the need for sync_interval_timeout.
-# Range: [0-120000], default 1000
+# Range: [0-120000], default 10000
 #sync_interval_timeout=10000
 
 # Maximum number of SYNC events to group together when/if a subscriber
@@ -62,8 +62,8 @@ cat <<_EOF_ > $conffile
 # a smaller batch.  And if there is only one SYNC available, even -g60 
 # will apply just that one. As soon as a subscriber catches up, it will 
 # apply every single SYNC by itself.
-# Range:  [0,100], default: 6
-#sync_group_maxsize=6
+# Range:  [0,100], default: 20
+#sync_group_maxsize=20
 
 # Size above which an sl_log_? row's log_cmddata is considered large.
 # Up to 500 rows of this size are allowed in memory at once. Rows larger