Repository: ignite Updated Branches: refs/heads/master 8a7e8f07f -> 74f465153
IGNITE-8355 Fixed NPE on concurrent nodes start - Fixes #3899. Signed-off-by: Alexey Goncharuk <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74f46515 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74f46515 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74f46515 Branch: refs/heads/master Commit: 74f46515368df83177f1ae7e59794295f20c1774 Parents: 8a7e8f0 Author: tledkov-gridgain <[email protected]> Authored: Mon Apr 23 18:20:21 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Apr 23 18:20:21 2018 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 2 +- .../IgniteAuthenticationProcessor.java | 19 ++++- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 13 +++ .../AuthenticationProcessorNPEOnStartTest.java | 90 ++++++++++++++++++++ .../testsuites/IgniteCacheTestSuite6.java | 2 + 6 files changed, 125 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/74f46515/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index e9b6cfe..261e73d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -2140,7 +2140,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * * @return Wrapped DiscoverySpi SPI. */ - private DiscoverySpi getInjectedDiscoverySpi() { + public DiscoverySpi getInjectedDiscoverySpi() { try { inject(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/74f46515/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java index 93b3a5b..ac713c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/IgniteAuthenticationProcessor.java @@ -68,6 +68,8 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.IgniteNodeValidationResult; import org.apache.ignite.spi.discovery.DiscoveryDataBag; +import org.apache.ignite.spi.discovery.DiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.thread.IgniteThreadPoolExecutor; import org.jetbrains.annotations.Nullable; @@ -451,7 +453,7 @@ public class IgniteAuthenticationProcessor extends GridProcessorAdapter implemen @Override public void collectGridNodeData(DiscoveryDataBag dataBag) { // 1. Collect users info only on coordinator // 2. Doesn't collect users info to send on client node due to security reason. - if (!isEnabled || !F.eq(ctx.localNodeId(), coordinator().id()) || dataBag.isJoiningNodeClient()) + if (!isEnabled || !isLocalNodeCoordinator() || dataBag.isJoiningNodeClient()) return; synchronized (mux) { @@ -466,6 +468,21 @@ public class IgniteAuthenticationProcessor extends GridProcessorAdapter implemen } } + /** + * Checks whether local node is coordinator. Nodes that are leaving or failed + * (but are still in topology) are removed from search. + * + * @return {@code true} if local node is coordinator. + */ + private boolean isLocalNodeCoordinator() { + DiscoverySpi spi = ctx.discovery().getInjectedDiscoverySpi(); + + if (spi instanceof TcpDiscoverySpi) + return ((TcpDiscoverySpi)spi).isLocalNodeCoordinator(); + else + return F.eq(ctx.localNodeId(), coordinator().id()); + } + /** {@inheritDoc} */ @Override public void onGridDataReceived(DiscoveryDataBag.GridDiscoveryData data) { initUsrs = (InitialUsersData)data.commonData(); http://git-wip-us.apache.org/repos/asf/ignite/blob/74f46515/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 6d3864e..6b2293a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -1473,7 +1473,7 @@ class ServerImpl extends TcpDiscoveryImpl { * * @return {@code true} if local node is coordinator. */ - private boolean isLocalNodeCoordinator() { + public boolean isLocalNodeCoordinator() { synchronized (mux) { boolean crd = spiState == CONNECTED && locNode.equals(resolveCoordinator()); http://git-wip-us.apache.org/repos/asf/ignite/blob/74f46515/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java index 7c73b28..801f2b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java @@ -2236,6 +2236,19 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements IgniteDiscovery } /** + * Checks whether local node is coordinator. Nodes that are leaving or failed + * (but are still in topology) are removed from search. + * + * @return {@code true} if local node is coordinator. + */ + public boolean isLocalNodeCoordinator() { + if (impl instanceof ServerImpl) + return ((ServerImpl)impl).isLocalNodeCoordinator(); + + return false; + } + + /** * @return Marshaller. */ protected Marshaller marshaller() { http://git-wip-us.apache.org/repos/asf/ignite/blob/74f46515/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java new file mode 100644 index 0000000..9748db7 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/authentication/AuthenticationProcessorNPEOnStartTest.java @@ -0,0 +1,90 @@ +/* + * 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.authentication; + +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.configuration.DataRegionConfiguration; +import org.apache.ignite.configuration.DataStorageConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +/** + * Test for NPE on start node simultaneous. + */ +public class AuthenticationProcessorNPEOnStartTest extends GridCommonAbstractTest { + /** */ + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + TcpDiscoverySpi spi = new TcpDiscoverySpi(); + + spi.setIpFinder(IP_FINDER); + + cfg.setDiscoverySpi(spi); + + cfg.setAuthenticationEnabled(true); + + cfg.setDataStorageConfiguration(new DataStorageConfiguration() + .setDefaultDataRegionConfiguration(new DataRegionConfiguration() + .setPersistenceEnabled(true))); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + + super.afterTest(); + } + + /** + * @throws Exception If failed. + */ + public void test() throws Exception { + final AtomicInteger nodeIdx = new AtomicInteger(); + + GridTestUtils.runMultiThreaded(new Runnable() { + @Override public void run() { + try { + startGrid(nodeIdx.getAndIncrement()); + } + catch (Exception e) { + e.printStackTrace(); + + fail("Unexpected exception"); + } + } + }, 10, "auth-grid-starter"); + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/74f46515/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java index 317a1c5..a31bd75 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java @@ -20,6 +20,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.authentication.AuthenticationConfigurationClusterTest; import org.apache.ignite.internal.processors.authentication.AuthenticationOnNotActiveClusterTest; +import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorNPEOnStartTest; import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorNodeRestartTest; import org.apache.ignite.internal.processors.authentication.AuthenticationProcessorSelfTest; import org.apache.ignite.internal.processors.cache.PartitionedAtomicCacheGetsDistributionTest; @@ -87,6 +88,7 @@ public class IgniteCacheTestSuite6 extends TestSuite { suite.addTestSuite(AuthenticationProcessorSelfTest.class); suite.addTestSuite(AuthenticationOnNotActiveClusterTest.class); suite.addTestSuite(AuthenticationProcessorNodeRestartTest.class); + suite.addTestSuite(AuthenticationProcessorNPEOnStartTest.class); suite.addTestSuite(ReplicatedAtomicCacheGetsDistributionTest.class); suite.addTestSuite(ReplicatedTransactionalOptimisticCacheGetsDistributionTest.class);
