more nomad jobs, start logging

discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go

@@ -49,16 +49,16 @@ func (suite *ConsulHandlerTestSuite) SetupTest() {
 		panic(err)
 	}
 
-	suite.registerAgents("receiver")
-	suite.registerAgents("broker")
+	suite.registerAgents("asapo-receiver")
+	suite.registerAgents("asapo-broker")
 
 }
 
 func (suite *ConsulHandlerTestSuite) TearDownTest() {
-	suite.client.Agent().ServiceDeregister("receiver1234")
-	suite.client.Agent().ServiceDeregister("receiver1235")
-	suite.client.Agent().ServiceDeregister("broker1234")
-	suite.client.Agent().ServiceDeregister("broker1235")
+	suite.client.Agent().ServiceDeregister("asapo-receiver1234")
+	suite.client.Agent().ServiceDeregister("asapo-receiver1235")
+	suite.client.Agent().ServiceDeregister("asapo-broker1234")
+	suite.client.Agent().ServiceDeregister("asapo-broker1235")
 }
 
 func (suite *ConsulHandlerTestSuite) TestInitDefaultUri() {
@@ -127,8 +127,8 @@ func (suite *ConsulHandlerTestSuite) TestGetBrokerRoundRobin() {
 
 
 func (suite *ConsulHandlerTestSuite) TestGetBrokerEmpty() {
-	suite.client.Agent().ServiceDeregister("broker1234")
-	suite.client.Agent().ServiceDeregister("broker1235")
+	suite.client.Agent().ServiceDeregister("asapo-broker1234")
+	suite.client.Agent().ServiceDeregister("asapo-broker1235")
 
 	suite.handler.Init(consul_settings)
 	res, err := suite.handler.GetBroker()

examples/producer/dummy-data-producer/check_linux.sh

@@ -14,8 +14,7 @@ mkdir files
 
 $@ files beamtime_id 11 4 4 1 10 2>&1 | grep Rate
 
-
-ls -ln files/0.bin | awk '{ print $5 }'| grep 11264
-ls -ln files/1.bin | awk '{ print $5 }'| grep 11264
-ls -ln files/2.bin | awk '{ print $5 }'| grep 11264
-ls -ln files/3.bin | awk '{ print $5 }'| grep 11264
+ls -ln files/0.bin | awk '{ print $5 }'| grep 11000
+ls -ln files/1.bin | awk '{ print $5 }'| grep 11000
+ls -ln files/2.bin | awk '{ print $5 }'| grep 11000
+ls -ln files/3.bin | awk '{ print $5 }'| grep 11000

examples/producer/dummy-data-producer/check_windows.bat

@@ -5,16 +5,16 @@ mkdir %folder%
 "%1" %folder% beamtime_id 11 4 4 1 10 2>&1 | findstr "Rate" || goto :error
 
 FOR /F "usebackq" %%A IN ('%folder%\0.bin') DO set size=%%~zA
-if %size% NEQ 11264 goto :error
+if %size% NEQ 11000 goto :error
 
 FOR /F "usebackq" %%A IN ('%folder%\1.bin') DO set size=%%~zA
-if %size% NEQ 11264 goto :error
+if %size% NEQ 11000 goto :error
 
 FOR /F "usebackq" %%A IN ('%folder%\2.bin') DO set size=%%~zA
-if %size% NEQ 11264 goto :error
+if %size% NEQ 11000 goto :error
 
 FOR /F "usebackq" %%A IN ('%folder%\3.bin') DO set size=%%~zA
-if %size% NEQ 11264 goto :error
+if %size% NEQ 11000 goto :error
 
 goto :clean
 

examples/producer/dummy-data-producer/dummy_data_producer.cpp

@@ -25,7 +25,7 @@ struct Args {
 void PrintCommandArguments(const Args& args) {
     std::cout << "receiver_address: " << args.receiver_address << std::endl
               << "beamtime_id: " << args.beamtime_id << std::endl
-              << "Package size: " << args.number_of_bytes / 1024 << "k" << std::endl
+              << "Package size: " << args.number_of_bytes / 1000 << "k" << std::endl
               << "iterations: " << args.iterations << std::endl
               << "nthreads: " << args.nthreads << std::endl
               << "mode: " << args.mode << std::endl
@@ -46,7 +46,7 @@ void ProcessCommandArguments(int argc, char* argv[], Args* args) {
     try {
         args->receiver_address = argv[1];
         args->beamtime_id = argv[2];
-        args->number_of_bytes = std::stoull(argv[3]) * 1024;
+        args->number_of_bytes = std::stoull(argv[3]) * 1000;
         args->iterations = std::stoull(argv[4]);
         args->nthreads = std::stoull(argv[5]);
         args->mode = std::stoull(argv[6]);
@@ -120,7 +120,7 @@ void WaitThreadsFinished(const Args& args) {
 void PrintOutput(const Args& args, const high_resolution_clock::time_point& start) {
     high_resolution_clock::time_point t2 = high_resolution_clock::now();
     double duration_sec = std::chrono::duration_cast<std::chrono::milliseconds>( t2 - start ).count() / 1000.0;
-    double size_gb = double(args.number_of_bytes) * args.iterations / 1024.0  / 1024.0 / 1024.0 * 8.0;
+    double size_gb = double(args.number_of_bytes) * args.iterations / 1000.0  / 1000.0 / 1000.0 * 8.0;
     double rate = args.iterations / duration_sec;
     std::cout << "Rate: " << rate << " Hz" << std::endl;
     std::cout << "Bandwidth " << size_gb / duration_sec << " Gbit/s" << std::endl;

tests/automatic/producer_receiver/transfer_single_file/check_linux.sh

@@ -34,7 +34,7 @@ mkdir -p ${receiver_folder}
 
 $1 localhost:8400 ${beamtime_id} 100 1 1  0 30
 
-ls -ln ${receiver_folder}/1.bin | awk '{ print $5 }'| grep 102400
+ls -ln ${receiver_folder}/1.bin | awk '{ print $5 }'| grep 100000
 
 
-$1 localhost:8400 wrong_beamtime_id 100 1 1 0 1 2>1 | grep "authorization failed"
\ No newline at end of file
+$1 localhost:8400 wrong_beamtime_id 100 1 1 0 1 2>1 | grep "authorization failed"

tests/automatic/producer_receiver/transfer_single_file/check_windows.bat

@@ -22,7 +22,7 @@ mkdir %receiver_folder%
 ping 1.0.0.0 -n 1 -w 100 > nul
 
 FOR /F "usebackq" %%A IN ('%receiver_folder%\1.bin') DO set size=%%~zA
-if %size% NEQ 102400 goto :error
+if %size% NEQ 100000 goto :error
 
 "%1" localhost:8400 wrong_id 100 1 1 0 2 2>1 | findstr /c:"authorization failed"  || goto :error
 

tests/automatic/spd_logger/console/check_linux.sh

@@ -5,6 +5,7 @@ set -e
 res=`$@`
 
 echo $res | grep '"level":"info","message":"test info"'
+echo $res | grep '"level":"info","message":"test : info"'
 echo $res | grep '"test_int":2,"test_double":1.0}'
 echo $res | grep '"level":"error","message":"test error"'
 echo $res | grep '"level":"debug","message":"test debug"'

tests/automatic/spd_logger/console/check_windows.bat

 "%1" > output
 
 findstr /I /L /C:"\"level\":\"info\",\"message\":\"test info\"" output || goto :error
+findstr /I /L /C:"\"level\":\"info\",\"message\":\"test : info\"" output || goto :error
 findstr /I /L /C:"\"level\":\"error\",\"message\":\"test error\"" output || goto :error
 findstr /I /L /C:"\"level\":\"debug\",\"message\":\"test debug\"" output || goto :error
 findstr /I /L /C:"\"level\":\"warning\",\"message\":\"test warning\"" output || goto :error

tests/automatic/spd_logger/console/spd_logger_console.cpp

@@ -32,6 +32,7 @@ int main(int argc, char* argv[]) {
     logger->Warning("test warning");
     logger->Debug("test debug");
 
+    logger->Info("test : info");
 
     logger->SetLogLevel(LogLevel::Error);
     logger->Info("test info_errorlev");