Fix minor issues in unit tests

PR-repos: pmdk@PR-38:11 Priority: 2 Cancel-prev-build: false Skip-build-ubuntu20-rpm Skip-build-leap15-rpm Skip-build-leap15-icc Skip-build-el9-rpm Skip-nlt: false Skip-unit-tests: false Skip-func-test-vm: false Skip-test-rpms: false Allow-unstable-test: true Skip-func-hw-test-large: true Skip-func-hw-test-medium: false Skip-func-hw-test-medium-verbs-provider: true Required-githooks: true Signed-off-by: Tomasz Gromadzki <[email protected]>
daos-stack · Aug 28, 2024 · e7ec17d · e7ec17d
1 parent 2f82fcd
commit e7ec17d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/control/cmd/dmg/auto_test.go b/src/control/cmd/dmg/auto_test.go
@@ -552,6 +552,8 @@ engines:
 - targets: 12
   nr_xs_helpers: 2
   log_file: /tmp/daos_engine.0.log
+  env_vars:
+  - ABT_THREAD_STACKSIZE=18432
   storage:
   - class: dcpm
     scm_mount: /mnt/daos0

diff --git a/src/control/server/engine/config.go b/src/control/server/engine/config.go
@@ -357,7 +357,7 @@ func (c *Config) Validate() error {
 		} else {
 			i, err1 := strconv.Atoi(stacksize)
 			if err != nil || err1 != nil || i < MIN_ABT_THREAD_STACKSIZE_FOR_DCPM {
-				return errors.New(fmt.Sprintf("env_var ABT_THREAD_STACKSIZE should >= %d for `dcpm` storage class",
+				return errors.New(fmt.Sprintf("env_var ABT_THREAD_STACKSIZE should be >= %d for `dcpm` storage class",
 					MIN_ABT_THREAD_STACKSIZE_FOR_DCPM))
 			}
 		}
@@ -500,7 +500,8 @@ func (c *Config) WithSystemName(name string) *Config {
 func (c *Config) WithStorage(cfgs ...*storage.TierConfig) *Config {
 	c.Storage.Tiers = storage.TierConfigs{}
 	c.AppendStorage(cfgs...)
-	if c.Storage.Tiers[0].IsSCM() && c.Storage.Tiers[0].Class == storage.ClassDcpm {
+	if len(c.Storage.Tiers) > 0 && c.Storage.Tiers[0].IsSCM() &&
+		c.Storage.Tiers[0].Class == storage.ClassDcpm {
 		return c.WithStackSizeForDCPM()
 	}
 	return c