Skip to content
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.

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

Feature/automatic monitor #60

Merged
merged 19 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 61 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,34 @@
"ignoreFailures": true
}
]
},{
"name": "Test Scheduler",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/build/k2eg-test",
"args": ["--gtest_filter=Scheduler.SubmitAndRemoveLongRunnignTask*"],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [
{
"name": "LD_LIBRARY_PATH",
"value": "$LD_LIBRARY_PATH:${workspaceFolder}/build/local/lib:${workspaceFolder}/build/local/lib/linux_86_64"
}
],
"externalConsole": false,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"description": "Set Disassembly Flavor to Intel",
"text": "-gdb-set disassembly-flavor intel",
"ignoreFailures": true
}
]
},{
"name": "Test CMDController",
"type": "cppdbg",
Expand Down Expand Up @@ -284,7 +312,39 @@
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/build/k2eg-test",
"args": ["--gtest_filter=NodeController.*"],
"args": ["--gtest_filter=NodeController.MonitorCommandAfterReboot*"],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [
// {
// "name": "LSAN_OPTIONS",
// "value": "verbosity=1:log_threads=1"
// },
{
"name": "LD_LIBRARY_PATH",
"value": "$LD_LIBRARY_PATH:${workspaceFolder}/build/local/lib:${workspaceFolder}/build/local/lib/linux_86_64"
}
],
"externalConsole": false,
"MIMode": "gdb",
"setupCommands": [
{
"description": "Enable pretty-printing for gdb",
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"description": "Set Disassembly Flavor to Intel",
"text": "-gdb-set disassembly-flavor intel",
"ignoreFailures": true
}
]
},{
"name": "Test NodeControllerMonitorChecker",
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/build/k2eg-test",
"args": ["--gtest_filter=NodeControllerMonitorChecker.SimulateStartMonitorDuringAutomaticStop*"],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [
Expand Down
27 changes: 26 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ set(MSGPACK_VERSION cpp-6.0.0)
set(CURL_VERSION curl-7_88_1)
set(ZLIB_VERSION v1.2.13)
set(PROMETHEUS_VERSION v1.1.0)
SET(CRONCPP_VERSION v2023.03.30)
set(GTEST_VERSION 1.8.0)

# set(PROTOBUF_VERSION v22.0)
Expand Down Expand Up @@ -89,13 +90,17 @@ set(COMMON_SOURCE_FILES

src/k2eg/service/log/impl/BoostLogger.cpp

src/k2eg/service/scheduler/Scheduler.cpp
src/k2eg/service/scheduler/Task.cpp

src/k2eg/controller/command/CMDController.cpp
src/k2eg/controller/command/CMDCommand.cpp

src/k2eg/controller/node/NodeController.cpp
src/k2eg/controller/node/configuration/NodeConfiguration.cpp
src/k2eg/controller/node/worker/CommandWorker.cpp
src/k2eg/controller/node/worker/MonitorCommandWorker.cpp
src/k2eg/controller/node/worker/monitor/MonitorCommandWorker.cpp
src/k2eg/controller/node/worker/monitor/MonitorChecker.cpp
src/k2eg/controller/node/worker/GetCommandWorker.cpp
src/k2eg/controller/node/worker/PutCommandWorker.cpp
)
Expand Down Expand Up @@ -135,10 +140,12 @@ set(TEST_SOURCE_FILES
test/common/ProgramOptions.cpp
test/controller/CMDController.cpp
test/controller/NodeController.cpp
test/controller/NodeControllerMonitorChecker.cpp
test/controller/NodeControllerReplyMessages.cpp
test/metric/EpicsMetric.cpp
test/metric/CMDMetric.cpp
test/metric/NodeControllerMetric.cpp
test/scheduler/Scheduler.cpp
${COMMON_SOURCE_FILES}
)

Expand Down Expand Up @@ -395,6 +402,24 @@ SET(BUILD_LIBRARY ${BUILD_LIBRARY} prometheus-cpp-pull prometheus-cpp-core curl)
ADD_DEPENDENCIES(${PROJECT_NAME} prometheus)
ADD_DEPENDENCIES(${PROJECT_NAME}-test prometheus)

# ---------- cron scheduler-----
ExternalProject_Add(
croncpp
GIT_REPOSITORY https://github.com/mariusbancila/croncpp.git
GIT_TAG ${CRONCPP_VERSION}
PREFIX "${CMAKE_CURRENT_BINARY_DIR}/croncpp"
LOG_DOWNLOAD ON
LOG_CONFIGURE ON
LOG_BUILD ON
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
)
#SET(BUILD_LIBRARY ${BUILD_LIBRARY} cron)
ADD_DEPENDENCIES(${PROJECT_NAME} croncpp)
ADD_DEPENDENCIES(${PROJECT_NAME}-test croncpp)

# --------Google Test------
message(STATUS "Setup GTest version ${GTEST_VERSION}")
ExternalProject_Add(
Expand Down
Loading
Loading