Skip to content

Commit 23f26af

Browse files
committed
Enable forcible node prop for failover tests.
1 parent cf345b8 commit 23f26af

File tree

7 files changed

+58
-1
lines changed

7 files changed

+58
-1
lines changed

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.apache.ignite.IgniteCompute;
3838
import org.apache.ignite.IgniteException;
3939
import org.apache.ignite.IgniteLogger;
40+
import org.apache.ignite.IgniteSystemProperties;
4041
import org.apache.ignite.cache.CacheAtomicityMode;
4142
import org.apache.ignite.cluster.ClusterNode;
4243
import org.apache.ignite.compute.ComputeJobContext;
@@ -119,6 +120,20 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
119120
/** Test failover SPI. */
120121
private MasterFailoverSpi failoverSpi = new MasterFailoverSpi((IgnitePredicate)workerNodesFilter);
121122

123+
/** {@inheritDoc} */
124+
@Override protected void beforeTestsStarted() throws Exception {
125+
System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
126+
127+
super.beforeTestsStarted();
128+
}
129+
130+
/** {@inheritDoc} */
131+
@Override protected void afterTestsStopped() throws Exception {
132+
super.afterTestsStopped();
133+
134+
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
135+
}
136+
122137
/**
123138
* @throws Exception If failed.
124139
*/

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import javax.cache.CacheException;
2727
import org.apache.ignite.Ignite;
2828
import org.apache.ignite.IgniteCache;
29+
import org.apache.ignite.IgniteSystemProperties;
2930
import org.apache.ignite.cache.CacheMode;
3031
import org.apache.ignite.configuration.CacheConfiguration;
3132
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -78,6 +79,20 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest {
7879
return cfg;
7980
}
8081

82+
/** {@inheritDoc} */
83+
@Override protected void beforeTestsStarted() throws Exception {
84+
System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
85+
86+
super.beforeTestsStarted();
87+
}
88+
89+
/** {@inheritDoc} */
90+
@Override protected void afterTestsStopped() throws Exception {
91+
super.afterTestsStopped();
92+
93+
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
94+
}
95+
8196
/** {@inheritDoc} */
8297
@Override protected void afterTest() throws Exception {
8398
stopAllGrids();

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.ignite.Ignite;
2929
import org.apache.ignite.IgniteCache;
3030
import org.apache.ignite.IgniteException;
31+
import org.apache.ignite.IgniteSystemProperties;
3132
import org.apache.ignite.cache.CacheAtomicityMode;
3233
import org.apache.ignite.configuration.CacheConfiguration;
3334
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -118,6 +119,8 @@ private CacheConfiguration cacheConfiguration(String name, CacheAtomicityMode at
118119

119120
/** {@inheritDoc} */
120121
@Override protected void beforeTestsStarted() throws Exception {
122+
System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
123+
121124
super.beforeTestsStarted();
122125

123126
startGridsMultiThreaded(SRVS);
@@ -149,6 +152,8 @@ private CacheConfiguration cacheConfiguration(String name, CacheAtomicityMode at
149152
stopAllGrids();
150153

151154
super.afterTestsStopped();
155+
156+
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
152157
}
153158

154159
/**

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.apache.ignite.Ignite;
3434
import org.apache.ignite.IgniteCache;
3535
import org.apache.ignite.IgniteException;
36+
import org.apache.ignite.IgniteSystemProperties;
3637
import org.apache.ignite.IgniteTransactions;
3738
import org.apache.ignite.cache.CacheAtomicityMode;
3839
import org.apache.ignite.cache.CacheRebalanceMode;
@@ -161,7 +162,16 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
161162

162163
/** {@inheritDoc} */
163164
@Override protected void beforeTestsStarted() throws Exception {
164-
// No-op.
165+
System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
166+
167+
super.beforeTestsStarted();
168+
}
169+
170+
/** {@inheritDoc} */
171+
@Override protected void afterTestsStopped() throws Exception {
172+
super.afterTestsStopped();
173+
174+
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
165175
}
166176

167177
/** {@inheritDoc} */

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.ignite.Ignite;
2727
import org.apache.ignite.IgniteCache;
2828
import org.apache.ignite.IgniteDataStreamer;
29+
import org.apache.ignite.IgniteSystemProperties;
2930
import org.apache.ignite.cache.CacheMode;
3031
import org.apache.ignite.configuration.CacheConfiguration;
3132
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -90,6 +91,8 @@ public class IgniteCacheGetRestartTest extends GridCommonAbstractTest {
9091

9192
/** {@inheritDoc} */
9293
@Override protected void beforeTestsStarted() throws Exception {
94+
System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
95+
9396
super.beforeTestsStarted();
9497

9598
startGrids(SRVS);
@@ -108,6 +111,8 @@ public class IgniteCacheGetRestartTest extends GridCommonAbstractTest {
108111
super.afterTestsStopped();
109112

110113
stopAllGrids();
114+
115+
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
111116
}
112117

113118
/** {@inheritDoc} */

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import javax.cache.processor.MutableEntry;
3535
import org.apache.ignite.Ignite;
3636
import org.apache.ignite.IgniteCache;
37+
import org.apache.ignite.IgniteSystemProperties;
3738
import org.apache.ignite.cache.CacheAtomicityMode;
3839
import org.apache.ignite.cache.CacheEntryProcessor;
3940
import org.apache.ignite.cache.CachePartialUpdateException;
@@ -136,6 +137,8 @@ protected CacheConfiguration cacheConfiguration(boolean evict, boolean store) th
136137

137138
/** {@inheritDoc} */
138139
@Override protected void beforeTestsStarted() throws Exception {
140+
System.setProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL, "true");
141+
139142
super.beforeTestsStarted();
140143

141144
startGridsMultiThreaded(GRID_CNT);
@@ -146,6 +149,8 @@ protected CacheConfiguration cacheConfiguration(boolean evict, boolean store) th
146149
super.afterTestsStopped();
147150

148151
stopAllGrids();
152+
153+
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
149154
}
150155

151156
/** {@inheritDoc} */

modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite2.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package org.apache.ignite.testsuites;
1919

2020
import junit.framework.TestSuite;
21+
import org.apache.ignite.IgniteSystemProperties;
22+
import org.apache.ignite.internal.IgniteProperties;
2123
import org.apache.ignite.internal.processors.cache.GridCachePutAllFailoverSelfTest;
2224
import org.apache.ignite.internal.processors.cache.IgniteCacheAtomicPutAllFailoverSelfTest;
2325
import org.apache.ignite.internal.processors.cache.IgniteCachePutAllRestartTest;

0 commit comments

Comments
 (0)