You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/06/01 11:27:52 UTC
[06/17] ignite git commit: reverting review IGNITE-2708 Need to
validate that SPIs are started only once (cherry picked from commit bf561e1)
reverting review IGNITE-2708 Need to validate that SPIs are started only once
(cherry picked from commit bf561e1)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9639e795
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9639e795
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9639e795
Branch: refs/heads/ignite-3038
Commit: 9639e7956d4bf6fc42e223574851014c8c3aa0cb
Parents: 7ea83d6
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Fri May 13 11:59:02 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue May 31 09:29:21 2016 +0300
----------------------------------------------------------------------
.../internal/managers/GridManagerAdapter.java | 3 --
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 29 ++------------------
.../ignite/internal/GridFactorySelfTest.java | 25 -----------------
3 files changed, 3 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9639e795/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 58d64f6..cb41d4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -209,9 +209,6 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
Collection<String> names = U.newHashSet(spis.length);
for (T spi : spis) {
- if (spi instanceof IgniteSpiAdapter)
- ((IgniteSpiAdapter)spi).onBeforeStart();
-
// Inject all spi resources.
ctx.resource().inject(spi);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9639e795/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 7cb2e13..999013f 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -25,7 +25,6 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -40,6 +39,7 @@ import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.IgniteNodeAttributes;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.processors.cache.GridCacheUtils;
import org.apache.ignite.internal.processors.timeout.GridSpiTimeoutObject;
import org.apache.ignite.internal.util.IgniteExceptionRegistry;
import org.apache.ignite.internal.util.typedef.F;
@@ -96,14 +96,11 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
private boolean failureDetectionTimeoutEnabled = true;
/**
- * Failure detection timeout. Initialized with the value of
- * {@link IgniteConfiguration#getFailureDetectionTimeout()}.
+ * Failure detection timeout. Initialized with the value of
+ * {@link IgniteConfiguration#getFailureDetectionTimeout()}.
*/
private long failureDetectionTimeout;
- /** Start flag to deny repeating start attempts. */
- private final AtomicBoolean startedFlag = new AtomicBoolean();
-
/**
* Creates new adapter and initializes it from the current (this) class.
* SPI name will be initialized to the simple name of the class
@@ -120,26 +117,6 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
startTstamp = U.currentTimeMillis();
}
- /**
- * This method is called by built-in managers implementation to avoid
- * repeating SPI start attempts.
- */
- public final void onBeforeStart() {
- if (!startedFlag.compareAndSet(false, true))
- throw new IllegalStateException("SPI has already been started " +
- "(always create new configuration instance for each starting Ignite instances) " +
- "[spi=" + this + ']');
- }
-
- /**
- * Checks if {@link #onBeforeStart()} has been called on this SPI instance.
- *
- * @return {@code True} if {@link #onBeforeStart()} has already been called.
- */
- public final boolean started() {
- return startedFlag.get();
- }
-
/** {@inheritDoc} */
@Override public final String getStartTimestampFormatted() {
return DateFormat.getDateTimeInstance().format(new Date(startTstamp));
http://git-wip-us.apache.org/repos/asf/ignite/blob/9639e795/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index b94ed48..539067b 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -902,31 +902,6 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
}
/**
- * @throws Exception If failed.
- */
- public void testRepeatingStart() throws Exception {
- try {
- IgniteConfiguration c = getConfiguration("1");
-
- startGrid("1", c);
-
- assert ((TcpDiscoverySpi)c.getDiscoverySpi()).started();
-
- try {
- startGrid("2", c);
-
- fail("Should not be able to start grid using same configuration instance.");
- }
- catch (Exception e) {
- info("Caught expected exception: " + e);
- }
- }
- finally {
- stopAllGrids();
- }
- }
-
- /**
* Test task.
*/
private static class TestTask extends ComputeTaskSplitAdapter<Void, Void> {