Address comment

determined-ai · Oct 17, 2024 · 86794b5 · 86794b5
1 parent eea42c6
commit 86794b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/master/pkg/model/task_container_defaults.go b/master/pkg/model/task_container_defaults.go
@@ -49,7 +49,7 @@ type TaskContainerDefaultsConfig struct {
 
 	StartupHook string `json:"startup_hook"`
 
-	LogPolicies *expconf.LogPoliciesConfig `json:"log_policies"`
+	LogPolicies expconf.LogPoliciesConfig `json:"log_policies"`
 
 	PreemptionTimeout int `json:"preemption_timeout,omitempty"`
 
@@ -319,13 +319,10 @@ func (c TaskContainerDefaultsConfig) Merge(
 		res.Pbs.SetSbatchArgs(tmp)
 	}
 
-	if other.LogPolicies != nil {
-		if res.LogPolicies == nil {
-			res.LogPolicies = other.LogPolicies
-		} else {
-			logPolicies := res.LogPolicies.Merge(*other.LogPolicies)
-			res.LogPolicies = &logPolicies
-		}
+	if res.LogPolicies == nil {
+		res.LogPolicies = other.LogPolicies
+	} else {
+		res.LogPolicies = res.LogPolicies.Merge(other.LogPolicies)
 	}
 
 	if other.PreemptionTimeout > 0 {

diff --git a/master/pkg/schemas/expconf/log_pattern_config.go b/master/pkg/schemas/expconf/log_pattern_config.go
@@ -22,14 +22,14 @@ const (
 type LogPoliciesConfigV0 []LogPolicyV0
 
 // WithDefaults implements the Defaultable psuedointerface.
-func (b *LogPoliciesConfigV0) WithDefaults() *LogPoliciesConfigV0 {
+func (b LogPoliciesConfigV0) WithDefaults() LogPoliciesConfigV0 {
 	eccErrorPattern := ECCErrorPattern
 	eccErrorSignal := ECCErrorSignal
 	cudaOomPattern := CUDAOOMPattern
 	cudaOomSignal := CUDAOOMSignal
 
-	if b != nil && len(*b) == 0 {
-		return &LogPoliciesConfigV0{
+	if b != nil && len(b) == 0 {
+		return LogPoliciesConfigV0{
 			LogPolicyV0{RawPattern: eccErrorPattern, RawActions: []LogActionV0{{Signal: &eccErrorSignal}}},
 			LogPolicyV0{RawPattern: cudaOomPattern, RawActions: []LogActionV0{{Signal: &cudaOomSignal}}},
 		}