Skip to content

Commit

Permalink
Added release 13.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dcrudgington committed Dec 11, 2013
1 parent 6495bc8 commit 46f74e7
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 16 deletions.
8 changes: 8 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
percona-13.3.0
* Base image is base64-13.3.0 (2013Q3)
* Percona Server version is 5.6.13
* Xtrabackup version is 2.1.3
* Percona ToolKit version is 2.1.7
* Quickbackup version is 3.5
* Percona Server SMF name changed to 'percona'

percona-13.1.0
* Base image is base64-13.1.0 (2013Q1)
* Percona packages now in pkgsrc
Expand Down
16 changes: 8 additions & 8 deletions copy/var/zoneinit/includes/31-mysql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ QB_US=qb-$(zonename | awk -F\- '{ print $5 }');

# Default query to lock down access and clean up
MYSQL_INIT="DELETE from mysql.user;
DELETE FROM mysql.proxies_priv WHERE Host='base.joyent.us';
GRANT ALL on *.* to 'root'@'localhost' identified by '${MYSQL_PW}' with grant option;
GRANT ALL on *.* to 'root'@'${PRIVATE_IP:-${PUBLIC_IP}}' identified by '${MYSQL_PW}' with grant option;
GRANT LOCK TABLES,SELECT,RELOAD,SUPER,REPLICATION CLIENT on *.* to '${QB_US}'@'localhost' identified by '${QB_PW}';
DROP DATABASE test;
DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%';
FLUSH PRIVILEGES;
install plugin sphinx soname 'ha_sphinx.so';
install plugin handlersocket soname 'handlersocket.so';"
install plugin sphinx soname 'ha_sphinx.so';"

# MySQL my.cnf tuning
MEMCAP=$(kstat -c zone_memory_cap -s physcap -p | cut -f2 | awk '{ printf "%d", $1/1024/1024 }');
Expand Down Expand Up @@ -50,10 +50,10 @@ log "tuning MySQL configuration"
gsed -i \
-e "s/bind-address = 127.0.0.1/bind-address = ${PRIVATE_IP:-${PUBLIC_IP}}/" \
-e "s/back_log = 64/back_log = ${BACK_LOG}/" \
-e "s/table_cache = 512/table_cache = ${TABLE_CACHE}/" \
-e "s/table_open_cache = 512/table_open_cache = ${TABLE_CACHE}/" \
-e "s/thread_cache_size = 1000/thread_cache_size = ${THREAD_CACHE_SIZE}/" \
-e "s/max_connections = 1000/max_connections = ${MAX_CONNECTIONS}/" \
-e "s/innodb_buffer_pool_size = 256M/innodb_buffer_pool_size = ${INNODB_BUFFER_POOL_SIZE}/" \
-e "s/innodb_buffer_pool_size = 16M/innodb_buffer_pool_size = ${INNODB_BUFFER_POOL_SIZE}/" \
/opt/local/etc/my.cnf

log "configuring Quickbackup"
Expand All @@ -62,13 +62,13 @@ svccfg -s quickbackup-percona setprop quickbackup/password = astring: ${QB_PW}
svcadm refresh quickbackup-percona

log "shutting down an existing instance of MySQL"
if [[ "$(svcs -Ho state percona-server)" == "online" ]]; then
svcadm disable -t percona-server
if [[ "$(svcs -Ho state percona)" == "online" ]]; then
svcadm disable -t percona
sleep 2
fi

log "starting the new MySQL instance"
svcadm enable percona-server
svcadm enable percona

log "waiting for the socket to show up"
COUNT="0";
Expand All @@ -86,7 +86,7 @@ log "(it took ${COUNT} seconds to start properly)"

sleep 1

[[ "$(svcs -Ho state percona-server)" == "online" ]] || \
[[ "$(svcs -Ho state percona)" == "online" ]] || \
( log "ERROR MySQL SMF not reporting as 'online'" && exit 31 )

log "running the access lockdown SQL query"
Expand Down
4 changes: 2 additions & 2 deletions customize
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ set -o errexit

# Ensure we have updated standard packages
echo "* Updating standard packages.";
pkg_delete -v nodejs smtools
pkg_add -v nodejs smtools
pkg_delete -v nodejs smtools zoneinit
pkg_add -v nodejs smtools zoneinit
npm install smartdc -g
npm install jsontool -g

Expand Down
5 changes: 3 additions & 2 deletions manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name="percona"
organization="Joyent"
brand="Instance"
version="13.1.0"
description="A SmartOS 64-bit image pre-configured and optimized as a Percona 5.5.29 64-bit MySQL server with Quickbackup, Handlersocket, and Sphinx Plug-in."
version="13.3.0"
description="A SmartOS 64-bit image pre-configured and optimized as a Percona 5.6.13 64-bit MySQL server with Quickbackup and Sphinx Plug-in."
homepage="http://wiki.joyent.com/jpc2/Joyent+Percona+SmartMachine"
users="root admin mysql"
role="database"
7 changes: 3 additions & 4 deletions packages
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# List packages to add to your image one per line.
htop
dtracetools
percona-client
percona-server
p5-DBD-percona56
percona-client-5.6.13nb1
percona-server-5.6.13nb4
percona-xtrabackup
qpress
handlersocket
p5-DBD-percona55
percona-toolkit
quickbackup-percona
innotop
Expand Down

0 comments on commit 46f74e7

Please sign in to comment.