Skip to content

Replace floating-point seconds with integer milliseconds in timing config #388

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.

Sign up for GitHub

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

Open
shegazyy wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Replace floating-point seconds with integer milliseconds in timing config #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6110efe
Replace floating-point seconds with integer milliseconds in config
shegazyy Jul 28, 2026
31dcfb5
Address review: _ms suffixes, revert schema version, fix warning
shegazyy Aug 3, 2026
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
64 changes: 34 additions & 30 deletions score/launch_manager/src/daemon/src/configuration/details/flatbuffer_config_loader_UT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ ::flatbuffers::Offset<fb::DeploymentConfig> buildDefaultDeploymentConfig(::flatb
auto sandbox = buildDefaultSandbox(fbb);
return fb::CreateDeploymentConfig(
fbb,
1.0 /*ready_timeout*/,
1.0 /*shutdown_timeout*/,
1000 /*ready_timeout_ms*/,
1000 /*shutdown_timeout_ms*/,
0 /*environmental_variables*/,
bin_dir,
work_dir,
Expand Down Expand Up @@ -111,8 +111,9 @@ std::vector<uint8_t> buildConfigWithComponents(
::flatbuffers::FlatBufferBuilder& fbb,
::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<fb::Component>>> comps)
{
auto fallback = fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1.0 /*transition_timeout*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1.0 /*evaluation_cycle*/);
auto fallback =
fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1000 /*transition_timeout_ms*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1000 /*evaluation_cycle_ms*/);
auto rts = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::RunTarget>>{});
auto irt = fbb.CreateString("Startup");
auto config = fb::CreateLaunchManagerConfig(
Expand All @@ -124,8 +125,9 @@ std::vector<uint8_t> buildConfigWithRunTargets(
::flatbuffers::FlatBufferBuilder& fbb,
::flatbuffers::Offset<::flatbuffers::Vector<::flatbuffers::Offset<fb::RunTarget>>> rts)
{
auto fallback = fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1.0 /*transition_timeout*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1.0 /*evaluation_cycle*/);
auto fallback =
fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1000 /*transition_timeout_ms*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1000 /*evaluation_cycle_ms*/);
auto comps = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::Component>>{});
auto irt = fbb.CreateString("Startup");
auto config = fb::CreateLaunchManagerConfig(
Expand Down Expand Up @@ -163,8 +165,8 @@ class FlatbufferConfigLoaderTest : public ::testing::Test
::flatbuffers::FlatBufferBuilder fbb;
auto irt = fbb.CreateString(initial_run_target);
auto fallback =
fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1.0 /*transition_timeout*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1.0 /*evaluation_cycle*/);
fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1000 /*transition_timeout_ms*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1000 /*evaluation_cycle_ms*/);
auto comps = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::Component>>{});
auto rts = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::RunTarget>>{});
auto config = fb::CreateLaunchManagerConfig(fbb, schema_version, comps, rts, irt, fallback, alive_sup);
Expand Down Expand Up @@ -204,7 +206,7 @@ TEST_F(FlatbufferConfigLoaderTest, LoadSingleComponent)
::flatbuffers::FlatBufferBuilder fbb;

