From b85b480f7088247ffbb3d5b22f011f8e3dc58c29 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 5 Jun 2018 15:43:09 +0200
Subject: [PATCH] update tests
---
.../dummy-data-producer/dummy_data_producer.cpp | 2 +-
examples/worker/getnext_broker/getnext_broker.cpp | 2 +-
receiver/src/statistics.cpp | 4 ++--
receiver/src/statistics_sender_fluentd.cpp | 3 +--
tests/manual/performance_broker/settings.json | 3 ++-
tests/manual/performance_broker/test.sh | 6 +++---
tests/manual/performance_full_chain_simple/test.sh | 2 +-
.../performance_producer_receiver/receiver.json | 3 ++-
tests/manual/performance_producer_receiver/test.sh | 13 ++++++++++++-
9 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/examples/producer/dummy-data-producer/dummy_data_producer.cpp b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
index 69676f1d7..1d55b247b 100644
--- a/examples/producer/dummy-data-producer/dummy_data_producer.cpp
+++ b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
@@ -85,7 +85,7 @@ std::unique_ptr<asapo::Producer> CreateProducer(const Args& args) {
}
producer->EnableLocalLog(true);
- producer->SetLogLevel(asapo::LogLevel::Debug);
+ producer->SetLogLevel(asapo::LogLevel::Info);
return producer;
}
diff --git a/examples/worker/getnext_broker/getnext_broker.cpp b/examples/worker/getnext_broker/getnext_broker.cpp
index b8bcd17ed..8655fdbb4 100644
--- a/examples/worker/getnext_broker/getnext_broker.cpp
+++ b/examples/worker/getnext_broker/getnext_broker.cpp
@@ -85,6 +85,6 @@ int main(int argc, char* argv[]) {
std::cout << "Processed " << nfiles << " file(s)" << std::endl;
std::cout << "Elapsed : " << duration_ms << "ms" << std::endl;
- std::cout << "Rate : " << 1000.0f * nfiles / duration_ms << std::endl;
+ std::cout << "Rate : " << 1000.0f * nfiles / (duration_ms - 10000) << std::endl;
return 0;
}
diff --git a/receiver/src/statistics.cpp b/receiver/src/statistics.cpp
index c303c1bff..fa628baa5 100644
--- a/receiver/src/statistics.cpp
+++ b/receiver/src/statistics.cpp
@@ -62,8 +62,8 @@ void Statistics::IncreaseRequestCounter() noexcept {
Statistics::Statistics(unsigned int write_frequency) :
write_interval_{write_frequency} {
-// statistics_sender_list__.emplace_back(new StatisticsSenderInfluxDb);
- statistics_sender_list__.emplace_back(new StatisticsSenderFluentd);
+ statistics_sender_list__.emplace_back(new StatisticsSenderInfluxDb);
+// statistics_sender_list__.emplace_back(new StatisticsSenderFluentd);
ResetStatistics();
}
diff --git a/receiver/src/statistics_sender_fluentd.cpp b/receiver/src/statistics_sender_fluentd.cpp
index 2b90cd37c..4a8ed6783 100644
--- a/receiver/src/statistics_sender_fluentd.cpp
+++ b/receiver/src/statistics_sender_fluentd.cpp
@@ -5,8 +5,7 @@ namespace asapo {
StatisticsSenderFluentd::StatisticsSenderFluentd() : statistics_log__{asapo::CreateDefaultLoggerApi("receiver_stat", "localhost:8400/logs/")} {
statistics_log__->SetLogLevel(LogLevel::Info);
- statistics_log__->EnableLocalLog(true);
-
+// statistics_log__->EnableLocalLog(true);
}
void StatisticsSenderFluentd::SendStatistics(const asapo::StatisticsToSend& statistic) const noexcept {
diff --git a/tests/manual/performance_broker/settings.json b/tests/manual/performance_broker/settings.json
index c45d16f2f..a2c1a4a5a 100644
--- a/tests/manual/performance_broker/settings.json
+++ b/tests/manual/performance_broker/settings.json
@@ -2,5 +2,6 @@
"BrokerDbAddress":"localhost:27017",
"MonitorDbAddress": "localhost:8086",
"MonitorDbName": "db_test",
- "port":5005
+ "port":5005,
+ "LogLevel":"info"
}
\ No newline at end of file
diff --git a/tests/manual/performance_broker/test.sh b/tests/manual/performance_broker/test.sh
index e0b083c3d..dbb1d4d20 100755
--- a/tests/manual/performance_broker/test.sh
+++ b/tests/manual/performance_broker/test.sh
@@ -4,7 +4,7 @@
# reads fileset into database
# calls getnext_broker example from $worker_node
-nthreads=16
+nthreads=1
# a directory with many files in it
dir=/gpfs/petra3/scratch/yakubov/test
run_name=test
@@ -34,8 +34,8 @@ ssh ${monitor_node} influx -execute \"create database db_test\"
ssh ${service_node} docker run -d -p 27017:27017 --name mongo mongo
#ssh ${service_node} docker run -d -p 8086 -p 8086 --name influxdb influxdb
-ssh ${service_node} mkdir ${service_dir}
-ssh ${worker_node} mkdir ${worker_dir}
+ssh ${service_node} mkdir -p ${service_dir}
+ssh ${worker_node} mkdir -p ${worker_dir}
scp settings_tmp.json ${service_node}:${service_dir}/settings.json
diff --git a/tests/manual/performance_full_chain_simple/test.sh b/tests/manual/performance_full_chain_simple/test.sh
index e4f8fed91..424451e26 100755
--- a/tests/manual/performance_full_chain_simple/test.sh
+++ b/tests/manual/performance_full_chain_simple/test.sh
@@ -25,7 +25,7 @@ log_dir=~/fullchain_tests/logs
# starts receiver on $receiver_node
# runs producer with various file sizes from $producer_node and measures performance
-file_size=100
+file_size=1000
file_num=$((100000000 / $file_size))
echo filesize: ${file_size}K, filenum: $file_num
diff --git a/tests/manual/performance_producer_receiver/receiver.json b/tests/manual/performance_producer_receiver/receiver.json
index 7cf0d85c1..adf89f8ee 100644
--- a/tests/manual/performance_producer_receiver/receiver.json
+++ b/tests/manual/performance_producer_receiver/receiver.json
@@ -7,5 +7,6 @@
"WriteToDisk":true,
"WriteToDb":true,
"LogLevel":"info",
- "Tag": "test_receiver"
+ "Tag": "test_receiver",
+ "RootFolder" : "/gpfs/petra3/scratch/yakubov/receiver_tests/files"
}
diff --git a/tests/manual/performance_producer_receiver/test.sh b/tests/manual/performance_producer_receiver/test.sh
index 83a52730d..4498cee1c 100755
--- a/tests/manual/performance_producer_receiver/test.sh
+++ b/tests/manual/performance_producer_receiver/test.sh
@@ -4,6 +4,14 @@ set -e
trap Cleanup EXIT
+Cleanup() {
+set +e
+ssh ${service_node} rm -f ${service_dir}/files/*
+ssh ${service_node} killall receiver
+ssh ${service_node} killall asapo-discovery
+ssh ${service_node} docker rm -f -v mongo
+}
+
# starts receiver on $service_node
# runs producer with various file sizes from $worker_node and measures performance
@@ -71,7 +79,10 @@ do
ssh ${service_node} docker run -d -p 27017:27017 --name mongo mongo
echo ===================================================================
ssh ${worker_node} ${worker_dir}/dummy-data-producer ${service_ip}:${discovery_port} ${size} 1000 8 0
-ssh ${service_node} rm -f ${service_dir}/files/*
+if [ "$1" == "true" ]
+then
+ ssh ${service_node} rm -f ${service_dir}/files/*
+fi
ssh ${service_node} docker rm -f -v mongo
done
ssh ${service_node} killall receiver
--
GitLab