You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/28 07:44:41 UTC
[1/3] ignite git commit: ignite-3477-master fix
TcpDiscoveryNodeAttributesUpdateOnReconnectTest.testReconnect
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master d91a72c9a -> 26ff68c17
ignite-3477-master fix TcpDiscoveryNodeAttributesUpdateOnReconnectTest.testReconnect
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/26ff68c1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26ff68c1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26ff68c1
Branch: refs/heads/ignite-3477-master
Commit: 26ff68c17444cc9e0743ceb2a0d98941539aba58
Parents: 832665e
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Mar 27 20:09:24 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Mar 28 10:44:01 2017 +0300
----------------------------------------------------------------------
.../META-INF/services/org.apache.ignite.plugin.PluginProvider | 3 ++-
.../META-INF/services/org.apache.ignite.plugin.PluginProvider | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/26ff68c1/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.PluginProvider
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.PluginProvider b/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.PluginProvider
index 2601c7d..f030386 100644
--- a/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.PluginProvider
+++ b/modules/core/src/test/java/META-INF/services/org.apache.ignite.plugin.PluginProvider
@@ -1 +1,2 @@
-org.apache.ignite.platform.plugin.PlatformTestPluginProvider
\ No newline at end of file
+org.apache.ignite.platform.plugin.PlatformTestPluginProvider
+org.apache.ignite.spi.discovery.tcp.TestReconnectPluginProvider
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/26ff68c1/modules/core/src/test/resources/META-INF/services/org.apache.ignite.plugin.PluginProvider
----------------------------------------------------------------------
diff --git a/modules/core/src/test/resources/META-INF/services/org.apache.ignite.plugin.PluginProvider b/modules/core/src/test/resources/META-INF/services/org.apache.ignite.plugin.PluginProvider
deleted file mode 100644
index a7fdf43..0000000
--- a/modules/core/src/test/resources/META-INF/services/org.apache.ignite.plugin.PluginProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.ignite.spi.discovery.tcp.TestReconnectPluginProvider
\ No newline at end of file
[2/3] ignite git commit: ignite-3477-master fix
IgniteDaemonNodeMarshallerCacheTest.testMarshalOnDaemonNode1
Posted by ag...@apache.org.
ignite-3477-master fix IgniteDaemonNodeMarshallerCacheTest.testMarshalOnDaemonNode1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/832665e9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/832665e9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/832665e9
Branch: refs/heads/ignite-3477-master
Commit: 832665e91ef9a51c246e754533367debcb38ba00
Parents: 58e814e
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Mar 27 18:13:20 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Mar 28 10:44:01 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cluster/GridClusterStateProcessor.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/832665e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index e5919e0..1286ba9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -219,7 +219,10 @@ public class GridClusterStateProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public void onGridDataReceived(DiscoveryDataBag.GridDiscoveryData data) {
- globalState = (ClusterState)data.commonData();
+ ClusterState state = (ClusterState)data.commonData();
+
+ if (state != null)
+ globalState = state;
}
/**
[3/3] ignite git commit: ignite-3477-master fix
GridMessagingSelfTest.testAsync
Posted by ag...@apache.org.
ignite-3477-master fix GridMessagingSelfTest.testAsync
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58e814eb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58e814eb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58e814eb
Branch: refs/heads/ignite-3477-master
Commit: 58e814eba4327e4ef6a95a220e8c30668fc95383
Parents: d91a72c
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Mon Mar 27 17:33:40 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Mar 28 10:44:01 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/messaging/GridMessagingSelfTest.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/58e814eb/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
index 3f66c5d..aa07988 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java
@@ -44,6 +44,8 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.processors.continuous.StartRoutineDiscoveryMessage;
import org.apache.ignite.internal.processors.continuous.StopRoutineDiscoveryMessage;
+import org.apache.ignite.internal.processors.marshaller.MappingAcceptedMessage;
+import org.apache.ignite.internal.processors.marshaller.MappingProposedMessage;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.typedef.P2;
import org.apache.ignite.internal.util.typedef.PA;
@@ -1154,13 +1156,22 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest implements Ser
synchronized (mux) {
if (blockCustomEvt) {
DiscoveryCustomMessage msg0 = GridTestUtils.getFieldValue(msg, "delegate");
+
+ if (msg0 instanceof MappingProposedMessage || msg0 instanceof MappingAcceptedMessage){
+ super.sendCustomEvent(msg);
+
+ return;
+ }
+
if (msg0 instanceof StopRoutineDiscoveryMessage || msg0 instanceof StartRoutineDiscoveryMessage) {
log.info("Block custom message: " + msg0);
+
blockedMsgs.add(msg);
mux.notifyAll();
+
+ return;
}
- return;
}
}