Skip to content

Update web serving big db #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aansaarii wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Update web serving big db #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b7d9628
web-serving with elgg 3.3.20 and php7.4
aansaarii Sep 14, 2021
f53010e
web-serving using elgg 3.3.20 and php7.4
aansaarii Sep 15, 2021
1caf9df
enable building on arm and riscv for web-serving
aansaarii Oct 25, 2021
dcd1d2c
web_serving db server has populated db
aansaarii Jul 28, 2022
a6de571
update web-serving db_server to populate DB
aansaarii Jul 29, 2022
d341c53
update web-serving faban_client to work with populated DB
aansaarii Jul 29, 2022
b458477
move the database dump to the server
aansaarii Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .github/workflows/build-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
strategy:
matrix:
tag: ["mariadb-10.3"]
platform: ["linux/amd64,linux/arm64"]
platform: ["linux/amd64,linux/arm64,linux/riscv64"]
steps:
- name: checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -537,7 +537,7 @@ jobs:
strategy:
matrix:
tag: ["db_server", "faban_client", "memcached_server", "web_server"]
platform: ["linux/amd64"]
platform: ["linux/amd64,linux/arm64,linux/riscv64"]
steps:
- name: checkout
uses: actions/checkout@v2
Expand Down
3 changes: 2 additions & 1 deletion benchmarks/web-serving/db_server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ FROM cloudsuite/mysql:mariadb-10.3

ENV root_password root

ADD files/elgg_db.dump /elgg_db.dump
RUN apt-get update && apt-get install -y --no-install-recommends wget \
&& rm -rf /var/lib/apt/lists/*

ADD entrypoint.sh /etc/entrypoint.sh
RUN chown root:root /etc/entrypoint.sh
Expand Down
28 changes: 20 additions & 8 deletions benchmarks/web-serving/db_server/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,36 @@ if [ $# -lt 1 ]; then
exit 1
fi

wget --no-check-certificate -O /elgg_bigDB.dump https://cloudsuite.ch/download/web-serving/elgg_bigDB.dump

WEB_SERVER_IP=$1

# workaround for overlayfs:
# https://docs.docker.com/engine/userguide/storagedriver/overlayfs-driver/#limitations-on-overlayfs-compatibility
find /var/lib/mysql -type f -exec touch {} \;

# Update the hostname/IP to that of the webserver
sed -i -e"s/HOST_IP/${WEB_SERVER_IP}:8080/" /elgg_db.dump
#sed -i -e"s/HOST_IP/${WEB_SERVER_IP}:8080/" /elgg_bigDB.dump
set root_password=root
service mysql restart

MY_SQL=$(find /etc/init.d -name "*mariadb*")
if [ $MY_SQL ]; then
MY_SQL="mariadb"
else
MY_SQL="mysql"
fi

service $MY_SQL restart

# Wait for mysql to come up
while :; do mysql -uroot -p${root_password} -e "status" && break; sleep 1; done
mysql -uroot -p$root_password -e "create database ELGG_DB;"
while :; do $MY_SQL -uroot -p${root_password} -e "status" && break; sleep 1; done
$MY_SQL -uroot -p$root_password -e "create database ELGG_DB;"

# Need bash -c for redirection
bash -c "mysql -uroot -p$root_password ELGG_DB < /elgg_db.dump"
mysql -uroot -p$root_password -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '$root_password' WITH GRANT OPTION; FLUSH PRIVILEGES;"
service mysql stop
bash -c "$MY_SQL -uroot -p$root_password ELGG_DB < /elgg_bigDB.dump"
$MY_SQL -uroot -p$root_password -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '$root_password' WITH GRANT OPTION; FLUSH PRIVILEGES;"
service $MY_SQL stop

rm /elgg_bigDB.dump

/usr/sbin/mysqld
/usr/sbin/${MY_SQL}d
395 changes: 93 additions & 302 deletions benchmarks/web-serving/db_server/files/elgg_db.dump
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions benchmarks/web-serving/faban_client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ RUN ant usergen-jar
RUN cp /web20_benchmark/build/Web20Driver.jar $FABAN_HOME/benchmarks/

COPY files/usersetup.properties $FABAN_HOME/usersetup.properties
COPY files/users.list $FABAN_HOME/users.list

ADD bootstrap.sh /etc/bootstrap.sh
RUN chown root:root /etc/bootstrap.sh
RUN chmod 700 /etc/bootstrap.sh
RUN chown root:root bin/entrypoint.sh
RUN chmod 700 bin/entrypoint.sh

ENTRYPOINT ["/etc/bootstrap.sh"]
ENTRYPOINT ["bin/entrypoint.sh"]
3 changes: 2 additions & 1 deletion benchmarks/web-serving/faban_client/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ done

sed -i -e"s/num_users=500/num_users=${LOAD_SCALE}/" $FABAN_HOME/usersetup.properties
$FABAN_HOME/master/bin/startup.sh
cd /web20_benchmark/build && java -jar Usergen.jar http://${WEB_SERVER_IP}:8080
cd /web20_benchmark/build
java -jar Usergen.jar http://${WEB_SERVER_IP}:8080
sed -i "s/<fa:scale.*/<fa:scale>${LOAD_SCALE}<\\/fa:scale>/" /web20_benchmark/deploy/run.xml
sed -i "s/<fa:rampUp.*/<fa:rampUp>10<\\/fa:rampUp>/" /web20_benchmark/deploy/run.xml
sed -i "s/<fa:rampDown.*/<fa:rampDown>10<\\/fa:rampDown>/" /web20_benchmark/deploy/run.xml
Expand Down
Loading