Merge pull request #59 from RSE-Cambridge/lvm

Lvm debug testing

Author: JohnGarbutt

internal/pkg/pfsprovider/ansible/ansible.go

@@ -11,6 +11,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -35,14 +36,19 @@ type Wrapper struct {
 }
 
 var DefaultHostGroup = "dac-prod"
-var MaxMDTs uint = 24
+var DefaultMaxMDTs uint = 24
 
 func getInventory(fsType FSType, volume registry.Volume, brickAllocations []registry.BrickAllocation) string {
 	// NOTE: only used by lustre
 	mgsDevice := os.Getenv("DAC_MGS_DEV")
 	if mgsDevice == "" {
 		mgsDevice = "sdb"
 	}
+	maxMDTs := DefaultMaxMDTs
+	maxMDTsConf, err := strconv.ParseUint(os.Getenv("DAC_MAX_MDT_COUNT"), 10, 32)
+	if err == nil && maxMDTsConf > 0 {
+		maxMDTs = uint(maxMDTsConf)
+	}
 
 	allocationsByHost := make(map[string][]registry.BrickAllocation)
 	for _, allocation := range brickAllocations {
@@ -55,7 +61,7 @@ func getInventory(fsType FSType, volume registry.Volume, brickAllocations []regi
 		mdts := make(map[string]int)
 		osts := make(map[string]int)
 		for _, allocation := range allocations {
-			if allocation.AllocatedIndex < MaxMDTs {
+			if allocation.AllocatedIndex < maxMDTs {
 				mdts[allocation.Device] = int(allocation.AllocatedIndex)
 			}
 			osts[allocation.Device] = int(allocation.AllocatedIndex)
@@ -84,7 +90,7 @@ func getInventory(fsType FSType, volume registry.Volume, brickAllocations []regi
 			"mgsnode":     mgsnode,
 			"client_port": fmt.Sprintf("%d", volume.ClientPort),
 			"lnet_suffix": getLnetSuffix(),
-			"mdt_size":    fmt.Sprintf("%dg", getMdtSize()),
+			"mdt_size":    fmt.Sprintf("%dm", getMdtSizeMB()),
 		},
 		Hosts: hosts,
 	}

internal/pkg/pfsprovider/ansible/ansible_test.go

@@ -39,7 +39,7 @@ func TestPlugin_GetInventory(t *testing.T) {
       vars:
         abcdefgh_client_port: "10002"
         lnet_suffix: ""
-        abcdefgh_mdt_size: 20g
+        abcdefgh_mdt_size: 20480m
         abcdefgh_mgsnode: dac1
 `
 	assert.Equal(t, expected, result)
@@ -66,7 +66,7 @@ func TestPlugin_GetInventory_withNoOstOnOneHost(t *testing.T) {
       vars:
         abcdefgh_client_port: "10002"
         lnet_suffix: ""
-        abcdefgh_mdt_size: 20g
+        abcdefgh_mdt_size: 20480m
         abcdefgh_mgsnode: dac1
 `
 	assert.Equal(t, expected, result)
@@ -205,7 +205,7 @@ func TestPlugin_GetInventory_MaxMDT(t *testing.T) {
       vars:
         abcdefgh_client_port: "10002"
         lnet_suffix: ""
-        abcdefgh_mdt_size: 20g
+        abcdefgh_mdt_size: 20480m
         abcdefgh_mgsnode: dac1
 `
 	assert.Equal(t, expected, result)

internal/pkg/pfsprovider/ansible/mount.go

@@ -23,12 +23,16 @@ func getLnetSuffix() string {
 	return os.Getenv("DAC_LNET_SUFFIX")
 }
 
-func getMdtSize() uint {
-	mdtSize, err := strconv.ParseUint(os.Getenv("DAC_MDT_SIZE_GB"), 10, 32)
-	if err != nil ||  mdtSize == 0 {
-		mdtSize = 20
+func getMdtSizeMB() uint {
+	mdtSizeGB, err := strconv.ParseUint(os.Getenv("DAC_MDT_SIZE_GB"), 10, 32)
+	if err == nil && mdtSizeGB > 0 {
+		return uint(mdtSizeGB * 1024)
 	}
-	return uint(mdtSize)
+	mdtSizeMB, err := strconv.ParseUint(os.Getenv("DAC_MDT_SIZE_MB"), 10, 32)
+	if err == nil && mdtSizeMB > 0 {
+		return uint(mdtSizeMB)
+	}
+	return uint(20 * 1024)
 }
 
 func mount(fsType FSType, volume registry.Volume, brickAllocations []registry.BrickAllocation, attachments []registry.Attachment) error {