Skip to content
This repository has been archived by the owner on May 30, 2022. It is now read-only.

Fix sap systems projector #645

Merged
merged 2 commits into from
Dec 21, 2021
Merged

Fix sap systems projector #645

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
2b5424a
Fix SAP System obsolete deletion
fabriziosestito Dec 21, 2021
389c5d9
Update test with failing case
fabriziosestito Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions web/datapipeline/sap_systems_projector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ func SAPSystemsProjector_SAPSystemsDiscoveryHandler(dataCollectedEvent *DataColl
// delete obsolete instances
if len(instances) > 0 {
for _, instance := range instances {
db = db.Where("NOT (id = ? AND agent_id = ? AND instance_number = ?)",
instance.ID, dataCollectedEvent.AgentID, instance.InstanceNumber)
db = db.Where("NOT (id = ? AND instance_number = ?)", instance.ID, instance.InstanceNumber).
Where("agent_id = ?", dataCollectedEvent.AgentID)
}
} else {
db = db.Where("id = ? AND agent_id = ?", s.Id, dataCollectedEvent.AgentID)
Expand Down
69 changes: 52 additions & 17 deletions web/datapipeline/sap_systems_projector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,56 @@ func (s *SAPSystemsProjectorTestSuite) Test_SAPSystemDiscoveryHandler_Database()
s.Equal(50014, projectedSAPSystemInstance.HttpsPort)
}

// Test_SAPSystemDiscoveryHandler_Database_Obsolete tests that old discovered SAP system instances
// are deleted if the agent stops sending them
func (s *SAPSystemsProjectorTestSuite) Test_SAPSystemDiscoveryHandler_Database_Obsolete() {
err := s.tx.Create(&entities.SAPSystemInstance{
SID: "PRD",
Type: models.SAPSystemTypeDatabase,
ID: "b6fa9c04ee8280357a35baf9ee73539d",
AgentID: "agent_id",
InstanceNumber: "00",
Features: "HDB|HDB_WORKER",
SystemReplication: "Primary",
SystemReplicationStatus: "SFAIL",
Tenants: pq.StringArray{"PRD"},
SAPHostname: "vmhana01",
StartPriority: "0.3",
HttpPort: 50013,
HttpsPort: 50014,
err := s.tx.Create(&[]entities.SAPSystemInstance{
{
SID: "PRD",
Type: models.SAPSystemTypeDatabase,
ID: "b6fa9c04ee8280357a35baf9ee73539d",
AgentID: "agent_id",
InstanceNumber: "00",
Features: "HDB|HDB_WORKER",
SystemReplication: "Primary",
SystemReplicationStatus: "SFAIL",
Tenants: pq.StringArray{"PRD"},
SAPHostname: "vmhana01",
StartPriority: "0.3",
HttpPort: 50013,
HttpsPort: 50014,
},
{
SID: "PRD",
Type: models.SAPSystemTypeDatabase,
ID: "b6fa9c04ee8280357a35baf9ee73539d",
AgentID: "agent_id",
InstanceNumber: "10",
Features: "HDB|HDB_WORKER",
SystemReplication: "Primary",
SystemReplicationStatus: "SFAIL",
Tenants: pq.StringArray{"PRD"},
SAPHostname: "vmhana02",
StartPriority: "0.3",
HttpPort: 50013,
HttpsPort: 50014,
},
{
SID: "PRD",
Type: models.SAPSystemTypeDatabase,
ID: "b6fa9c04ee8280357a35baf9ee73539d",
AgentID: "other_agent_id",
InstanceNumber: "00",
Features: "HDB|HDB_WORKER",
SystemReplication: "Primary",
SystemReplicationStatus: "SFAIL",
Tenants: pq.StringArray{"PRD"},
SAPHostname: "vmhana03",
StartPriority: "0.3",
HttpPort: 50013,
HttpsPort: 50014,
},
}).Error

s.NoError(err)

discoveredSAPSystemMock := mocks.NewDiscoveredSAPSystemDatabaseMock()
Expand All @@ -102,8 +135,10 @@ func (s *SAPSystemsProjectorTestSuite) Test_SAPSystemDiscoveryHandler_Database_O
var projectedSAPSystemInstance []entities.SAPSystemInstance
s.tx.Find(&projectedSAPSystemInstance)

s.Equal(1, len(projectedSAPSystemInstance))
s.Equal("e06e328f8d6b0f46c1e66ffcd44d0dd7", projectedSAPSystemInstance[0].ID)
s.Equal(2, len(projectedSAPSystemInstance))
s.Equal("other_agent_id", projectedSAPSystemInstance[0].AgentID)
s.Equal("e06e328f8d6b0f46c1e66ffcd44d0dd7", projectedSAPSystemInstance[1].ID)
s.Equal("agent_id", projectedSAPSystemInstance[1].AgentID)
}

func (s *SAPSystemsProjectorTestSuite) Test_SAPSystemDiscoveryHandler_Application() {
Expand Down