[ignite] branch master updated: IGNITE-12227 Fix failed compilation due to concurrent merge

[agoncharuk]

This is an automated email from the ASF dual-hosted git repository.

agoncharuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 5bd3859  IGNITE-12227 Fix failed compilation due to concurrent merge
5bd3859 is described below

commit 5bd385935bcba9a1cc271497d1818e9bb4f0318a
Author: Alexey Goncharuk <alexey.goncha...@gmail.com>
AuthorDate: Mon Jan 20 14:57:32 2020 +0300

    IGNITE-12227 Fix failed compilation due to concurrent merge
---
 .../TxPartitionCounterStateAbstractTest.java         | 20 ++++++++------------
 .../TxPartitionCounterStateConsistencyTest.java      |  2 +-
 ...CounterStateConsistencyVolatileRebalanceTest.java | 15 ++-------------
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
index 3ceb49f..a3f6021 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateAbstractTest.java
@@ -155,18 +155,6 @@ public abstract class TxPartitionCounterStateAbstractTest 
extends GridCommonAbst
         return PARTS_CNT;
     }
 
-    /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        super.beforeTestsStarted();
-
-        System.setProperty(IGNITE_BASELINE_AUTO_ADJUST_ENABLED, "false");
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        super.afterTestsStopped();
-    }
-
     /** */
     protected boolean persistenceEnabled() {
         return true;
@@ -204,6 +192,12 @@ public abstract class TxPartitionCounterStateAbstractTest 
extends GridCommonAbst
     }
 
     /**
+     */
+    protected void configureBaselineAutoAdjust() {
+        ignite(0).cluster().baselineAutoAdjustEnabled(false);
+    }
+
+    /**
      * Runs a scenario.
      *
      * @param partId Partition id.
@@ -225,6 +219,8 @@ public abstract class TxPartitionCounterStateAbstractTest 
extends GridCommonAbst
 
         crd.cluster().active(true);
 
+        configureBaselineAutoAdjust();
+
         assertEquals(0, crd.cache(DEFAULT_CACHE_NAME).size());
 
         int[][] ranges = new int[sizes.length][2];
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyTest.java
index 5011601..1c8fe94 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyTest.java
@@ -805,7 +805,7 @@ public class TxPartitionCounterStateConsistencyTest extends 
TxPartitionCounterSt
 
         Ignite crd = startGrid(0); // Start coordinator with custom discovery 
SPI.
 
-        crd.cluster().baselineAutoAdjustEnabled(false);
+        configureBaselineAutoAdjust();
 
         IgniteEx g1 = startGrid(1);
         startGrid(2);
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyVolatileRebalanceTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyVolatileRebalanceTest.java
index b3ef2d0..2701589 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyVolatileRebalanceTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPartitionCounterStateConsistencyVolatileRebalanceTest.java
@@ -22,8 +22,6 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCheckedException;
 import org.junit.Ignore;
 
-import static 
org.apache.ignite.IgniteSystemProperties.IGNITE_BASELINE_AUTO_ADJUST_ENABLED;
-
 /**
  * Test partitions consistency in various scenarios when all rebalance is 
in-memory.
  */
@@ -34,17 +32,8 @@ public class 
TxPartitionCounterStateConsistencyVolatileRebalanceTest extends TxP
     }
 
     /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        super.beforeTestsStarted();
-
-        System.setProperty(IGNITE_BASELINE_AUTO_ADJUST_ENABLED, "true");
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        super.afterTestsStopped();
-
-        System.clearProperty(IGNITE_BASELINE_AUTO_ADJUST_ENABLED);
+    @Override protected void configureBaselineAutoAdjust() {
+        // No-op, keep the baseline auto-adjust enabled.
     }
 
     /** {@inheritDoc} */