auto alive_sup = fb::CreateComponentAliveSupervision(
fbb, 0.5 /*reporting_cycle*/, 2 /*failed_cycles_tolerance*/, 1 /*min_indications*/, 3 /*max_indications*/);
fbb, 500 /*reporting_cycle_ms*/, 2 /*failed_cycles_tolerance*/, 1 /*min_indications*/, 3 /*max_indications*/);
auto app_profile = fb::CreateApplicationProfile(
fbb, fb::ApplicationType::Reporting_And_Supervised, true /*is_self_terminating*/, alive_sup);
auto bin_name = fbb.CreateString("my_binary");
Expand All @@ -220,8 +222,8 @@ TEST_F(FlatbufferConfigLoaderTest, LoadSingleComponent)
auto sandbox = buildDefaultSandbox(fbb);
auto deploy = fb::CreateDeploymentConfig(
fbb,
1.5 /*ready_timeout*/,
2.5 /*shutdown_timeout*/,
1500 /*ready_timeout_ms*/,
2500 /*shutdown_timeout_ms*/,
0 /*environmental_variables*/,
bin_dir,
work_dir,
Expand Down Expand Up @@ -277,7 +279,7 @@ TEST_F(FlatbufferConfigLoaderTest, LoadRunTargets)
auto rt_desc = fbb.CreateString("Initial state");
auto rt_dep = fbb.CreateString("component_a");
auto rt_deps = fbb.CreateVector(std::vector<::flatbuffers::Offset<::flatbuffers::String>>{rt_dep});
auto rt = fb::CreateRunTarget(fbb, rt_name, rt_desc, rt_deps, 5.0 /*transition_timeout*/, switch_action);
auto rt = fb::CreateRunTarget(fbb, rt_name, rt_desc, rt_deps, 5000 /*transition_timeout_ms*/, switch_action);
auto rts = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::RunTarget>>{rt});

auto result = loadBuffer(buildConfigWithRunTargets(fbb, rts));
Expand All @@ -303,9 +305,9 @@ TEST_F(FlatbufferConfigLoaderTest, LoadFallbackRunTarget)
auto fb_desc = fbb.CreateString("Fallback state");
auto fb_dep = fbb.CreateString("critical_comp");
auto fb_deps = fbb.CreateVector(std::vector<::flatbuffers::Offset<::flatbuffers::String>>{fb_dep});
auto fallback = fb::CreateFallbackRunTarget(fbb, fb_desc, fb_deps, 10.0 /*transition_timeout*/);
auto fallback = fb::CreateFallbackRunTarget(fbb, fb_desc, fb_deps, 10000 /*transition_timeout_ms*/);

auto alive_sup = fb::CreateAliveSupervision(fbb, 1.0 /*evaluation_cycle*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1000 /*evaluation_cycle_ms*/);
auto comps = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::Component>>{});
auto rts = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::RunTarget>>{});
auto irt = fbb.CreateString("Startup");
Expand All @@ -328,8 +330,9 @@ TEST_F(FlatbufferConfigLoaderTest, LoadAliveSupervision)

::flatbuffers::FlatBufferBuilder fbb;

auto alive_sup = fb::CreateAliveSupervision(fbb, 0.25 /*evaluation_cycle*/);
auto fallback = fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1.0 /*transition_timeout*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 250 /*evaluation_cycle_ms*/);
auto fallback =
fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1000 /*transition_timeout_ms*/);
auto comps = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::Component>>{});
auto rts = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::RunTarget>>{});
auto irt = fbb.CreateString("Startup");
Expand All @@ -350,10 +353,11 @@ TEST_F(FlatbufferConfigLoaderTest, LoadWatchdog)

auto dev_path = fbb.CreateString("/dev/watchdog0");
auto watchdog = fb::CreateWatchdog(
fbb, dev_path, 30.0 /*max_timeout*/, true /*deactivate_on_shutdown*/, false /*require_magic_close*/);
fbb, dev_path, 30000 /*max_timeout_ms*/, true /*deactivate_on_shutdown*/, false /*require_magic_close*/);

auto fallback = fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1.0 /*transition_timeout*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1.0 /*evaluation_cycle*/);
auto fallback =
fb::CreateFallbackRunTarget(fbb, 0 /*description*/, 0 /*depends_on*/, 1000 /*transition_timeout_ms*/);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1000 /*evaluation_cycle_ms*/);
auto comps = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::Component>>{});
auto rts = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::RunTarget>>{});
auto irt = fbb.CreateString("Startup");
Expand All @@ -378,14 +382,14 @@ TEST_F(FlatbufferConfigLoaderTest, LoadRestartRecoveryAction)

::flatbuffers::FlatBufferBuilder fbb;

