@@ -75,7 +75,7 @@ func TestErrantGTIDOnPreviousPrimary(t *testing.T) {
7575 curPrimary := utils .ShardPrimaryTablet (t , clusterInfo , keyspace , shard0 )
7676 assert .NotNil (t , curPrimary , "should have elected a primary" )
7777 vtOrcProcess := clusterInfo .ClusterInstance .VTOrcProcesses [0 ]
78- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , 1 )
78+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
7979 utils .WaitForSuccessfulPRSCount (t , vtOrcProcess , keyspace .Name , shard0 .Name , 1 )
8080
8181 var replica , otherReplica * cluster.Vttablet
@@ -134,7 +134,7 @@ func TestSingleKeyspace(t *testing.T) {
134134
135135 utils .CheckPrimaryTablet (t , clusterInfo , shard0 .Vttablets [0 ], true )
136136 utils .CheckReplication (t , clusterInfo , shard0 .Vttablets [0 ], shard0 .Vttablets [1 :], 10 * time .Second )
137- utils .WaitForSuccessfulRecoveryCount (t , clusterInfo .ClusterInstance .VTOrcProcesses [0 ], logic .ElectNewPrimaryRecoveryName , 1 )
137+ utils .WaitForSuccessfulRecoveryCount (t , clusterInfo .ClusterInstance .VTOrcProcesses [0 ], logic .ElectNewPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
138138 utils .WaitForSuccessfulPRSCount (t , clusterInfo .ClusterInstance .VTOrcProcesses [0 ], keyspace .Name , shard0 .Name , 1 )
139139}
140140
@@ -152,7 +152,7 @@ func TestKeyspaceShard(t *testing.T) {
152152
153153 utils .CheckPrimaryTablet (t , clusterInfo , shard0 .Vttablets [0 ], true )
154154 utils .CheckReplication (t , clusterInfo , shard0 .Vttablets [0 ], shard0 .Vttablets [1 :], 10 * time .Second )
155- utils .WaitForSuccessfulRecoveryCount (t , clusterInfo .ClusterInstance .VTOrcProcesses [0 ], logic .ElectNewPrimaryRecoveryName , 1 )
155+ utils .WaitForSuccessfulRecoveryCount (t , clusterInfo .ClusterInstance .VTOrcProcesses [0 ], logic .ElectNewPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
156156 utils .WaitForSuccessfulPRSCount (t , clusterInfo .ClusterInstance .VTOrcProcesses [0 ], keyspace .Name , shard0 .Name , 1 )
157157}
158158
@@ -175,7 +175,7 @@ func TestVTOrcRepairs(t *testing.T) {
175175 curPrimary := utils .ShardPrimaryTablet (t , clusterInfo , keyspace , shard0 )
176176 assert .NotNil (t , curPrimary , "should have elected a primary" )
177177 vtOrcProcess := clusterInfo .ClusterInstance .VTOrcProcesses [0 ]
178- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , 1 )
178+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
179179 utils .WaitForSuccessfulPRSCount (t , vtOrcProcess , keyspace .Name , shard0 .Name , 1 )
180180
181181 var replica , otherReplica * cluster.Vttablet
@@ -203,7 +203,7 @@ func TestVTOrcRepairs(t *testing.T) {
203203 // wait for repair
204204 match := utils .WaitForReadOnlyValue (t , curPrimary , 0 )
205205 require .True (t , match )
206- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixPrimaryRecoveryName , 1 )
206+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
207207 })
208208
209209 t .Run ("ReplicaReadWrite" , func (t * testing.T ) {
@@ -214,7 +214,7 @@ func TestVTOrcRepairs(t *testing.T) {
214214 // wait for repair
215215 match := utils .WaitForReadOnlyValue (t , replica , 1 )
216216 require .True (t , match )
217- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , 1 )
217+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , keyspace . Name , shard0 . Name , 1 )
218218 })
219219
220220 t .Run ("StopReplication" , func (t * testing.T ) {
@@ -224,23 +224,23 @@ func TestVTOrcRepairs(t *testing.T) {
224224
225225 // check replication is setup correctly
226226 utils .CheckReplication (t , clusterInfo , curPrimary , []* cluster.Vttablet {replica , otherReplica }, 15 * time .Second )
227- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , 2 )
227+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , keyspace . Name , shard0 . Name , 2 )
228228
229229 // Stop just the IO thread on the replica
230230 _ , err = utils .RunSQL (t , "STOP REPLICA IO_THREAD" , replica , "" )
231231 require .NoError (t , err )
232232
233233 // check replication is setup correctly
234234 utils .CheckReplication (t , clusterInfo , curPrimary , []* cluster.Vttablet {replica , otherReplica }, 15 * time .Second )
235- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , 3 )
235+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , keyspace . Name , shard0 . Name , 3 )
236236
237237 // Stop just the SQL thread on the replica
238238 _ , err = utils .RunSQL (t , "STOP REPLICA SQL_THREAD" , replica , "" )
239239 require .NoError (t , err )
240240
241241 // check replication is setup correctly
242242 utils .CheckReplication (t , clusterInfo , curPrimary , []* cluster.Vttablet {replica , otherReplica }, 15 * time .Second )
243- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , 4 )
243+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , keyspace . Name , shard0 . Name , 4 )
244244 })
245245
246246 t .Run ("ReplicationFromOtherReplica" , func (t * testing.T ) {
@@ -256,7 +256,7 @@ func TestVTOrcRepairs(t *testing.T) {
256256
257257 // wait until the source port is set back correctly by vtorc
258258 utils .CheckSourcePort (t , replica , curPrimary , 15 * time .Second )
259- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , 5 )
259+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , keyspace . Name , shard0 . Name , 5 )
260260
261261 // check that writes succeed
262262 utils .VerifyWritesSucceed (t , clusterInfo , curPrimary , []* cluster.Vttablet {replica , otherReplica }, 15 * time .Second )
@@ -268,7 +268,7 @@ func TestVTOrcRepairs(t *testing.T) {
268268
269269 // wait until heart beat interval has been fixed by vtorc.
270270 utils .CheckHeartbeatInterval (t , replica , 16.5 , 15 * time .Second )
271- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , 6 )
271+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , keyspace . Name , shard0 . Name , 6 )
272272
273273 // check that writes succeed
274274 utils .VerifyWritesSucceed (t , clusterInfo , curPrimary , []* cluster.Vttablet {replica , otherReplica }, 15 * time .Second )
@@ -291,7 +291,7 @@ func TestVTOrcRepairs(t *testing.T) {
291291 // wait for repair
292292 err = utils .WaitForReplicationToStop (t , curPrimary )
293293 require .NoError (t , err )
294- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .RecoverPrimaryHasPrimaryRecoveryName , 1 )
294+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .RecoverPrimaryHasPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
295295 // check that the writes still succeed
296296 utils .VerifyWritesSucceed (t , clusterInfo , curPrimary , []* cluster.Vttablet {replica , otherReplica }, 10 * time .Second )
297297 })
@@ -514,7 +514,7 @@ func TestVTOrcWithPrs(t *testing.T) {
514514 curPrimary := utils .ShardPrimaryTablet (t , clusterInfo , keyspace , shard0 )
515515 assert .NotNil (t , curPrimary , "should have elected a primary" )
516516 vtOrcProcess := clusterInfo .ClusterInstance .VTOrcProcesses [0 ]
517- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , 1 )
517+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
518518 utils .WaitForSuccessfulPRSCount (t , vtOrcProcess , keyspace .Name , shard0 .Name , 1 )
519519
520520 // find any replica tablet other than the current primary
@@ -540,13 +540,13 @@ func TestVTOrcWithPrs(t *testing.T) {
540540 // check that the replica gets promoted
541541 utils .CheckPrimaryTablet (t , clusterInfo , replica , true )
542542 // Verify that VTOrc didn't run any other recovery
543- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , 1 )
543+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
544544 utils .WaitForSuccessfulPRSCount (t , vtOrcProcess , keyspace .Name , shard0 .Name , 1 )
545- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .RecoverDeadPrimaryRecoveryName , 0 )
545+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .RecoverDeadPrimaryRecoveryName , keyspace . Name , shard0 . Name , 0 )
546546 utils .WaitForSuccessfulERSCount (t , vtOrcProcess , keyspace .Name , shard0 .Name , 0 )
547- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixPrimaryRecoveryName , 0 )
548- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , 0 )
549- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .RecoverPrimaryHasPrimaryRecoveryName , 0 )
547+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixPrimaryRecoveryName , keyspace . Name , shard0 . Name , 0 )
548+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .FixReplicaRecoveryName , keyspace . Name , shard0 . Name , 0 )
549+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .RecoverPrimaryHasPrimaryRecoveryName , keyspace . Name , shard0 . Name , 0 )
550550 utils .VerifyWritesSucceed (t , clusterInfo , replica , shard0 .Vttablets , 10 * time .Second )
551551}
552552
@@ -673,7 +673,7 @@ func TestFullStatusConnectionPooling(t *testing.T) {
673673 curPrimary := utils .ShardPrimaryTablet (t , clusterInfo , keyspace , shard0 )
674674 assert .NotNil (t , curPrimary , "should have elected a primary" )
675675 vtOrcProcess := clusterInfo .ClusterInstance .VTOrcProcesses [0 ]
676- utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , 1 )
676+ utils .WaitForSuccessfulRecoveryCount (t , vtOrcProcess , logic .ElectNewPrimaryRecoveryName , keyspace . Name , shard0 . Name , 1 )
677677 utils .WaitForSuccessfulPRSCount (t , vtOrcProcess , keyspace .Name , shard0 .Name , 1 )
678678
679679 // Kill the current primary.
0 commit comments