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

Jump to bottom

Fix insert query of blocked_recovery table in VTOrc #12091

Merged
merged 2 commits into from
Jan 17, 2023
Merged

Fix insert query of blocked_recovery table in VTOrc #12091

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9914ca
feat: add failing test and fix the query of insertion
GuptaManan100 Jan 13, 2023
cf1f2c2
empty-commit
GuptaManan100 Jan 16, 2023
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
1 change: 1 addition & 0 deletions go/vt/vtorc/logic/topology_recovery_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ func RegisterBlockedRecoveries(analysisEntry *inst.ReplicationAnalysis, blocking
?,
?,
?,
?,
NOW(),
?
)
Expand Down
37 changes: 37 additions & 0 deletions go/vt/vtorc/logic/topology_recovery_dao_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package logic
import (
"testing"

"github.com/openark/golib/sqlutils"
"github.com/stretchr/testify/require"

"vitess.io/vitess/go/vt/vtorc/db"
Expand Down Expand Up @@ -68,3 +69,39 @@ func TestTopologyRecovery(t *testing.T) {
require.EqualValues(t, topologyRecovery.ID, recoveries[0].ID)
})
}

// TestBlockedRecoveryInsertion tests that we are able to insert into the blocked_recovery table.
func TestBlockedRecoveryInsertion(t *testing.T) {
orcDb, err := db.OpenVTOrc()
require.NoError(t, err)
defer func() {
_, err = orcDb.Exec("delete from blocked_topology_recovery")
require.NoError(t, err)
}()

analysisEntry := &inst.ReplicationAnalysis{
AnalyzedInstanceKey: inst.InstanceKey{
Hostname: "localhost",
Port: 100,
},
ClusterDetails: inst.ClusterInfo{
Keyspace: "ks",
Shard: "0",
},
Analysis: inst.DeadPrimaryAndSomeReplicas,
}
blockedRecovery := &TopologyRecovery{
ID: 1,
}
err = RegisterBlockedRecoveries(analysisEntry, []*TopologyRecovery{blockedRecovery})
require.NoError(t, err)

totalBlockedRecoveries := 0
err = db.QueryVTOrc("select count(*) as blocked_recoveries from blocked_topology_recovery", nil, func(rowMap sqlutils.RowMap) error {
totalBlockedRecoveries = rowMap.GetInt("blocked_recoveries")
return nil
})
require.NoError(t, err)
// There should be 1 blocked recovery after insertion
require.Equal(t, 1, totalBlockedRecoveries)
}