Get and put the cluster state in cluster discovery payload

Author: arbulu89

internal/core/cluster/cluster.go

@@ -30,6 +30,7 @@ const (
 	stonithResourceMissing string = "notconfigured"
 	stonithAgent           string = "stonith:"
 	sbdFencingAgentName    string = "external/sbd"
+	unknownState           string = "unknown"
 )
 
 type DiscoveryTools struct {
@@ -41,6 +42,7 @@ type DiscoveryTools struct {
 	SBDConfigPath      string
 	CommandExecutor    utils.CommandExecutor
 	SystemdConnector   systemd.Systemd
+	CmdClient          CmdClient
 }
 
 type BasicInfo struct {
@@ -57,6 +59,7 @@ type Cluster struct {
 	DC       bool
 	Provider string
 	Online   bool
+	State    string
 }
 
 func Md5sumFile(filePath string) (string, error) {
@@ -90,6 +93,7 @@ func NewCluster(ctx context.Context) (*Cluster, error) {
 		SBDConfigPath:      SBDConfigPath,
 		CommandExecutor:    utils.Executor{},
 		SystemdConnector:   systemdConn,
+		CmdClient:          NewDefaultCmdClient(),
 	})
 }
 
@@ -105,7 +109,7 @@ func NewClusterWithDiscoveryTools(ctx context.Context, discoveryTools *Discovery
 	if !isHostOnline(ctx, discoveryTools) {
 		return makeOfflineHostPayload(detectedCluster)
 	}
-	return makeOnlineHostPayload(detectedCluster, discoveryTools)
+	return makeOnlineHostPayload(ctx, detectedCluster, discoveryTools)
 }
 
 func detectCluster(discoveryTools *DiscoveryTools) (BasicInfo, bool, error) {
@@ -153,14 +157,22 @@ func makeOfflineHostPayload(detectedCluster BasicInfo) (*Cluster, error) {
 	}, nil
 }
 
-func makeOnlineHostPayload(detectedCluster BasicInfo, discoveryTools *DiscoveryTools) (*Cluster, error) {
+func makeOnlineHostPayload(
+	ctx context.Context, detectedCluster BasicInfo, discoveryTools *DiscoveryTools,
+) (*Cluster, error) {
 	cibParser := cib.NewCibAdminParser(discoveryTools.CibAdmPath)
 
 	cibConfig, err := cibParser.Parse()
 	if err != nil {
 		return nil, err
 	}
 
+	state, err := discoveryTools.CmdClient.GetState(ctx)
+	if err != nil {
+		slog.Error("Error discovering cluster state", "error", err)
+		state = unknownState
+	}
+
 	var cluster = &Cluster{
 		Cib:      cib.Root{},    //nolint
 		Crmmon:   crmmon.Root{}, //nolint
@@ -170,6 +182,7 @@ func makeOnlineHostPayload(detectedCluster BasicInfo, discoveryTools *DiscoveryT
 		DC:       false,
 		Provider: "",
 		Online:   true,
+		State:    strings.ToLower(strings.TrimPrefix(state, "S_")),
 	}
 
 	cluster.Cib = cibConfig

internal/core/cluster/cluster_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/trento-project/agent/internal/core/cluster"
 	"github.com/trento-project/agent/internal/core/cluster/cib"
 	"github.com/trento-project/agent/internal/core/cluster/crmmon"
+	mocksCluster "github.com/trento-project/agent/internal/core/cluster/mocks"
 	mocksSystemd "github.com/trento-project/agent/internal/core/systemd/mocks"
 	"github.com/trento-project/agent/pkg/utils/mocks"
 	"github.com/trento-project/agent/test/helpers"
@@ -42,6 +43,9 @@ func (suite *ClusterTestSuite) TestNewClusterWithDiscoveryTools() {
 	mockSystemd.On("IsActive", ctx, "corosync.service").Return(true, nil)
 	mockSystemd.On("IsActive", ctx, "pacemaker.service").Return(true, nil)
 
+	mockCmdClient := new(mocksCluster.MockCmdClient)
+	mockCmdClient.On("GetState", ctx).Return("S_IDLE", nil)
+
 	c, err := cluster.NewClusterWithDiscoveryTools(ctx, &cluster.DiscoveryTools{
 		CibAdmPath:         helpers.GetFixturePath("discovery/cluster/fake_cibadmin.sh"),
 		CrmmonAdmPath:      helpers.GetFixturePath("discovery/cluster/fake_crm_mon.sh"),
@@ -51,13 +55,15 @@ func (suite *ClusterTestSuite) TestNewClusterWithDiscoveryTools() {
 		SBDConfigPath:      helpers.GetFixturePath("discovery/cluster/sbd/sbd_config"),
 		CommandExecutor:    mockCommand,
 		SystemdConnector:   mockSystemd,
+		CmdClient:          mockCmdClient,
 	})
 
 	suite.Equal("hana_cluster", c.Name)
 	suite.Equal("47d1190ffb4f781974c8356d7f863b03", c.ID)
 	suite.Equal(false, c.DC)
 	suite.Equal("azure", c.Provider)
 	suite.Equal("/dev/vdc;/dev/vdb", c.SBD.Config["SBD_DEVICE"])
+	suite.Equal("idle", c.State)
 	suite.NoError(err)
 }
 
@@ -71,6 +77,9 @@ func (suite *ClusterTestSuite) TestNewClusterDisklessSBD() {
 	mockSystemd.On("IsActive", ctx, "corosync.service").Return(true, nil)
 	mockSystemd.On("IsActive", ctx, "pacemaker.service").Return(true, nil)
 
+	mockCmdClient := new(mocksCluster.MockCmdClient)
+	mockCmdClient.On("GetState", ctx).Return("S_IDLE", nil)
+
 	c, err := cluster.NewClusterWithDiscoveryTools(ctx, &cluster.DiscoveryTools{
 		CibAdmPath:         helpers.GetFixturePath("discovery/cluster/fake_cibadmin.sh"),
 		CrmmonAdmPath:      helpers.GetFixturePath("discovery/cluster/fake_crm_mon_diskless_sbd.sh"),
@@ -80,6 +89,7 @@ func (suite *ClusterTestSuite) TestNewClusterDisklessSBD() {
 		SBDConfigPath:      helpers.GetFixturePath("discovery/cluster/sbd/sbd_config_no_device"),
 		CommandExecutor:    mockCommand,
 		SystemdConnector:   mockSystemd,
+		CmdClient:          mockCmdClient,
 	})
 
 	suite.Equal("hana_cluster", c.Name)
@@ -116,6 +126,7 @@ func (suite *ClusterTestSuite) TestNewClusterWithOfflineHost() {
 		SBDConfigPath:      helpers.GetFixturePath("discovery/cluster/sbd/sbd_config"),
 		CommandExecutor:    mockCommand,
 		SystemdConnector:   mockSystemd,
+		CmdClient:          new(mocksCluster.MockCmdClient),
 	})
 
 	suite.Equal("hana_cluster", c.Name)
@@ -148,6 +159,7 @@ func (suite *ClusterTestSuite) TestNewClusterWithOfflineHostNoName() {
 		SBDConfigPath:      helpers.GetFixturePath("discovery/cluster/sbd/sbd_config"),
 		CommandExecutor:    mockCommand,
 		SystemdConnector:   mockSystemd,
+		CmdClient:          new(mocksCluster.MockCmdClient),
 	})
 
 	suite.Equal("", c.Name)
@@ -156,6 +168,39 @@ func (suite *ClusterTestSuite) TestNewClusterWithOfflineHostNoName() {
 	suite.NoError(err)
 }
 
+func (suite *ClusterTestSuite) TestNewClusterWithUnknownState() {
+	ctx := context.Background()
+	mockCommand := new(mocks.MockCommandExecutor)
+	mockCommand.On("Output", "/usr/sbin/dmidecode", "-s", "chassis-asset-tag").
+		Return([]byte("7783-7084-3265-9085-8269-3286-77"), nil)
+	mockCommand.On("Output", "/usr/sbin/sbd", "-d", "/dev/vdb", "dump").Return(mockSbdDump(), nil)
+	mockCommand.On("Output", "/usr/sbin/sbd", "-d", "/dev/vdb", "list").Return(mockSbdList(), nil)
+	mockCommand.On("Output", "/usr/sbin/sbd", "-d", "/dev/vdc", "dump").Return(mockSbdDump(), nil)
+	mockCommand.On("Output", "/usr/sbin/sbd", "-d", "/dev/vdc", "list").Return(mockSbdList(), nil)
+
+	mockSystemd := new(mocksSystemd.MockSystemd)
+	mockSystemd.On("IsActive", ctx, "corosync.service").Return(true, nil)
+	mockSystemd.On("IsActive", ctx, "pacemaker.service").Return(true, nil)
+
+	mockCmdClient := new(mocksCluster.MockCmdClient)
+	mockCmdClient.On("GetState", ctx).Return("", errors.New(""))
+
+	c, err := cluster.NewClusterWithDiscoveryTools(ctx, &cluster.DiscoveryTools{
+		CibAdmPath:         helpers.GetFixturePath("discovery/cluster/fake_cibadmin.sh"),
+		CrmmonAdmPath:      helpers.GetFixturePath("discovery/cluster/fake_crm_mon.sh"),
+		CorosyncKeyPath:    helpers.GetFixturePath("discovery/cluster/authkey"),
+		CorosyncConfigPath: helpers.GetFixturePath("discovery/cluster/corosync.conf"),
+		SBDPath:            "/usr/sbin/sbd",
+		SBDConfigPath:      helpers.GetFixturePath("discovery/cluster/sbd/sbd_config"),
+		CommandExecutor:    mockCommand,
+		SystemdConnector:   mockSystemd,
+		CmdClient:          mockCmdClient,
+	})
+
+	suite.Equal("unknown", c.State)
+	suite.NoError(err)
+}
+
 func (suite *ClusterTestSuite) TestNewClusterCorosyncNotConfigured() {
 	ctx := context.Background()
 	c, err := cluster.NewClusterWithDiscoveryTools(ctx, &cluster.DiscoveryTools{
@@ -167,6 +212,7 @@ func (suite *ClusterTestSuite) TestNewClusterCorosyncNotConfigured() {
 		SBDConfigPath:      helpers.GetFixturePath("discovery/cluster/sbd/sbd_config_no_device"),
 		CommandExecutor:    new(mocks.MockCommandExecutor),
 		SystemdConnector:   new(mocksSystemd.MockSystemd),
+		CmdClient:          new(mocksCluster.MockCmdClient),
 	})
 
 	suite.Nil(c)
@@ -184,6 +230,7 @@ func (suite *ClusterTestSuite) TestNewClusterCorosyncNoAuthkeyConfigured() {
 		SBDConfigPath:      helpers.GetFixturePath("discovery/cluster/sbd/sbd_config_no_device"),
 		CommandExecutor:    new(mocks.MockCommandExecutor),
 		SystemdConnector:   new(mocksSystemd.MockSystemd),
+		CmdClient:          new(mocksCluster.MockCmdClient),
 	})
 
 	suite.Nil(c)

internal/discovery/mocks/discovered_cluster_mock.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/trento-project/agent/internal/core/cloud"
 	"github.com/trento-project/agent/internal/core/cluster"
+	mocksCluster "github.com/trento-project/agent/internal/core/cluster/mocks"
 	mocksSystemd "github.com/trento-project/agent/internal/core/systemd/mocks"
 	mocksUtils "github.com/trento-project/agent/pkg/utils/mocks"
 	"github.com/trento-project/agent/test/helpers"
@@ -44,6 +45,9 @@ func NewDiscoveredClusterMock() *cluster.Cluster {
 	mockSystemd.On("IsActive", ctx, "corosync.service").Return(true, nil)
 	mockSystemd.On("IsActive", ctx, "pacemaker.service").Return(true, nil)
 
+	mockCmdClient := new(mocksCluster.MockCmdClient)
+	mockCmdClient.On("GetState", ctx).Return("S_IDLE", nil)
+
 	cluster, _ := cluster.NewClusterWithDiscoveryTools(ctx, &cluster.DiscoveryTools{
 		CibAdmPath:         helpers.GetFixturePath("discovery/cluster/fake_cibadmin.sh"),
 		CrmmonAdmPath:      helpers.GetFixturePath("discovery/cluster/fake_crm_mon.sh"),
@@ -53,6 +57,7 @@ func NewDiscoveredClusterMock() *cluster.Cluster {
 		SBDConfigPath:      helpers.GetFixturePath("discovery/cluster/sbd/sbd_config"),
 		CommandExecutor:    mockCommand,
 		SystemdConnector:   mockSystemd,
+		CmdClient:          mockCmdClient,
 	})
 
 	cluster.Provider = cloud.Azure

test/fixtures/discovery/cluster/expected_published_cluster_discovery.json

@@ -1038,6 +1038,7 @@
     "Name": "hana_cluster",
     "DC": false,
     "Provider": "azure",
-    "Online": true
+    "Online": true,
+    "State": "idle"
   }
 }