auto restart = fb::CreateRestartAction(fbb, 3 /*number_of_attempts*/, 1.5 /*delay_before_restart*/);
auto restart = fb::CreateRestartAction(fbb, 3 /*number_of_attempts*/, 1500 /*delay_before_restart_ms*/);
auto bin_dir = fbb.CreateString("/opt");
auto work_dir = fbb.CreateString("/tmp");
auto sandbox = buildDefaultSandbox(fbb);
auto deploy = fb::CreateDeploymentConfig(
fbb,
1.0 /*ready_timeout*/,
1.0 /*shutdown_timeout*/,
1000 /*ready_timeout_ms*/,
1000 /*shutdown_timeout_ms*/,
0 /*environmental_variables*/,
bin_dir,
work_dir,
Expand Down Expand Up @@ -417,7 +421,7 @@ TEST_F(FlatbufferConfigLoaderTest, LoadSwitchRunTargetAction)
auto switch_action = fb::CreateSwitchRunTargetAction(fbb, target_name);
auto rt_name = fbb.CreateString("Startup");
auto rt = fb::CreateRunTarget(
fbb, rt_name, 0 /*description*/, 0 /*depends_on*/, 1.0 /*transition_timeout*/, switch_action);
fbb, rt_name, 0 /*description*/, 0 /*depends_on*/, 1000 /*transition_timeout_ms*/, switch_action);
auto rts = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::RunTarget>>{rt});

auto result = loadBuffer(buildConfigWithRunTargets(fbb, rts));
Expand Down Expand Up @@ -449,8 +453,8 @@ TEST_F(FlatbufferConfigLoaderTest, LoadSandbox)
auto work_dir = fbb.CreateString("/tmp");
auto deploy = fb::CreateDeploymentConfig(
fbb,
0.5 /*ready_timeout*/,
0.5 /*shutdown_timeout*/,
500 /*ready_timeout_ms*/,
500 /*shutdown_timeout_ms*/,
0 /*environmental_variables*/,
bin_dir,
work_dir,
Expand Down Expand Up @@ -487,7 +491,7 @@ TEST_F(FlatbufferConfigLoaderTest, LoadComponentAliveSupervision)
::flatbuffers::FlatBufferBuilder fbb;

auto comp_alive_sup = fb::CreateComponentAliveSupervision(
fbb, 1.0 /*reporting_cycle*/, 3 /*failed_cycles_tolerance*/, 2 /*min_indications*/, 5 /*max_indications*/);
fbb, 1000 /*reporting_cycle_ms*/, 3 /*failed_cycles_tolerance*/, 2 /*min_indications*/, 5 /*max_indications*/);
auto app_profile = fb::CreateApplicationProfile(
fbb, fb::ApplicationType::Reporting_And_Supervised, false /*is_self_terminating*/, comp_alive_sup);
auto bin_name = fbb.CreateString("supervised_bin");
Expand Down Expand Up @@ -530,8 +534,8 @@ TEST_F(FlatbufferConfigLoaderTest, LoadEnvironmentalVariables)
auto sandbox = buildDefaultSandbox(fbb);
auto deploy = fb::CreateDeploymentConfig(
fbb,
0.5 /*ready_timeout*/,
0.5 /*shutdown_timeout*/,
500 /*ready_timeout_ms*/,
500 /*shutdown_timeout_ms*/,
env_vars,
bin_dir,
work_dir,
Expand Down Expand Up @@ -682,8 +686,8 @@ TEST_F(FlatbufferConfigLoaderTest, MissingSchemaVersionReturnsInvalidFormat)

::flatbuffers::FlatBufferBuilder fbb;
auto irt = fbb.CreateString("Startup");
auto fallback = fb::CreateFallbackRunTarget(fbb, 0, 0, 1.0);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1.0);
auto fallback = fb::CreateFallbackRunTarget(fbb, 0, 0, 1000);
auto alive_sup = fb::CreateAliveSupervision(fbb, 1000);
auto comps = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::Component>>{});
auto rts = fbb.CreateVector(std::vector<::flatbuffers::Offset<fb::RunTarget>>{});
auto config = fb::CreateLaunchManagerConfig(fbb, std::nullopt, comps, rts, irt, fallback, alive_sup);
Expand Down
Loading
Loading