From 179fefc8b7932c3ecb00105b2e3ae462188d6b9f Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Fri, 3 Apr 2020 07:54:32 -0400 Subject: [PATCH] agent config parsing tests for scheduler config --- command/agent/config_parse_test.go | 7 +++++++ command/agent/testdata/basic.hcl | 8 ++++++++ command/agent/testdata/basic.json | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/command/agent/config_parse_test.go b/command/agent/config_parse_test.go index 63420a496..cd1284774 100644 --- a/command/agent/config_parse_test.go +++ b/command/agent/config_parse_test.go @@ -125,6 +125,13 @@ var basicConfig = &Config{ RetryIntervalHCL: "15s", RetryMaxAttempts: 3, }, + DefaultSchedulerConfig: &structs.SchedulerConfiguration{ + PreemptionConfig: structs.PreemptionConfig{ + SystemSchedulerEnabled: true, + BatchSchedulerEnabled: true, + ServiceSchedulerEnabled: true, + }, + }, }, ACL: &ACLConfig{ Enabled: true, diff --git a/command/agent/testdata/basic.hcl b/command/agent/testdata/basic.hcl index 8a39ce88e..a4edcfef6 100644 --- a/command/agent/testdata/basic.hcl +++ b/command/agent/testdata/basic.hcl @@ -133,6 +133,14 @@ server { retry_max = 3 retry_interval = "15s" } + + default_scheduler_config { + preemption_config { + batch_scheduler_enabled = true + system_scheduler_enabled = true + service_scheduler_enabled = true + } + } } acl { diff --git a/command/agent/testdata/basic.json b/command/agent/testdata/basic.json index 30b3ea803..0052b6862 100644 --- a/command/agent/testdata/basic.json +++ b/command/agent/testdata/basic.json @@ -296,6 +296,13 @@ "1.1.1.1", "2.2.2.2" ], + "default_scheduler_config": [{ + "preemption_config": [{ + "batch_scheduler_enabled": true, + "system_scheduler_enabled": true, + "service_scheduler_enabled": true + }] + }], "upgrade_version": "0.8.0" } ],