Commit 130713fa authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Add new configure variable BIGDB, to turn on the bigger DB settings

we already use on the mothership. Enable for the APT cluster.
parent fdaa6df8
...@@ -698,6 +698,7 @@ OPSVM_MOUNTPOINT ...@@ -698,6 +698,7 @@ OPSVM_MOUNTPOINT
OPSVM_ENABLE OPSVM_ENABLE
NEEDMCQUERIER NEEDMCQUERIER
TBUSEDBI TBUSEDBI
BIGDB
SELFLOADER_DATA SELFLOADER_DATA
IMPORT_TMPDIR IMPORT_TMPDIR
NOSHAREDFS NOSHAREDFS
...@@ -5035,6 +5036,7 @@ CLIENT_MANDIR="/usr/local/man" ...@@ -5035,6 +5036,7 @@ CLIENT_MANDIR="/usr/local/man"
TBSECURECOOKIES=1 TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
TBUSEDBI=0 TBUSEDBI=0
BIGDB=0
FANCYBANNER=0 FANCYBANNER=0
VIRTNODE_NETWORK=172.16.0.0 VIRTNODE_NETWORK=172.16.0.0
VIRTNODE_NETMASK=255.240.0.0 VIRTNODE_NETMASK=255.240.0.0
......
...@@ -273,6 +273,7 @@ AC_SUBST(NOSHAREDFS) ...@@ -273,6 +273,7 @@ AC_SUBST(NOSHAREDFS)
AC_SUBST(IMPORT_TMPDIR) AC_SUBST(IMPORT_TMPDIR)
AC_SUBST(SELFLOADER_DATA) AC_SUBST(SELFLOADER_DATA)
AC_SUBST(TBUSEDBI) AC_SUBST(TBUSEDBI)
AC_SUBST(BIGDB)
AC_SUBST(NEEDMCQUERIER) AC_SUBST(NEEDMCQUERIER)
AC_SUBST(OPSVM_ENABLE) AC_SUBST(OPSVM_ENABLE)
AC_SUBST(OPSVM_MOUNTPOINT) AC_SUBST(OPSVM_MOUNTPOINT)
...@@ -361,6 +362,7 @@ CLIENT_MANDIR="/usr/local/man" ...@@ -361,6 +362,7 @@ CLIENT_MANDIR="/usr/local/man"
TBSECURECOOKIES=1 TBSECURECOOKIES=1
TBMAINSITE=0 TBMAINSITE=0
TBUSEDBI=0 TBUSEDBI=0
BIGDB=0
FANCYBANNER=0 FANCYBANNER=0
VIRTNODE_NETWORK=172.16.0.0 VIRTNODE_NETWORK=172.16.0.0
VIRTNODE_NETMASK=255.240.0.0 VIRTNODE_NETMASK=255.240.0.0
......
...@@ -66,6 +66,7 @@ TBCOOKIESUFFIX="APT" ...@@ -66,6 +66,7 @@ TBCOOKIESUFFIX="APT"
# Start a multicast IGMP querier # Start a multicast IGMP querier
NEEDMCQUERIER=0 NEEDMCQUERIER=0
TBUSEDBI=1 TBUSEDBI=1
BIGDB=1
# #
# SSL Certificate stuff. Used to customize config files in ssl directory. # SSL Certificate stuff. Used to customize config files in ssl directory.
# Note that OrganizationalUnit is set in the cnf file. # Note that OrganizationalUnit is set in the cnf file.
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# KEYWORD: shutdown # KEYWORD: shutdown
MAINSITE="@TBMAINSITE@" MAINSITE="@TBMAINSITE@"
BIGDB="@BIGDB@"
# On FreeBSD 6.X we need to wrap the wrapper with daemon to prevent HUP signal # On FreeBSD 6.X we need to wrap the wrapper with daemon to prevent HUP signal
fbsdvers=`uname -v | sed -e 's/FreeBSD \([0-9][0-9]*\).*/FreeBSD\1/'` fbsdvers=`uname -v | sed -e 's/FreeBSD \([0-9][0-9]*\).*/FreeBSD\1/'`
...@@ -16,11 +17,11 @@ major=${majmin%%.*} ...@@ -16,11 +17,11 @@ major=${majmin%%.*}
minor=${majmin##*.} minor=${majmin##*.}
opts="-O long_query_time=2 --skip-innodb" opts="-O long_query_time=2 --skip-innodb"
if [ $MAINSITE == "0" ]; then if [ $MAINSITE == "0" -a $BIGDB == "0" ]; then
opts="-O key_buffer=32M -O table_cache=128 -O sort_buffer=2M" opts="$opts -O key_buffer=32M -O table_cache=128 -O sort_buffer=2M"
opts="$opts -O record_buffer=1M -O max_connections=250" opts="$opts -O record_buffer=1M -O max_connections=250"
else else
opts="-O key_buffer=256M -O table_cache=256 -O sort_buffer=4M" opts="$opts -O key_buffer=256M -O table_cache=256 -O sort_buffer=4M"
opts="$opts -O record_buffer=1M -O query_cache_size=16M" opts="$opts -O record_buffer=1M -O query_cache_size=16M"
opts="$opts -O join_buffer_size=256K -O thread_cache_size=4" opts="$opts -O join_buffer_size=256K -O thread_cache_size=4"
opts="$opts -O tmp_table_size=32M -O max_heap_table_size=32M" opts="$opts -O tmp_table_size=32M -O max_heap_table_size=32M"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment