archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error with logging command in memcached and sqldb start / stop scripts. Adjust test scripts, add new parameter required by memcached start / stop scripts.

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1231821 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jsdelfino 2012-01-16 03:49:01 +00:00
commit c3cc3ea6b1
44 changed files with 99 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sca-cpp/trunk/components/cache/memcached-ssl-test vendored
View file

@ -22,9 +22,9 @@
../../modules/http/ssl-cert-conf tmp/ssl localhost server
../../modules/http/ssl-cert-conf tmp/ssl localhost tunnel
./memcached-start 11411
./memcached-start 11412
./memcached-start 11413
./memcached-start tmp 11411
./memcached-start tmp 11412
./memcached-start tmp 11413
../../modules/http/httpd-conf tmp/tunnel localhost 8089 htdocs
../../modules/http/httpd-event-conf tmp/tunnel
@ -49,7 +49,7 @@ rc=$?
# Cleanup
../../modules/http/httpd-stop tmp/tunnel
../../modules/http/httpd-stop tmp/server
./memcached-stop 11411
./memcached-stop 11412
./memcached-stop 11413
./memcached-stop tmp 11411
./memcached-stop tmp 11412
./memcached-stop tmp 11413
exit $rc

6
sca-cpp/trunk/components/cache/memcached-start vendored
View file

@ -40,10 +40,12 @@ else
log="cat >>$root/logs/memcached"
v=""
fi
mkdir -p $root/memcached
echo $log > $root/memcached/logger
if [ "$ip" = "" ]; then
($memcached_prefix/bin/memcached -d -m 4 -p $port $v 2>&1 | $log)&
($memcached_prefix/bin/memcached -d -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)&
else
($memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port $v 2>&1 | $log)&
($memcached_prefix/bin/memcached -d -l $ip -m 4 -p $port $v 2>&1 | sh $root/memcached/logger)&
fi

3
sca-cpp/trunk/components/cache/memcached-stop vendored
View file

@ -19,8 +19,9 @@
# Stop memcached
here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
root=`echo "import os; print os.path.realpath('$1')" | python`
addr=$1
addr=$2
if [ "$addr" = "" ]; then
ip=""
port="11211"

12
sca-cpp/trunk/components/cache/memcached-test vendored
View file

@ -18,9 +18,9 @@
# under the License.
# Setup
./memcached-start 11211
./memcached-start 11212
./memcached-start 11213
./memcached-start tmp 11211
./memcached-start tmp 11212
./memcached-start tmp 11213
sleep 1
# Test
@ -28,7 +28,7 @@ sleep 1
rc=$?
# Cleanup
./memcached-stop 11211
./memcached-stop 11212
./memcached-stop 11213
./memcached-stop tmp 11211
./memcached-stop tmp 11212
./memcached-stop tmp 11213
exit $rc

24
sca-cpp/trunk/components/cache/server-test vendored
View file

@ -27,12 +27,12 @@ SCAContribution `pwd`/
SCAComposite cache.composite
EOF
./memcached-start 11211
./memcached-start 11212
./memcached-start 11213
./memcached-start 11411
./memcached-start 11412
./memcached-start 11413
./memcached-start tmp 11211
./memcached-start tmp 11212
./memcached-start tmp 11213
./memcached-start tmp 11411
./memcached-start tmp 11412
./memcached-start tmp 11413
../../modules/http/httpd-start tmp
sleep 2
@ -42,11 +42,11 @@ rc=$?
# Cleanup
../../modules/http/httpd-stop tmp
./memcached-stop 11211
./memcached-stop 11212
./memcached-stop 11213
./memcached-stop 11411
./memcached-stop 11412
./memcached-stop 11413
./memcached-stop tmp 11211
./memcached-stop tmp 11212
./memcached-stop tmp 11213
./memcached-stop tmp 11411
./memcached-stop tmp 11412
./memcached-stop tmp 11413
sleep 2
exit $rc

6
sca-cpp/trunk/components/sqldb/pgsql-backup
View file

@ -37,13 +37,15 @@ else
mkdir -p $root/logs
pgsql_log="cat >>$root/logs/postgresql"
fi
mkdir -p $root/sqldb
echo $pgsql_log >$root/sqldb/logger
$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_start_backup('backup', true)" db 2>&1 | $pgsql_log
$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_start_backup('backup', true)" db 2>&1 | sh $root/sqldb/logger
echo "Content-type: application/x-compressed"
echo
tar -C $root/sqldb -cz data
$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_stop_backup()" db 2>&1 | $pgsql_log
$pgsql_prefix/bin/psql -h $host -p $port -c "SELECT pg_stop_backup()" db 2>&1 | sh $root/sqldb/logger

10
sca-cpp/trunk/components/sqldb/pgsql-conf
View file

@ -45,9 +45,11 @@ else
mkdir -p $root/logs
pgsql_log="cat >>$root/logs/postgresql"
fi
mkdir -p $root/sqldb
echo $pgsql_log >$root/sqldb/logger
if [ ! -f $root/sqldb/data/postgresql.conf ]; then
$pgsql_prefix/bin/pg_ctl init -D $root/sqldb/data 2>&1 | $pgsql_log
$pgsql_prefix/bin/pg_ctl init -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger
cp $root/sqldb/data/postgresql.conf $root/sqldb/data/postgresql-init.conf
cp $root/sqldb/data/pg_hba.conf $root/sqldb/data/pg_hba-init.conf
fi
@ -96,7 +98,7 @@ host replication all samenet trust
EOF
# Create the db
($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | $pgsql_log)&
($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger
sti=0
while [ $sti -ne 30 ]; do
st=`$pgsql_prefix/bin/pg_ctl status -D $root/sqldb/data | grep 'server is running'`
@ -107,8 +109,8 @@ while [ $sti -ne 30 ]; do
sti=$((sti+1))
done
$pgsql_prefix/bin/createdb -h localhost -p $port db 2>&1 | $pgsql_log
$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | $pgsql_log
$pgsql_prefix/bin/createdb -h localhost -p $port db 2>&1 | sh $root/sqldb/logger
$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger
# Generate database backup script
mkdir -p $root/sqldb/scripts

4
sca-cpp/trunk/components/sqldb/pgsql-standby-conf
View file

@ -54,6 +54,8 @@ else
mkdir -p $root/logs
pgsql_log="cat >>$root/logs/postgresql"
fi
mkdir -p $root/sqldb
echo $pgsql_log >$root/sqldb/logger
mkdir -p $root/sqldb/data
chmod 700 $root/sqldb/data
@ -61,7 +63,7 @@ mkdir -p $root/sqldb/archive
# Initialize from a backup of the master
if [ ! -f $root/sqldb/data/postgresql.conf ]; then
(wget http://$mhost:$mhttpport/pgsql-backup -O - | tar -C $root/sqldb -xz) 2>&1 | $pgsql_log
(wget http://$mhost:$mhttpport/pgsql-backup -O - | tar -C $root/sqldb -xz) 2>&1 | sh $root/sqldb/logger
rm -rf $root/sqldb/data/postmaster.pid $root/sqldb/data/pg_xlog
mkdir -p $root/sqldb/data/pg_xlog/archive_status
chmod 700 $root/sqldb/data/pg_xlog/archive_status

4
sca-cpp/trunk/components/sqldb/pgsql-start
View file

@ -29,8 +29,10 @@ else
mkdir -p $root/logs
pgsql_log="cat >>$root/logs/postgresql"
fi
mkdir -p $root/sqldb
echo $pgsql_log >$root/sqldb/logger
($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | $pgsql_log)&
($pgsql_prefix/bin/pg_ctl start -W -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger)&
sti=0
while [ $sti -ne 30 ]; do
st=`$pgsql_prefix/bin/pg_ctl status -D $root/sqldb/data | grep 'server is running'`

4
sca-cpp/trunk/components/sqldb/pgsql-stop
View file

@ -29,6 +29,8 @@ else
mkdir -p $root/logs
pgsql_log="cat >>$root/logs/postgresql"
fi
mkdir -p $root/sqldb
echo $pgsql_log >$root/sqldb/logger
$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | $pgsql_log
$pgsql_prefix/bin/pg_ctl stop -w -D $root/sqldb/data 2>&1 | sh $root/sqldb/logger

4
sca-cpp/trunk/modules/edit/ssl-start
View file

@ -36,8 +36,8 @@ if [ -x ../../components/log/scribe-cat ]; then
fi
# Start memcached
../../components/cache/memcached-start 11211
../../components/cache/memcached-start 11212
../../components/cache/memcached-start tmp 11211
../../components/cache/memcached-start tmp 11212
# Configure server
../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs

4
sca-cpp/trunk/modules/edit/start
View file

@ -32,8 +32,8 @@ if [ -x ../../components/log/scribe-cat ]; then
fi
# Start memcached
../../components/cache/memcached-start 11211
../../components/cache/memcached-start 11212
../../components/cache/memcached-start tmp 11211
../../components/cache/memcached-start tmp 11212
# Configure server
../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs

4
sca-cpp/trunk/modules/edit/stop
View file

@ -19,8 +19,8 @@
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop 11211
../../components/cache/memcached-stop 11212
../../components/cache/memcached-stop tmp 11211
../../components/cache/memcached-stop tmp 11212
if [ -x ../../components/log/scribe-cat ]; then
../../components/log/scribed-client-stop tmp

4
sca-cpp/trunk/modules/oauth/start-mixed-test
View file

@ -21,8 +21,8 @@
here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
# Setup
../../components/cache/memcached-start 11212
../../components/cache/memcached-start 11213
../../components/cache/memcached-start tmp 11212
../../components/cache/memcached-start tmp 11213
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost

4
sca-cpp/trunk/modules/oauth/start-test
View file

@ -21,8 +21,8 @@
../../ubuntu/ip-redirect-all 80 8090
../../ubuntu/ip-redirect-all 443 8453
../../components/cache/memcached-start 11212
../../components/cache/memcached-start 11213
../../components/cache/memcached-start tmp 11212
../../components/cache/memcached-start tmp 11213
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost

4
sca-cpp/trunk/modules/oauth/stop-test
View file

@ -20,5 +20,5 @@
# Cleanup
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop 11212
../../components/cache/memcached-stop 11213
../../components/cache/memcached-stop tmp 11212
../../components/cache/memcached-stop tmp 11213

4
sca-cpp/trunk/modules/openid/start-test
View file

@ -18,8 +18,8 @@
# under the License.
# Setup
../../components/cache/memcached-start 11212
../../components/cache/memcached-start 11213
../../components/cache/memcached-start tmp 11212
../../components/cache/memcached-start tmp 11213
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost

4
sca-cpp/trunk/modules/openid/stop-test
View file

@ -20,5 +20,5 @@
# Cleanup
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop 11212
../../components/cache/memcached-stop 11213
../../components/cache/memcached-stop tmp 11212
../../components/cache/memcached-stop tmp 11213

2
sca-cpp/trunk/samples/loan-python/start
View file

@ -28,5 +28,5 @@ SCAComposite loan.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/loan-python/stop
View file

@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop
../../components/cache/memcached-stop tmp

6
sca-cpp/trunk/samples/store-cluster/ssl-start
View file

@ -56,11 +56,11 @@ sleep 1
# Start three memcached servers
../../modules/http/tunnel-ssl-conf tmp/tunnel 11211 localhost 563 11411
../../components/cache/memcached-start 127.0.0.1:11411
../../components/cache/memcached-start tmp 127.0.0.1:11411
../../modules/http/tunnel-ssl-conf tmp/tunnel 11212 localhost 563 11412
../../components/cache/memcached-start 127.0.0.1:11412
../../components/cache/memcached-start tmp 127.0.0.1:11412
../../modules/http/tunnel-ssl-conf tmp/tunnel 11213 localhost 563 11413
../../components/cache/memcached-start 127.0.0.1:11413
../../components/cache/memcached-start tmp 127.0.0.1:11413
../../modules/http/httpd-restart tmp/tunnel
sleep 1

6
sca-cpp/trunk/samples/store-cluster/ssl-stop
View file

@ -26,9 +26,9 @@ set -x
../../modules/http/httpd-stop tmp/proxy1
../../modules/http/httpd-stop tmp/proxy2
../../components/cache/memcached-stop 127.0.0.1:11411
../../components/cache/memcached-stop 127.0.0.1:11412
../../components/cache/memcached-stop 127.0.0.1:11413
../../components/cache/memcached-stop tmp 127.0.0.1:11411
../../components/cache/memcached-stop tmp 127.0.0.1:11412
../../components/cache/memcached-stop tmp 127.0.0.1:11413
../../components/sqldb/pgsql-stop tmp/sqldb3
../../modules/http/httpd-stop tmp/sqldb3

6
sca-cpp/trunk/samples/store-cluster/start
View file

@ -33,9 +33,9 @@ sudo ../../ubuntu/ip-redirect-all 80 8090
sleep 1
# Start three memcached servers
../../components/cache/memcached-start 11211
../../components/cache/memcached-start 11212
../../components/cache/memcached-start 11213
../../components/cache/memcached-start tmp 11211
../../components/cache/memcached-start tmp 11212
../../components/cache/memcached-start tmp 11213
# Start a master and two hot standby databases
./sqldb-master-conf tmp/sqldb1 5432 8502

6
sca-cpp/trunk/samples/store-cluster/stop
View file

@ -26,9 +26,9 @@ set -x
../../modules/http/httpd-stop tmp/proxy1
../../modules/http/httpd-stop tmp/proxy2
../../components/cache/memcached-stop 11211
../../components/cache/memcached-stop 11212
../../components/cache/memcached-stop 11213
../../components/cache/memcached-stop tmp 11211
../../components/cache/memcached-stop tmp 11212
../../components/cache/memcached-stop tmp 11213
../../components/sqldb/pgsql-stop tmp/sqldb3
../../modules/http/httpd-stop tmp/sqldb3

2
sca-cpp/trunk/samples/store-cpp/ssl-start
View file

@ -32,5 +32,5 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-cpp/start
View file

@ -28,5 +28,5 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-cpp/stop
View file

@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop
../../components/cache/memcached-stop tmp

2
sca-cpp/trunk/samples/store-java/ssl-start
View file

@ -34,5 +34,5 @@ EOF
export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-java/start
View file

@ -29,5 +29,5 @@ EOF
export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-java/stop
View file

@ -20,4 +20,4 @@
export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd`
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop
../../components/cache/memcached-stop tmp

2
sca-cpp/trunk/samples/store-python/ssl-start
View file

@ -33,5 +33,5 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-python/start
View file

@ -28,5 +28,5 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-python/stop
View file

@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop
../../components/cache/memcached-stop tmp

2
sca-cpp/trunk/samples/store-python/uec2-start
View file

@ -42,6 +42,6 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-scheme/ssl-start
View file

@ -32,5 +32,5 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-scheme/start
View file

@ -28,5 +28,5 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-scheme/stop
View file

@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop
../../components/cache/memcached-stop tmp

2
sca-cpp/trunk/samples/store-sql/ssl-start
View file

@ -32,7 +32,7 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../components/sqldb/pgsql-conf tmp
../../components/sqldb/pgsql-start tmp
../../components/sqldb/pgsql "create table store(key text, value text);" 1>/dev/null 2>&1

2
sca-cpp/trunk/samples/store-sql/start
View file

@ -28,7 +28,7 @@ SCAComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../components/sqldb/pgsql-conf tmp
../../components/sqldb/pgsql-start tmp
../../components/sqldb/pgsql "create table store(key text, value text);" 1>/dev/null 2>&1

2
sca-cpp/trunk/samples/store-sql/stop
View file

@ -19,4 +19,4 @@
../../modules/http/httpd-stop tmp
../../components/sqldb/pgsql-stop tmp
../../components/cache/memcached-stop
../../components/cache/memcached-stop tmp

2
sca-cpp/trunk/samples/store-vhost/ssl-start
View file

@ -44,5 +44,5 @@ SCAVirtualComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-vhost/start
View file

@ -34,5 +34,5 @@ SCAVirtualComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp

2
sca-cpp/trunk/samples/store-vhost/stop
View file

@ -18,4 +18,4 @@
# under the License.
../../modules/http/httpd-stop tmp
../../components/cache/memcached-stop
../../components/cache/memcached-stop tmp

2
sca-cpp/trunk/samples/store-vhost/uec2-start
View file

@ -47,6 +47,6 @@ SCAVirtualComposite store.composite
EOF
../../components/cache/memcached-start
../../components/cache/memcached-start tmp
../../modules/http/httpd-start tmp