Merge pull request #259 from Mongey/cm-mem

Set memory_oversubscription_enabled in resourceSchedulerConfigurationRead
hashicorp · Mar 2, 2022 · 6db9328 · 6db9328
2 parents d7524c4 + e316d4f
commit 6db9328
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 0 deletions.
diff --git a/nomad/resource_scheduler_config.go b/nomad/resource_scheduler_config.go
@@ -136,6 +136,10 @@ func resourceSchedulerConfigurationRead(d *schema.ResourceData, meta interface{}
 		return err
 	}
 
+	if err := d.Set("memory_oversubscription_enabled", config.SchedulerConfig.MemoryOversubscriptionEnabled); err != nil {
+		return err
+	}
+
 	premptMap := map[string]bool{
 		"batch_scheduler_enabled":    config.SchedulerConfig.PreemptionConfig.BatchSchedulerEnabled,
 		"service_scheduler_enabled":  config.SchedulerConfig.PreemptionConfig.ServiceSchedulerEnabled,

diff --git a/nomad/resource_scheduler_config_test.go b/nomad/resource_scheduler_config_test.go
@@ -1,8 +1,10 @@
 package nomad
 
 import (
+	"log"
 	"testing"
 
+	"github.com/hashicorp/nomad/api"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
@@ -122,6 +124,50 @@ func TestSchedulerConfig_basic(t *testing.T) {
 	})
 }
 
+func TestSchedulerConfig_memoryOversubscriptionEnabledOutsideTest(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testProviders,
+		CheckDestroy: testFinalConfiguration,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNomadSchedulerConfigMemoryOversubscriptionOff,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"nomad_scheduler_config.config",
+						"memory_oversubscription_enabled",
+						"false",
+					),
+				),
+			},
+			{
+				PreConfig: func() {
+					providerConfig := testProvider.Meta().(ProviderConfig)
+					client := providerConfig.client
+					operator := client.Operator()
+
+					config := api.SchedulerConfiguration{
+						MemoryOversubscriptionEnabled: true,
+						PreemptionConfig: api.PreemptionConfig{
+							SysBatchSchedulerEnabled: true,
+							SystemSchedulerEnabled:   false,
+							BatchSchedulerEnabled:    false,
+							ServiceSchedulerEnabled:  true,
+						},
+					}
+					if _, _, err := operator.SchedulerSetConfiguration(&config, nil); err != nil {
+						log.Printf("[ERROR] upserting scheduler configuration: %s", err.Error())
+					}
+					log.Printf("[DEBUG] Upserted scheduler configuration")
+				},
+				Config:             testAccNomadSchedulerConfigMemoryOversubscription,
+				PlanOnly:           true,
+				ExpectNonEmptyPlan: false,
+			},
+		},
+	})
+}
+
 const testAccNomadSchedulerConfigSpread = `
 resource "nomad_scheduler_config" "config" {
 	scheduler_algorithm = "spread"
@@ -146,6 +192,18 @@ resource "nomad_scheduler_config" "config" {
 }
 `
 
+const testAccNomadSchedulerConfigMemoryOversubscriptionOff = `
+resource "nomad_scheduler_config" "config" {
+	memory_oversubscription_enabled = false
+	scheduler_algorithm = "binpack"
+	preemption_config = {
+		sysbatch_scheduler_enabled = true
+		system_scheduler_enabled = false
+		batch_scheduler_enabled = false
+		service_scheduler_enabled = true
+	}
+}
+`
 const testAccNomadSchedulerConfigMemoryOversubscription = `
 resource "nomad_scheduler_config" "config" {
 	memory_oversubscription_enabled = true