tfcache-comparison
Changes
docker/Dockerfile 2(+2 -0)
reduce.sh 4(+2 -2)
run.sh 8(+4 -4)
server.sh 2(+1 -1)
trace.sh 4(+2 -2)
Details
docker/Dockerfile 2(+2 -0)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5c64e7b..6fbb33e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,6 +17,8 @@ RUN apt-get -qq -y install oracle-java12-installer
RUN apt-get -qq -y install maven
RUN apt-get -qq -y install git
RUN apt-get -qq -y install netcat
+RUN apt-get -qq -y install curl
+RUN apt-get -qq -y install htop
RUN apt-get -qq -y install ssh
RUN echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
reduce.sh 4(+2 -2)
diff --git a/reduce.sh b/reduce.sh
index 16b1ad4..5dd6121 100644
--- a/reduce.sh
+++ b/reduce.sh
@@ -20,7 +20,7 @@ if [[ ! -z $1 ]]; then
fi
fi
-echo "Reducing in host $host for the applications $applications among the versions $versions"
+echo "$(date '+%F %T') Reducing in host $host for the applications $applications among the versions $versions"
for version in $versions; do
version=${version%/}
if [[ $applications = "*" ]]; then
@@ -32,7 +32,7 @@ for version in $versions; do
application=${application%/}
for user in 1 10 50; do
for execution in {1..10}; do
- echo "Reducing $application-$version with $user users and execution $execution"
+ echo "$(date '+%F %T') Reducing $application-$version with $user users and execution $execution"
java $JAVA_OPTS -jar adapters/RequestsSimulator/target/RequestsSimulator-1.0.jar --throughput=applications/output/$application-$version-${user}user-${execution}execution-requests --reduce=applications/output/requests-handled.csv --prefix=$application,$version,$user,$execution,
if [[ $host = "localhost" ]]; then
java $JAVA_OPTS -jar adapters/Cache/target/Cache-1.0.jar applications/output/$application-$version-${user}user-${execution}execution-cache applications/output/hits-distribution.csv $application,$version,$user,$execution,
run.sh 8(+4 -4)
diff --git a/run.sh b/run.sh
index aaa3a9a..9ff94c8 100644
--- a/run.sh
+++ b/run.sh
@@ -20,7 +20,7 @@ if [[ ! -z $1 ]]; then
fi
fi
-echo "Executing workloads in host $host for the applications $applications among the versions $versions"
+echo "$(date '+%F %T') Executing workloads in host $host for the applications $applications among the versions $versions"
for execution in {1..10}; do
for user in 1 10 50; do
for version in $versions; do
@@ -30,11 +30,11 @@ for execution in {1..10}; do
else
existing_applications=$applications
fi
- echo "Running $execution execution with $user users of applications $existing_applications"
+ echo "$(date '+%F %T') Running $execution execution with $user users of applications $existing_applications"
for application in $existing_applications; do
application=${application%/}
if [[ ! -f applications/workloads/$application-workload-${user}user.json ]]; then
- echo "Generating workload for $application with $user users"
+ echo "$(date '+%F %T') Generating workload for $application with $user users"
if [[ $host = "localhost" ]]; then
export TRACER_ENABLE=false
docker-compose -f applications/uncached/$application/docker-compose.yml up -d --build
@@ -53,7 +53,7 @@ for execution in {1..10}; do
sleep 11
fi
fi
- echo "Running $application with $user users and execution $execution"
+ echo "$(date '+%F %T') Running $application with $user users and execution $execution"
if [[ $host = "localhost" ]]; then
export CACHE_EVENTS=/caching-approaches-comparison/applications/output/$application-$version-${user}user-${execution}execution-cache
docker-compose -f applications/cached/$version/$application/docker-compose.yml up -d --build
server.sh 2(+1 -1)
diff --git a/server.sh b/server.sh
index 40bcd1a..4f95a45 100644
--- a/server.sh
+++ b/server.sh
@@ -12,7 +12,7 @@ do
echo "Received 'exit'"
break
else
- echo "$line"
+ echo "$(date '+%F %T') $line"
if [[ "$line" = "caching-approaches-comparison "* ]]; then
cmd=${line/caching-approaches-comparison/}
eval $cmd
trace.sh 4(+2 -2)
diff --git a/trace.sh b/trace.sh
index 47fb44b..bfb5f6f 100644
--- a/trace.sh
+++ b/trace.sh
@@ -16,10 +16,10 @@ if [[ ! -z $1 ]]; then
fi
fi
-echo "Running in host $host for the applications: $applications"
+echo "$(date '+%F %T') Running in host $host for the applications: $applications"
for application in $applications; do
application=${application%/}
- echo "Running application $application"
+ echo "$(date '+%F %T') Running application $application"
if [[ $host = "localhost" ]]; then
export TRACER_ENABLE=true
docker-compose -f applications/uncached/$application/docker-compose.yml up -d --build