You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2024/12/18 08:51:47 UTC

(ignite) branch master updated: IGNITE-24024 Remove setForceServerMode from ConfigVariationsFactory (#11753)

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

nizhikov 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 ec897b2421a IGNITE-24024 Remove setForceServerMode from ConfigVariationsFactory (#11753)
ec897b2421a is described below

commit ec897b2421ad3e553ba70f9043811ad7ec64944c
Author: Nikolay <ni...@apache.org>
AuthorDate: Wed Dec 18 11:51:39 2024 +0300

    IGNITE-24024 Remove setForceServerMode from ConfigVariationsFactory (#11753)
---
 ...CacheContinuousBatchForceServerModeAckTest.java | 46 ----------------------
 .../configvariations/ConfigVariationsFactory.java  |  2 -
 .../testsuites/IgniteCacheQuerySelfTestSuite3.java |  2 -
 3 files changed, 50 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchForceServerModeAckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchForceServerModeAckTest.java
deleted file mode 100644
index d858030cf10..00000000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchForceServerModeAckTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.query.continuous;
-
-import java.io.Serializable;
-import org.apache.ignite.configuration.IgniteConfiguration;
-
-/**
- * Continuous queries tests.
- */
-public class CacheContinuousBatchForceServerModeAckTest extends CacheContinuousBatchAckTest implements Serializable {
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-
-        if (igniteInstanceName.endsWith(CLIENT)) {
-            cfg.setClientMode(true);
-
-            FailedTcpCommunicationSpi spi = new FailedTcpCommunicationSpi(true, false);
-
-            cfg.setCommunicationSpi(spi);
-        }
-        else if (igniteInstanceName.endsWith(SERVER2))
-            cfg.setCommunicationSpi(new FailedTcpCommunicationSpi(false, true));
-
-        else
-            cfg.setCommunicationSpi(new FailedTcpCommunicationSpi(false, false));
-
-        return cfg;
-    }
-}
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java
index 82b7810716e..8642803bf7a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java
@@ -22,7 +22,6 @@ import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.failure.NoOpFailureHandler;
 import org.apache.ignite.internal.util.typedef.internal.SB;
-import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -103,7 +102,6 @@ public class ConfigVariationsFactory implements ConfigFactory {
         cfg.setIncludeEventTypes(srcCfg.getIncludeEventTypes());
 
         // Specials.
-        ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setForceServerMode(true);
         cfg.getTransactionConfiguration().setTxSerializableEnabled(true);
     }
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
index 0505a14fbfd..cb682564f26 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.testsuites;
 
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousBatchForceServerModeAckTest;
 import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryBufferLimitTest;
 import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryConcurrentPartitionUpdateTest;
 import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryCounterPartitionedAtomicTest;
@@ -68,7 +67,6 @@ import org.junit.runners.Suite;
     GridCacheContinuousQueryReplicatedSelfTest.class,
 
     CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class,
-    CacheContinuousBatchForceServerModeAckTest.class,
     ContinuousQueryReassignmentTest.class,
     CacheContinuousQueryConcurrentPartitionUpdateTest.class,