Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sbd discovery di #106

Merged
merged 2 commits into from
Sep 21, 2022
Merged

Sbd discovery di #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2286ba1
Apply proper di in sbd discovery code
arbulu89 Sep 21, 2022
e832a6a
Move sbd test fixture files to better folder
arbulu89 Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions internal/cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ func NewClusterWithDiscoveryTools(discoveryTools *DiscoveryTools) (Cluster, erro
Provider: "",
}

commandExecutor := utils.Executor{}
cibParser := cib.NewCibAdminParser(discoveryTools.CibAdmPath)

cibConfig, err := cibParser.Parse()
Expand Down Expand Up @@ -109,7 +110,7 @@ func NewClusterWithDiscoveryTools(discoveryTools *DiscoveryTools) (Cluster, erro
cluster.Name = getName(cluster)

if cluster.IsFencingSBD() {
sbdData, err := NewSBD(cluster.ID, discoveryTools.SBDPath, discoveryTools.SBDConfigPath)
sbdData, err := NewSBD(commandExecutor, cluster.ID, discoveryTools.SBDPath, discoveryTools.SBDConfigPath)
if err != nil {
return cluster, err
}
Expand All @@ -119,7 +120,7 @@ func NewClusterWithDiscoveryTools(discoveryTools *DiscoveryTools) (Cluster, erro

cluster.DC = isDC(&cluster)

cloudIdentifier := cloud.NewIdentifier(utils.Executor{})
cloudIdentifier := cloud.NewIdentifier(commandExecutor)
provider, err := cloudIdentifier.IdentifyCloudProvider()
if err != nil {
log.Warn(errors.Wrap(err, "Cloud provider not identified"))
Expand Down
99 changes: 61 additions & 38 deletions internal/cluster/sbd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"
"io"
"os"
"os/exec"
"regexp"
"strconv"
"strings"
Expand All @@ -30,11 +29,12 @@ type SBD struct {
}

type SBDDevice struct {
sbdPath string
Device string `mapstructure:"device,omitempty"`
Status string `mapstructure:"status,omitempty"`
Dump SBDDump `mapstructure:"dump,omitempty"`
List []*SBDNode `mapstructure:"list,omitempty"`
executor utils.CommandExecutor
sbdPath string
Device string `mapstructure:"device,omitempty"`
Status string `mapstructure:"status,omitempty"`
Dump SBDDump `mapstructure:"dump,omitempty"`
List []*SBDNode `mapstructure:"list,omitempty"`
}

type SBDDump struct {
Expand All @@ -54,10 +54,7 @@ type SBDNode struct {
Status string `mapstructure:"status,omitempty"`
}

var sbdDumpExecCommand = exec.Command //nolint
var sbdListExecCommand = exec.Command //nolint

func NewSBD(cluster, sbdPath, sbdConfigPath string) (SBD, error) {
func NewSBD(executor utils.CommandExecutor, cluster, sbdPath, sbdConfigPath string) (SBD, error) {
var s = SBD{
cluster: cluster,
Devices: nil, // TODO check me, no slice of pointers needed
Expand All @@ -75,10 +72,10 @@ func NewSBD(cluster, sbdPath, sbdConfigPath string) (SBD, error) {

sbdDevice, ok := c["SBD_DEVICE"].(string)
if !ok {
return s, fmt.Errorf("could not cast sdb device to string, %v", c["SBD_DEVICE"])
return s, fmt.Errorf("could not cast sbd device to string, %v", c["SBD_DEVICE"])
arbulu89 marked this conversation as resolved.
Show resolved Hide resolved
}
for _, device := range strings.Split(strings.Trim(sbdDevice, "\""), ";") {
sbdDevice := NewSBDDevice(sbdPath, device)
sbdDevice := NewSBDDevice(executor, sbdPath, device)
err := sbdDevice.LoadDeviceData()
if err != nil {
log.Printf("Error getting sbd information: %s", err)
Expand Down Expand Up @@ -108,18 +105,19 @@ func getSBDConfig(sbdConfigPath string) (map[string]interface{}, error) {
return configMap, nil
}

func NewSBDDevice(sbdPath string, device string) SBDDevice {
func NewSBDDevice(executor utils.CommandExecutor, sbdPath, device string) SBDDevice {
return SBDDevice{ //nolint
sbdPath: sbdPath,
Device: device,
Status: SBDStatusUnknown,
executor: executor,
sbdPath: sbdPath,
Device: device,
Status: SBDStatusUnknown,
}
}

func (s *SBDDevice) LoadDeviceData() error {
var sbdErrors []string

dump, err := sbdDump(s.sbdPath, s.Device)
dump, err := sbdDump(s.executor, s.sbdPath, s.Device)
s.Dump = dump

if err != nil {
Expand All @@ -129,7 +127,7 @@ func (s *SBDDevice) LoadDeviceData() error {
s.Status = SBDStatusHealthy
}

list, err := sbdList(s.sbdPath, s.Device)
list, err := sbdList(s.executor, s.sbdPath, s.Device)
s.List = list

if err != nil {
Expand Down Expand Up @@ -164,37 +162,62 @@ func assignPatternResult(text string, pattern string) string {
// Timeout (loop) : 1
// Timeout (msgwait) : 10
// ==Header on disk /dev/vdc is dumped
func sbdDump(sbdPath string, device string) (SBDDump, error) {
var dump = SBDDump{} //nolint

sbdDump, err := sbdDumpExecCommand(sbdPath, "-d", device, "dump").Output()
sbdDumpStr := string(sbdDump)

// FIXME: declarative assignment and error checking on the atoi
dump.Header = assignPatternResult(sbdDumpStr, `Header version *: (.*)`)
dump.UUID = assignPatternResult(sbdDumpStr, `UUID *: (.*)`)
dump.Slots, _ = strconv.Atoi(assignPatternResult(sbdDumpStr, `Number of slots *: (.*)`))
dump.SectorSize, _ = strconv.Atoi(assignPatternResult(sbdDumpStr, `Sector size *: (.*)`))
dump.TimeoutWatchdog, _ = strconv.Atoi(assignPatternResult(sbdDumpStr, `Timeout \(watchdog\) *: (.*)`))
dump.TimeoutAllocate, _ = strconv.Atoi(assignPatternResult(sbdDumpStr, `Timeout \(allocate\) *: (.*)`))
dump.TimeoutLoop, _ = strconv.Atoi(assignPatternResult(sbdDumpStr, `Timeout \(loop\) *: (.*)`))
dump.TimeoutMsgwait, _ = strconv.Atoi(assignPatternResult(sbdDumpStr, `Timeout \(msgwait\) *: (.*)`))
func sbdDump(executor utils.CommandExecutor, sbdPath string, device string) (SBDDump, error) {
sbdDumpOutput, dumpErr := executor.Exec(sbdPath, "-d", device, "dump")
sbdDumpStr := string(sbdDumpOutput)

// Sanity check at the end, even in error case the sbd command can output some information
header := assignPatternResult(sbdDumpStr, `Header version *: (.*)`)
uuid := assignPatternResult(sbdDumpStr, `UUID *: (.*)`)
slots, err := strconv.Atoi(assignPatternResult(sbdDumpStr, `Number of slots *: (.*)`))
if err != nil {
log.Error("Error parsing Number of slots value as integer")
}
sectorSize, err := strconv.Atoi(assignPatternResult(sbdDumpStr, `Sector size *: (.*)`))
if err != nil {
log.Error("Error parsing Sector size value as integer")
}
timeoutWatchdog, err := strconv.Atoi(assignPatternResult(sbdDumpStr, `Timeout \(watchdog\) *: (.*)`))
if err != nil {
log.Error("Error parsing Timeout watchdog value as integer")
}
timeoutAllocate, err := strconv.Atoi(assignPatternResult(sbdDumpStr, `Timeout \(allocate\) *: (.*)`))
if err != nil {
return dump, errors.Wrap(err, "sbd dump command error")
log.Error("Error parsing Tiemout allocate value as integer")
}
timeoutLoop, err := strconv.Atoi(assignPatternResult(sbdDumpStr, `Timeout \(loop\) *: (.*)`))
if err != nil {
log.Error("Error parsing Timeout loop value as integer")
}
timeoutMsgwait, err := strconv.Atoi(assignPatternResult(sbdDumpStr, `Timeout \(msgwait\) *: (.*)`))
if err != nil {
log.Error("Error parsing Timeout msgwait value as integer")
}

sbdDump := SBDDump{
Header: header,
UUID: uuid,
Slots: slots,
SectorSize: sectorSize,
TimeoutWatchdog: timeoutWatchdog,
TimeoutAllocate: timeoutAllocate,
TimeoutLoop: timeoutLoop,
TimeoutMsgwait: timeoutMsgwait,
}

if dumpErr != nil {
return sbdDump, errors.Wrap(dumpErr, "sbd dump command error")
}

return dump, nil
return sbdDump, nil
}

// Possible output
// 0 hana01 clear
// 1 hana02 clear
func sbdList(sbdPath string, device string) ([]*SBDNode, error) {
func sbdList(executor utils.CommandExecutor, sbdPath, device string) ([]*SBDNode, error) {
var list = []*SBDNode{}

output, err := sbdListExecCommand(sbdPath, "-d", device, "list").Output()
output, err := executor.Exec(sbdPath, "-d", device, "list")

// Loop through sbd list output and find for matches
r := regexp.MustCompile(`(\d+)\s+(\S+)\s+(\S+)`)
Expand Down
Loading