Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 5450: Query akka cluster state on Follower ElectionTimeout
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DistributedDataStoreRemotingIntegrationTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
index 0a82a1fffb43299d5b5aa43de5c2011b067d253b..2f7c790269f0f9702157b6468234154e9e1cb43d 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
@@
-527,6
+527,7
@@
public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
shardElectionTimeoutFactor(1).customRaftPolicyImplementation(null));
JavaTestKit.shutdownActorSystem(leaderSystem, null, true);
shardElectionTimeoutFactor(1).customRaftPolicyImplementation(null));
JavaTestKit.shutdownActorSystem(leaderSystem, null, true);
+ Cluster.get(followerSystem).leave(MEMBER_1_ADDRESS);
followerTestKit.waitUntilNoLeader(followerDistributedDataStore.getActorContext(), CARS);
followerTestKit.waitUntilNoLeader(followerDistributedDataStore.getActorContext(), CARS);
@@
-712,6
+713,13
@@
public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
}
});
}
});
+ MemberNode.verifyRaftState(followerDistributedDataStore, "people", new RaftStateVerifier() {
+ @Override
+ public void verify(OnDemandRaftState raftState) {
+ assertEquals("getLastApplied", 0, raftState.getLastApplied());
+ }
+ });
+
// Prepare, ready and canCommit a WO tx that writes to 2 shards. This will become the current tx in
// the leader shard.
// Prepare, ready and canCommit a WO tx that writes to 2 shards. This will become the current tx in
// the leader shard.
@@
-774,6
+782,7
@@
public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()).
shardElectionTimeoutFactor(10));
customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()).
shardElectionTimeoutFactor(10));
+ Cluster.get(followerSystem).leave(MEMBER_1_ADDRESS);
leaderTestKit.waitUntilNoLeader(leaderDistributedDataStore.getActorContext(), "cars");
// Submit all tx's - the messages should get queued for retry.
leaderTestKit.waitUntilNoLeader(leaderDistributedDataStore.getActorContext(), "cars");
// Submit all tx's - the messages should get queued for retry.
@@
-950,6
+959,8
@@
public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
JavaTestKit.shutdownActorSystem(leaderSystem, null, true);
JavaTestKit.shutdownActorSystem(leaderSystem, null, true);
+ Cluster.get(followerSystem).leave(MEMBER_1_ADDRESS);
+
Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
sendDatastoreContextUpdate(followerDistributedDataStore, followerDatastoreContextBuilder.
Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
sendDatastoreContextUpdate(followerDistributedDataStore, followerDatastoreContextBuilder.
@@
-990,6
+1001,8
@@
public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
JavaTestKit.shutdownActorSystem(leaderSystem, null, true);
JavaTestKit.shutdownActorSystem(leaderSystem, null, true);
+ Cluster.get(followerSystem).leave(MEMBER_1_ADDRESS);
+
sendDatastoreContextUpdate(followerDistributedDataStore, followerDatastoreContextBuilder.
operationTimeoutInMillis(500).shardElectionTimeoutFactor(1).customRaftPolicyImplementation(null));
sendDatastoreContextUpdate(followerDistributedDataStore, followerDatastoreContextBuilder.
operationTimeoutInMillis(500).shardElectionTimeoutFactor(1).customRaftPolicyImplementation(null));