Skip to content
Snippets Groups Projects
Commit 96b72e42 authored by Carsten Patzke's avatar Carsten Patzke
Browse files

Added receiver tcp and fabric nomad files

parent 63afc0a5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 89 additions and 11 deletions
CMakeModules/prepare_asapo.cmake
+ 8
− 6
View file @ 96b72e42
......@@ -27,22 +27,25 @@ function(prepare_asapo)
endif()
if (WIN32)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver.json.tpl.win.in receiver.json.tpl @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/nginx_kill_win.nmd nginx_kill.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver_tcp.json.tpl.win.in receiver_tcp.json.tpl @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/authorizer_settings.json.tpl.win authorizer.json.tpl COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/start_services.bat start_services.bat COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/stop_services.bat stop_services.bat COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/receiver_tcp.nmd.in receiver_tcp.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/nginx_kill_win.nmd nginx_kill.nmd @ONLY)
else()
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver.json.tpl.lin.in receiver.json.tpl @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/nginx_kill_lin.nmd nginx_kill.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver_tcp.json.tpl.lin.in receiver_tcp.json.tpl @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver_fabric.json.tpl.lin.in receiver_fabric.json.tpl @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/authorizer_settings.json.tpl.lin authorizer.json.tpl COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/start_services.sh start_services.sh COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/stop_services.sh stop_services.sh COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/receiver_tcp.nmd.in receiver_tcp.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/receiver_fabric.nmd.in receiver_fabric.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/nginx_kill_lin.nmd nginx_kill.nmd @ONLY)
endif()
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/receiver.nmd.in receiver.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/discovery.nmd.in discovery.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/authorizer.nmd.in authorizer.nmd @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/file_transfer.nmd.in file_transfer.nmd @ONLY)
......@@ -54,7 +57,6 @@ function(prepare_asapo)
configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/nginx.conf.tpl nginx.conf.tpl COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/config/nomad/nginx.nmd.in nginx.nmd @ONLY)
endfunction()
macro(configure_files srcDir destDir)
......
common/cpp/include/common/networking.h
+ 1
− 0
View file @ 96b72e42
......@@ -14,6 +14,7 @@ typedef uint64_t NetworkRequestId;
enum class NetworkConnectionType {
kAsapoTcp, // ASAPOs TCP (Multiple connections for parallel data transfers)
kFabric, // Fabric connection (Primarily used for InfiniBand verbs)
};
enum Opcode : uint8_t {
......
config/nomad/receiver_fabric.nmd.in 0 → 100644
+ 47
− 0
View file @ 96b72e42
job "receiver" {
datacenters = ["dc1"]
type = "service"
group "group" {
count = 1
task "receiver" {
driver = "raw_exec"
config {
command = "@RECEIVER_DIR@/@RECEIVER_NAME@",
args = ["${NOMAD_TASK_DIR}/receiver.json"]
}
resources {
cpu = 500 # 500 MHz
memory = 256 # 256MB
network {
port "recv" {}
port "recv_ds" {}
}
}
service {
name = "asapo-receiver"
port = "recv"
check {
name = "alive"
type = "tcp"
interval = "10s"
timeout = "2s"
initial_status = "passing"
}
}
template {
source = "@WORK_DIR@/receiver_fabric.json.tpl"
destination = "local/receiver.json"
change_mode = "signal"
change_signal = "SIGHUP"
}
}
}
}
config/nomad/receiver.nmd.in → config/nomad/receiver_tcp.nmd.in
+ 1
− 1
View file @ 96b72e42
......@@ -36,7 +36,7 @@ job "receiver" {
}
template {
source = "@WORK_DIR@/receiver.json.tpl"
source = "@WORK_DIR@/receiver_tcp.json.tpl"
destination = "local/receiver.json"
change_mode = "signal"
change_signal = "SIGHUP"
......
consumer/api/cpp/src/data_broker.cpp
+ 1
− 0
View file @ 96b72e42
......@@ -25,6 +25,7 @@ std::unique_ptr<DataBroker> Create(const std::string& source_name,
}
// TODO Add NetworkConnectionType
std::unique_ptr<DataBroker> DataBrokerFactory::CreateServerBroker(std::string server_name, std::string source_path,
bool has_filesystem, SourceCredentials source,
Error* error) noexcept {
......
receiver/unittests/receiver_data_server/net_server/test_rds_fabric_server.cpp
+ 2
− 2
View file @ 96b72e42
......@@ -98,8 +98,8 @@ TEST_F(RdsFabricServerTests, Initialize_Error_DoubleInitialize) {
));
EXPECT_CALL(mock_fabric_server, GetAddress()).WillOnce(Return(
"TestAddress"
));
"TestAddress"
));
Error err = rds_server.Initialize();
ASSERT_THAT(rds_server.server__, Ne(nullptr));
......
tests/automatic/settings/receiver_fabric.json.tpl.lin.in 0 → 100644
+ 25
− 0
View file @ 96b72e42
{
"PerformanceDbServer":"localhost:8086",
"PerformanceDbName": "db_test",
"DatabaseServer":"auto",
"DiscoveryServer": "localhost:8400/asapo-discovery",
"DataServer": {
"AdvertiseURI": "127.0.0.1:{{ env "NOMAD_PORT_recv_ds" }}",
"NThreads": 2,
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }},
"NetworkMode": ["fabric"]
},
"DataCache": {
"Use": @RECEIVER_USE_CACHE@,
"SizeGB": 1,
"ReservedShare": 10
},
"AuthorizationServer": "localhost:8400/asapo-authorizer",
"AuthorizationInterval": 1000,
"ListenPort": {{ env "NOMAD_PORT_recv" }},
"Tag": "{{ env "NOMAD_ADDR_recv" }}",
"WriteToDisk": @RECEIVER_WRITE_TO_DISK@,
"ReceiveToDiskThresholdMB":50,
"WriteToDb": true,
"LogLevel" : "debug"
}
tests/automatic/settings/receiver.json.tpl.lin.in → tests/automatic/settings/receiver_tcp.json.tpl.lin.in
+ 2
− 1
View file @ 96b72e42
......@@ -6,7 +6,8 @@
"DataServer": {
"AdvertiseURI": "127.0.0.1:{{ env "NOMAD_PORT_recv_ds" }}",
"NThreads": 2,
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }}
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }},
"NetworkMode": ["tcp"]
},
"DataCache": {
"Use": @RECEIVER_USE_CACHE@,
......
tests/automatic/settings/receiver.json.tpl.win.in → tests/automatic/settings/receiver_tcp.json.tpl.win.in
+ 2
− 1
View file @ 96b72e42
......@@ -9,7 +9,8 @@
"DataServer": {
"AdvertiseURI": "127.0.0.1:{{ env "NOMAD_PORT_recv_ds" }}",
"NThreads": 2,
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }}
"ListenPort": {{ env "NOMAD_PORT_recv_ds" }},
"NetworkMode": ["tcp"]
},
"DataCache": {
"Use": @RECEIVER_USE_CACHE@,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use