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 2015/05/25 08:16:12 UTC
[1/8] incubator-ignite git commit: # IGNITE-709 Fix assertion error
in testTimeoutWaitingNodeAddedMessage()
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-23 7ec45f9b3 -> ff17cafa8
# IGNITE-709 Fix assertion error in testTimeoutWaitingNodeAddedMessage()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ae75d8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ae75d8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ae75d8c
Branch: refs/heads/ignite-23
Commit: 0ae75d8ca5c728c69e236d45952fa9398436961b
Parents: f2e0fc2
Author: sevdokimov <se...@gridgain.com>
Authored: Fri May 22 19:33:20 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 22 19:33:20 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpClientDiscoverySpi.java | 4 +++
.../tcp/TcpClientDiscoverySpiSelfTest.java | 36 +++++++++++++++-----
2 files changed, 31 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ae75d8c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index bed4888..46e9635 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -1069,6 +1069,8 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
", timeout=" + netTimeout + ']');
joinLatch.countDown();
+
+ break;
}
}
else if (msg == SPI_STOP) {
@@ -1092,6 +1094,8 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
joinErr = new IgniteSpiException("Failed to connect to cluster: socket closed.");
joinLatch.countDown();
+
+ break;
}
else {
if (getSpiContext().isStopping() || segmented)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ae75d8c/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
index a927110..727d505 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.java
@@ -98,21 +98,25 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
/** */
private long joinTimeout = TcpClientDiscoverySpi.DFLT_JOIN_TIMEOUT;
+ /** */
+ private long netTimeout = TcpDiscoverySpiAdapter.DFLT_NETWORK_TIMEOUT;
+
+ /** */
+ private boolean longSockTimeouts;
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+ TcpDiscoverySpiAdapter disco;
+
if (gridName.startsWith("server")) {
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
+ disco = new TcpDiscoverySpi();
disco.setIpFinder(IP_FINDER);
-
- cfg.setDiscoverySpi(disco);
}
else if (gridName.startsWith("client")) {
- TcpClientDiscoverySpi disco = new TestTcpClientDiscovery();
-
- disco.setJoinTimeout(joinTimeout);
+ disco = new TestTcpClientDiscovery();
TcpDiscoveryVmIpFinder ipFinder;
@@ -132,14 +136,24 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
disco.setIpFinder(ipFinder);
- cfg.setDiscoverySpi(disco);
-
String nodeId = cfg.getNodeId().toString();
nodeId = "cc" + nodeId.substring(2);
cfg.setNodeId(UUID.fromString(nodeId));
}
+ else
+ throw new IllegalArgumentException();
+
+ if (longSockTimeouts) {
+ disco.setAckTimeout(2000);
+ disco.setSocketTimeout(2000);
+ }
+
+ disco.setJoinTimeout(joinTimeout);
+ disco.setNetworkTimeout(netTimeout);
+
+ cfg.setDiscoverySpi(disco);
if (nodeId != null)
cfg.setNodeId(nodeId);
@@ -171,6 +185,8 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
nodeId = null;
clientIpFinder = null;
joinTimeout = TcpClientDiscoverySpi.DFLT_JOIN_TIMEOUT;
+ netTimeout = TcpClientDiscoverySpi.DFLT_NETWORK_TIMEOUT;
+ longSockTimeouts = false;
assert G.allGrids().isEmpty();
}
@@ -793,6 +809,8 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
* @throws Exception If any error occurs.
*/
public void testTimeoutWaitingNodeAddedMessage() throws Exception {
+ longSockTimeouts = true;
+
startServerNodes(2);
final CountDownLatch cnt = new CountDownLatch(1);
@@ -812,7 +830,7 @@ public class TcpClientDiscoverySpiSelfTest extends GridCommonAbstractTest {
});
try {
- joinTimeout = 500;
+ netTimeout = 500;
startGrid("client-0");
[7/8] incubator-ignite git commit: # IGNITE-709 Fix
IgniteCacheP2pUnmarshallingQueryErrorTest
Posted by sb...@apache.org.
# IGNITE-709 Fix IgniteCacheP2pUnmarshallingQueryErrorTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9480e8de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9480e8de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9480e8de
Branch: refs/heads/ignite-23
Commit: 9480e8deccfd80d7518f633efdb825d72b47227c
Parents: 4b790a8
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun May 24 23:00:39 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun May 24 23:00:39 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9480e8de/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
index b2095a8..b171ead 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingQueryErrorTest.java
@@ -30,7 +30,8 @@ public class IgniteCacheP2pUnmarshallingQueryErrorTest extends IgniteCacheP2pUnm
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- cfg.getCacheConfiguration()[0].setIndexedTypes(TestKey.class, String.class);
+ if (cfg.getCacheConfiguration().length > 0)
+ cfg.getCacheConfiguration()[0].setIndexedTypes(TestKey.class, String.class);
return cfg;
}
[8/8] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-709_2' into ignite-23
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ff17cafa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ff17cafa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ff17cafa
Branch: refs/heads/ignite-23
Commit: ff17cafa834bc2c8cf26618d716a53ec4fb3a352
Parents: 7ec45f9 9480e8d
Author: sboikov <sb...@gridgain.com>
Authored: Mon May 25 09:10:45 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon May 25 09:10:45 2015 +0300
----------------------------------------------------------------------
.../discovery/CustomMessageWrapper.java | 5 ++
.../discovery/DiscoveryCustomMessage.java | 5 ++
.../discovery/GridDiscoveryManager.java | 26 +++++-----
.../cache/DynamicCacheChangeBatch.java | 5 ++
.../continuous/AbstractContinuousMessage.java | 54 ++++++++++++++++++++
.../StartRoutineAckDiscoveryMessage.java | 26 ++++------
.../StartRoutineDiscoveryMessage.java | 27 ++++------
.../StopRoutineAckDiscoveryMessage.java | 21 +++-----
.../continuous/StopRoutineDiscoveryMessage.java | 23 +++------
.../discovery/DiscoverySpiCustomMessage.java | 5 ++
.../discovery/tcp/TcpClientDiscoverySpi.java | 8 ++-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 14 ++---
.../TcpDiscoveryCustomEventMessage.java | 31 +++++++++--
.../GridDiscoveryManagerAliveCacheSelfTest.java | 41 +++++++++------
.../continuous/GridEventConsumeSelfTest.java | 2 +-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 36 +++++++++----
...niteCacheP2pUnmarshallingQueryErrorTest.java | 3 +-
17 files changed, 214 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff17cafa/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff17cafa/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
[2/8] incubator-ignite git commit: IGNITE-709 Fix
CacheListenerTest#testDeregistration()
Posted by sb...@apache.org.
IGNITE-709 Fix CacheListenerTest#testDeregistration()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8fbb590f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8fbb590f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8fbb590f
Branch: refs/heads/ignite-23
Commit: 8fbb590f2e659c785c6d89ea49e1e4bb3fdc666f
Parents: 0ae75d8
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun May 24 20:23:01 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun May 24 20:23:01 2015 +0300
----------------------------------------------------------------------
.../discovery/CustomMessageWrapper.java | 5 ++
.../discovery/DiscoveryCustomMessage.java | 5 ++
.../cache/DynamicCacheChangeBatch.java | 5 ++
.../continuous/AbstractContinuousMessage.java | 54 ++++++++++++++++++++
.../StartRoutineAckDiscoveryMessage.java | 20 ++------
.../StartRoutineDiscoveryMessage.java | 25 +++------
.../StopRoutineAckDiscoveryMessage.java | 19 +------
.../continuous/StopRoutineDiscoveryMessage.java | 19 +------
.../discovery/DiscoverySpiCustomMessage.java | 5 ++
.../discovery/tcp/TcpClientDiscoverySpi.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 14 ++---
.../TcpDiscoveryCustomEventMessage.java | 31 +++++++++--
12 files changed, 126 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
index 0afb6cf..23f8bda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/CustomMessageWrapper.java
@@ -44,6 +44,11 @@ class CustomMessageWrapper implements DiscoverySpiCustomMessage {
return res == null ? null : new CustomMessageWrapper(res);
}
+ /** {@inheritDoc} */
+ @Override public boolean isMutable() {
+ return delegate.isMutable();
+ }
+
/**
* @return Delegate.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
index 13c0b9c..693bbef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java
@@ -40,4 +40,9 @@ public interface DiscoveryCustomMessage extends Serializable {
* @return Ack message or {@code null} if ack is not required.
*/
@Nullable public DiscoveryCustomMessage ackMessage();
+
+ /**
+ * @return {@code true} if message can be modified during listener notification. Changes will be send to next nodes.
+ */
+ public boolean isMutable();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
index ca257a9..5fcd0e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
@@ -83,4 +83,9 @@ public class DynamicCacheChangeBatch implements DiscoveryCustomMessage {
@Nullable @Override public DiscoveryCustomMessage ackMessage() {
return null;
}
+
+ /** {@inheritDoc} */
+ @Override public boolean isMutable() {
+ return false;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
new file mode 100644
index 0000000..f375777
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
@@ -0,0 +1,54 @@
+/*
+ * 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.continuous;
+
+import org.apache.ignite.internal.managers.discovery.*;
+
+import java.util.*;
+
+/**
+ *
+ */
+public abstract class AbstractContinuousMessage implements DiscoveryCustomMessage {
+ /** Routine ID. */
+ protected final UUID routineId;
+
+ /**
+ * @param id Id.
+ */
+ protected AbstractContinuousMessage(UUID id) {
+ routineId = id;
+ }
+
+ /**
+ * @return Routine ID.
+ */
+ public UUID routineId() {
+ return routineId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean incrementMinorTopologyVersion() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isMutable() {
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
index 66892b1..3e3e6fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
@@ -26,13 +26,10 @@ import java.util.*;
/**
*
*/
-public class StartRoutineAckDiscoveryMessage implements DiscoveryCustomMessage {
+public class StartRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
/** */
private static final long serialVersionUID = 0L;
- /** Routine ID. */
- private final UUID routineId;
-
/** */
private final Map<UUID, IgniteCheckedException> errs;
@@ -41,13 +38,9 @@ public class StartRoutineAckDiscoveryMessage implements DiscoveryCustomMessage {
* @param errs Errs.
*/
public StartRoutineAckDiscoveryMessage(UUID routineId, Map<UUID, IgniteCheckedException> errs) {
- this.routineId = routineId;
- this.errs = new HashMap<>(errs);
- }
+ super(routineId);
- /** {@inheritDoc} */
- @Override public boolean incrementMinorTopologyVersion() {
- return false;
+ this.errs = new HashMap<>(errs);
}
/** {@inheritDoc} */
@@ -56,13 +49,6 @@ public class StartRoutineAckDiscoveryMessage implements DiscoveryCustomMessage {
}
/**
- * @return Routine ID.
- */
- public UUID routineId() {
- return routineId;
- }
-
- /**
* @return Errs.
*/
public Map<UUID, IgniteCheckedException> errs() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
index 2199fd0..ec0d36b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
@@ -26,13 +26,10 @@ import java.util.*;
/**
*
*/
-public class StartRoutineDiscoveryMessage implements DiscoveryCustomMessage {
+public class StartRoutineDiscoveryMessage extends AbstractContinuousMessage {
/** */
private static final long serialVersionUID = 0L;
- /** Routine ID. */
- private final UUID routineId;
-
/** */
private final StartRequestData startReqData;
@@ -44,13 +41,9 @@ public class StartRoutineDiscoveryMessage implements DiscoveryCustomMessage {
* @param startReqData Start request data.
*/
public StartRoutineDiscoveryMessage(UUID routineId, StartRequestData startReqData) {
- this.routineId = routineId;
- this.startReqData = startReqData;
- }
+ super(routineId);
- /** {@inheritDoc} */
- @Override public boolean incrementMinorTopologyVersion() {
- return false;
+ this.startReqData = startReqData;
}
/**
@@ -69,13 +62,6 @@ public class StartRoutineDiscoveryMessage implements DiscoveryCustomMessage {
}
/**
- * @return Routine ID.
- */
- public UUID routineId() {
- return routineId;
- }
-
- /**
* @return Errs.
*/
public Map<UUID, IgniteCheckedException> errs() {
@@ -83,6 +69,11 @@ public class StartRoutineDiscoveryMessage implements DiscoveryCustomMessage {
}
/** {@inheritDoc} */
+ @Override public boolean isMutable() {
+ return true;
+ }
+
+ /** {@inheritDoc} */
@Override public DiscoveryCustomMessage ackMessage() {
return new StartRoutineAckDiscoveryMessage(routineId, errs);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
index a640222..350f13c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
@@ -25,34 +25,19 @@ import java.util.*;
/**
*
*/
-public class StopRoutineAckDiscoveryMessage implements DiscoveryCustomMessage {
+public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
/** */
private static final long serialVersionUID = 0L;
- /** Routine ID. */
- private final UUID routineId;
-
/**
* @param routineId Routine id.
*/
public StopRoutineAckDiscoveryMessage(UUID routineId) {
- this.routineId = routineId;
- }
-
- /** {@inheritDoc} */
- @Override public boolean incrementMinorTopologyVersion() {
- return false;
+ super(routineId);
}
/** {@inheritDoc} */
@Nullable @Override public DiscoveryCustomMessage ackMessage() {
return null;
}
-
- /**
- * @return Routine ID.
- */
- public UUID routineId() {
- return routineId;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
index e8a43a3..5b0dc5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
@@ -25,30 +25,15 @@ import java.util.*;
/**
*
*/
-public class StopRoutineDiscoveryMessage implements DiscoveryCustomMessage {
+public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage {
/** */
private static final long serialVersionUID = 0L;
- /** Routine ID. */
- private final UUID routineId;
-
/**
* @param routineId Routine id.
*/
public StopRoutineDiscoveryMessage(UUID routineId) {
- this.routineId = routineId;
- }
-
- /** {@inheritDoc} */
- @Override public boolean incrementMinorTopologyVersion() {
- return false;
- }
-
- /**
- * @return Routine ID.
- */
- public UUID routineId() {
- return routineId;
+ super(routineId);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
index 72ba9db..15e943b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/DiscoverySpiCustomMessage.java
@@ -32,4 +32,9 @@ public interface DiscoverySpiCustomMessage extends Serializable {
* Called when message passed the ring.
*/
@Nullable public DiscoverySpiCustomMessage ackMessage();
+
+ /**
+ * @return {@code true} if message can be modified during listener notification. Changes will be send to next nodes.
+ */
+ public boolean isMutable();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 46e9635..22bb49b 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -461,7 +461,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
throw new IgniteException("Failed to send custom message: client is disconnected");
try {
- sockWriter.sendMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), marsh.marshal(evt)));
+ sockWriter.sendMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, marsh.marshal(evt)));
}
catch (IgniteCheckedException e) {
throw new IgniteSpiException("Failed to marshal custom event: " + evt, e);
@@ -1481,7 +1481,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
if (node != null && node.visible()) {
try {
- DiscoverySpiCustomMessage msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader());
+ DiscoverySpiCustomMessage msgObj = msg.message(marsh);
notifyDiscovery(EVT_DISCOVERY_CUSTOM_EVT, topVer, node, allVisibleNodes(), msgObj);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/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 0164e5c..34e1ca8 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
@@ -1266,7 +1266,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
/** {@inheritDoc} */
@Override public void sendCustomEvent(DiscoverySpiCustomMessage evt) {
try {
- msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), marsh.marshal(evt)));
+ msgWorker.addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), evt, marsh.marshal(evt)));
}
catch (IgniteCheckedException e) {
throw new IgniteSpiException("Failed to marshal custom event: " + evt, e);
@@ -4536,7 +4536,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
DiscoverySpiCustomMessage msgObj = null;
try {
- msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader());
+ msgObj = msg.message(marsh);
}
catch (Throwable e) {
U.error(log, "Failed to unmarshal discovery custom message.", e);
@@ -4547,7 +4547,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
if (nextMsg != null) {
try {
- addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), marsh.marshal(nextMsg)));
+ addMessage(new TcpDiscoveryCustomEventMessage(getLocalNodeId(), nextMsg,
+ marsh.marshal(nextMsg)));
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to marshal discovery custom message.", e);
@@ -4584,13 +4585,11 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
Collection<ClusterNode> snapshot = hist.get(msg.topologyVersion());
if (lsnr != null && (spiState == CONNECTED || spiState == DISCONNECTING)) {
- assert msg.messageBytes() != null;
-
TcpDiscoveryNode node = ring.node(msg.creatorNodeId());
if (node != null) {
try {
- DiscoverySpiCustomMessage msgObj = marsh.unmarshal(msg.messageBytes(), U.gridClassLoader());
+ DiscoverySpiCustomMessage msgObj = msg.message(marsh);
lsnr.onDiscovery(DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT,
msg.topologyVersion(),
@@ -4599,7 +4598,8 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
hist,
msgObj);
- msg.messageBytes(marsh.marshal(msgObj));
+ if (msgObj.isMutable())
+ msg.message(msgObj, marsh.marshal(msgObj));
}
catch (Throwable e) {
U.error(log, "Failed to unmarshal discovery custom message.", e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fbb590f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
index 372aa18..0739c1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryCustomEventMessage.java
@@ -18,6 +18,9 @@
package org.apache.ignite.spi.discovery.tcp.messages;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.marshaller.*;
+import org.apache.ignite.spi.discovery.*;
+import org.jetbrains.annotations.*;
import java.util.*;
@@ -31,15 +34,21 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage
private static final long serialVersionUID = 0L;
/** */
+ private transient volatile DiscoverySpiCustomMessage msg;
+
+ /** */
private byte[] msgBytes;
/**
* @param creatorNodeId Creator node id.
+ * @param msg Message.
* @param msgBytes Serialized message.
*/
- public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, byte[] msgBytes) {
+ public TcpDiscoveryCustomEventMessage(UUID creatorNodeId, @Nullable DiscoverySpiCustomMessage msg,
+ @NotNull byte[] msgBytes) {
super(creatorNodeId);
+ this.msg = msg;
this.msgBytes = msgBytes;
}
@@ -51,12 +60,28 @@ public class TcpDiscoveryCustomEventMessage extends TcpDiscoveryAbstractMessage
}
/**
- * @param msgBytes New message bytes.
+ * @param msg Message.
+ * @param msgBytes Serialized message.
*/
- public void messageBytes(byte[] msgBytes) {
+ public void message(@Nullable DiscoverySpiCustomMessage msg, @NotNull byte[] msgBytes) {
+ this.msg = msg;
this.msgBytes = msgBytes;
}
+ /**
+ * @return Deserialized message,
+ * @throws java.lang.Throwable if unmarshal failed.
+ */
+ @Nullable public DiscoverySpiCustomMessage message(@NotNull Marshaller marsh) throws Throwable {
+ if (msg == null) {
+ msg = marsh.unmarshal(msgBytes, U.gridClassLoader());
+
+ assert msg != null;
+ }
+
+ return msg;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(TcpDiscoveryCustomEventMessage.class, this, "super", super.toString());
[3/8] incubator-ignite git commit: # IGNITE-709 Remove unnecessary
null checking
Posted by sb...@apache.org.
# IGNITE-709 Remove unnecessary null checking
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a73b5ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a73b5ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a73b5ad
Branch: refs/heads/ignite-23
Commit: 6a73b5ade2ef006a44c1f7c936fc3e13776d69f3
Parents: 8fbb590
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun May 24 21:17:04 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun May 24 21:17:04 2015 +0300
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a73b5ad/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 62548d8..b60c753 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
@@ -361,7 +361,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
if (type == EVT_NODE_METRICS_UPDATED)
verChanged = false;
else if (type == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT) {
- if (customMsg != null && customMsg.incrementMinorTopologyVersion()) {
+ assert customMsg != null;
+
+ if (customMsg.incrementMinorTopologyVersion()) {
minorTopVer++;
verChanged = true;
@@ -385,18 +387,16 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
if (type == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT) {
- if (customMsg != null) {
- for (Class cls = customMsg.getClass(); cls != null; cls = cls.getSuperclass()) {
- List<CustomEventListener<DiscoveryCustomMessage>> list = customEvtLsnrs.get(cls);
-
- if (list != null) {
- for (CustomEventListener<DiscoveryCustomMessage> lsnr : list) {
- try {
- lsnr.onCustomEvent(node, customMsg);
- }
- catch (Exception e) {
- U.error(log, "Failed to notify direct custom event listener: " + customMsg, e);
- }
+ for (Class cls = customMsg.getClass(); cls != null; cls = cls.getSuperclass()) {
+ List<CustomEventListener<DiscoveryCustomMessage>> list = customEvtLsnrs.get(cls);
+
+ if (list != null) {
+ for (CustomEventListener<DiscoveryCustomMessage> lsnr : list) {
+ try {
+ lsnr.onCustomEvent(node, customMsg);
+ }
+ catch (Exception e) {
+ U.error(log, "Failed to notify direct custom event listener: " + customMsg, e);
}
}
}
[6/8] incubator-ignite git commit: # IGNITE-709 Fix
GridEventConsumeSelfTest.testMasterNodeLeave
Posted by sb...@apache.org.
# IGNITE-709 Fix GridEventConsumeSelfTest.testMasterNodeLeave
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4b790a8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4b790a8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4b790a8f
Branch: refs/heads/ignite-23
Commit: 4b790a8fdd109daf67b38fcd5b032951b2b785e6
Parents: 97533b3
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun May 24 22:51:24 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun May 24 22:51:24 2015 +0300
----------------------------------------------------------------------
.../internal/processors/continuous/GridEventConsumeSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4b790a8f/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
index f41aaa0..223c082 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
@@ -860,7 +860,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest {
final CountDownLatch latch = new CountDownLatch(GRID_CNT);
for (int i = 0; i < GRID_CNT; i++) {
- grid(0).events().localListen(new IgnitePredicate<Event>() {
+ grid(i).events().localListen(new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
if (nodeId.equals(((DiscoveryEvent) evt).eventNode().id()))
latch.countDown();
[5/8] incubator-ignite git commit: IGNITE-709 Fix
GridDiscoveryManagerAliveCacheSelfTest.testAlivesClient
Posted by sb...@apache.org.
IGNITE-709 Fix GridDiscoveryManagerAliveCacheSelfTest.testAlivesClient
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/97533b33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/97533b33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/97533b33
Branch: refs/heads/ignite-23
Commit: 97533b331948cfe9c3be040d720e8ab646ba8bc5
Parents: de9c141
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun May 24 22:31:40 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun May 24 22:31:40 2015 +0300
----------------------------------------------------------------------
.../GridDiscoveryManagerAliveCacheSelfTest.java | 41 ++++++++++++--------
1 file changed, 25 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/97533b33/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
index dce7d4b..55d4d80 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java
@@ -93,10 +93,18 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
if (clientMode && ((gridName.charAt(gridName.length() - 1) - '0') & 1) != 0)
disc = new TcpClientDiscoverySpi();
- else
- disc = new TcpDiscoverySpi();
+ else {
+ TcpDiscoverySpi srvDisc = new TcpDiscoverySpi();
+ srvDisc.setMaxMissedClientHeartbeats(50);
+
+ disc = srvDisc;
+ }
+
+ disc.setHeartbeatFrequency(500);
disc.setIpFinder(IP_FINDER);
+ disc.setAckTimeout(1000);
+ disc.setSocketTimeout(1000);
cfg.setCacheConfiguration(cCfg);
cfg.setDiscoverySpi(disc);
@@ -174,14 +182,10 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
*/
@SuppressWarnings("BusyWait")
private void awaitDiscovery(long nodesCnt) throws InterruptedException {
- Thread.sleep(50);
-
for (Ignite g : alive) {
if (g.configuration().getDiscoverySpi() instanceof TcpClientDiscoverySpi)
((TcpClientDiscoverySpi)g.configuration().getDiscoverySpi()).waitForMessagePrecessed();
- Thread.sleep(500);
-
while (g.cluster().nodes().size() != nodesCnt)
Thread.sleep(10);
}
@@ -246,23 +250,28 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe
* Stops temporary nodes.
*/
private void stopTempNodes() {
- int rmv = 0;
+ Collection<Ignite> toRmv = new ArrayList<>(alive.subList(0, TMP_NODES_CNT));
- Collection<Ignite> toRmv = new ArrayList<>(TMP_NODES_CNT);
+ alive.removeAll(toRmv);
- for (Iterator<Ignite> iter = alive.iterator(); iter.hasNext() && rmv < TMP_NODES_CNT;) {
- toRmv.add(iter.next());
+ // Remove listeners to avoid receiving events from stopping nodes.
+ for (Ignite g : toRmv)
+ g.events().stopLocalListen(lsnr, EventType.EVT_NODE_LEFT, EventType.EVT_NODE_FAILED);
- iter.remove();
+ for (Iterator<Ignite> itr = toRmv.iterator(); itr.hasNext(); ) {
+ Ignite g = itr.next();
- rmv++;
+ if (g.cluster().node().isClient()) {
+ G.stop(g.name(), false);
+
+ itr.remove();
+ }
}
- // Remove listeners to avoid receiving events from stopping nodes.
- for (Ignite g : toRmv)
- g.events().stopLocalListen(lsnr, EventType.EVT_NODE_LEFT, EventType.EVT_NODE_FAILED);
+ for (Ignite g : toRmv) {
+ assert !g.cluster().localNode().isClient();
- for (Ignite g : toRmv)
G.stop(g.name(), false);
+ }
}
}
[4/8] incubator-ignite git commit: # IGNITE-709 Add missing
toString() methods.
Posted by sb...@apache.org.
# IGNITE-709 Add missing toString() methods.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de9c1414
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de9c1414
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de9c1414
Branch: refs/heads/ignite-23
Commit: de9c141478ac2b3b8b0bac3517e3c0dd68ac9930
Parents: 6a73b5a
Author: sevdokimov <se...@jetbrains.com>
Authored: Sun May 24 21:46:51 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sun May 24 21:46:51 2015 +0300
----------------------------------------------------------------------
.../processors/continuous/StartRoutineAckDiscoveryMessage.java | 6 ++++++
.../processors/continuous/StartRoutineDiscoveryMessage.java | 2 +-
.../processors/continuous/StopRoutineAckDiscoveryMessage.java | 6 ++++++
.../processors/continuous/StopRoutineDiscoveryMessage.java | 6 ++++++
4 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de9c1414/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
index 3e3e6fe..5743dd4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.continuous;
import org.apache.ignite.*;
import org.apache.ignite.internal.managers.discovery.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -54,4 +55,9 @@ public class StartRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
public Map<UUID, IgniteCheckedException> errs() {
return errs;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(StartRoutineAckDiscoveryMessage.class, this, "routineId", routineId());
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de9c1414/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
index ec0d36b..cff6239 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java
@@ -80,6 +80,6 @@ public class StartRoutineDiscoveryMessage extends AbstractContinuousMessage {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(StartRoutineDiscoveryMessage.class, this, super.toString());
+ return S.toString(StartRoutineDiscoveryMessage.class, this, "routineId", routineId());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de9c1414/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
index 350f13c..256791a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.continuous;
import org.apache.ignite.internal.managers.discovery.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -40,4 +41,9 @@ public class StopRoutineAckDiscoveryMessage extends AbstractContinuousMessage {
@Nullable @Override public DiscoveryCustomMessage ackMessage() {
return null;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(StopRoutineAckDiscoveryMessage.class, this, "routineId", routineId());
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de9c1414/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
index 5b0dc5f..9dc2227 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.continuous;
import org.apache.ignite.internal.managers.discovery.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import org.jetbrains.annotations.*;
import java.util.*;
@@ -40,4 +41,9 @@ public class StopRoutineDiscoveryMessage extends AbstractContinuousMessage {
@Nullable @Override public DiscoveryCustomMessage ackMessage() {
return new StopRoutineAckDiscoveryMessage(routineId);
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(StopRoutineDiscoveryMessage.class, this, "routineId", routineId());
+ }
}