ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [23/35] ignite git commit: fixed compilation
Date Thu, 28 Apr 2016 13:02:07 GMT
fixed compilation


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/923b531e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/923b531e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/923b531e

Branch: refs/heads/ignite-db-x-10884
Commit: 923b531e8a4379bb6cfe0cb95d5a0a517832571a
Parents: dc71125
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Apr 27 13:02:50 2016 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Apr 27 13:02:50 2016 +0300

----------------------------------------------------------------------
 .../ignite/spi/discovery/tcp/ServerImpl.java    | 72 ++++++++++++--------
 1 file changed, 42 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/923b531e/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 450f628..d7dd8c8 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
@@ -3224,28 +3224,35 @@ class ServerImpl extends TcpDiscoveryImpl {
                 boolean locLateAssignBool = locLateAssign != null ? locLateAssign : false;
 
                 if (locMarshUseDfltSuidBool != rmtMarshUseDfltSuidBool) {
-                    utilityPool.submit(new Runnable() {
-                        @Override public void run() {
-                            String errMsg = "Local node's " + IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID
+
-                                " property value differs from remote node's value " +
-                                "(to make sure all nodes in topology have identical marshaller
settings, " +
-                                "configure system property explicitly) " +
-                                "[locMarshUseDfltSuid=" + locMarshUseDfltSuid + ", rmtMarshUseDfltSuid="
+ rmtMarshUseDfltSuid +
-                                ", locNodeAddrs=" + U.addressesAsString(locNode) +
-                                ", rmtNodeAddrs=" + U.addressesAsString(node) +
-                                ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId()
+ ']';
-
-                    String sndMsg = "Local node's " + IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID
+
-                        " property value differs from remote node's value " +
-                        "(to make sure all nodes in topology have identical marshaller settings,
" +
-                        "configure system property explicitly) " +
-                        "[locMarshUseDfltSuid=" + rmtMarshUseDfltSuid +
-                        ", rmtMarshUseDfltSuid=" + locMarshUseDfltSuid +
-                        ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort=" + node.discoveryPort()
+
-                        ", rmtNodeAddr=" + U.addressesAsString(locNode) + ", locNodeId="
+ node.id() +
-                        ", rmtNodeId=" + locNode.id() + ']';
+                    utilityPool.submit(
+                        new Runnable() {
+                            @Override public void run() {
+                                String errMsg = "Local node's " + IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID
+
+                                    " property value differs from remote node's value " +
+                                    "(to make sure all nodes in topology have identical marshaller
settings, " +
+                                    "configure system property explicitly) " +
+                                    "[locMarshUseDfltSuid=" + locMarshUseDfltSuid +
+                                    ", rmtMarshUseDfltSuid=" + rmtMarshUseDfltSuid +
+                                    ", locNodeAddrs=" + U.addressesAsString(locNode) +
+                                    ", rmtNodeAddrs=" + U.addressesAsString(node) +
+                                    ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId()
+ ']';
 
-                    nodeCheckError(node, errMsg, sndMsg);
+                                String sndMsg = "Local node's " + IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID
+
+                                    " property value differs from remote node's value " +
+                                    "(to make sure all nodes in topology have identical marshaller
settings, " +
+                                    "configure system property explicitly) " +
+                                    "[locMarshUseDfltSuid=" + rmtMarshUseDfltSuid +
+                                    ", rmtMarshUseDfltSuid=" + locMarshUseDfltSuid +
+                                    ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort="
+ node.discoveryPort() +
+                                    ", rmtNodeAddr=" + U.addressesAsString(locNode) + ",
locNodeId=" + node.id() +
+                                    ", rmtNodeId=" + locNode.id() + ']';
+
+                                nodeCheckError(
+                                    node,
+                                    errMsg,
+                                    sndMsg);
+                            }
+                        });
 
                     // Ignore join request.
                     return;
@@ -3270,15 +3277,20 @@ class ServerImpl extends TcpDiscoveryImpl {
                                     ", rmtNodeAddrs=" + U.addressesAsString(node) +
                                     ", locNodeId=" + locNode.id() + ", rmtNodeId=" + msg.creatorNodeId()
+ ']';
 
-                    String sndMsg = "Local node's binary marshaller \"compactFooter\" property
differs from " +
-                        "the same property on remote node (make sure all nodes in topology
have the same value " +
-                        "of \"compactFooter\" property) [locMarshallerCompactFooter=" + rmtMarshCompactFooterBool
+
-                        ", rmtMarshallerCompactFooter=" + locMarshCompactFooterBool +
-                        ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort=" + node.discoveryPort()
+
-                        ", rmtNodeAddr=" + U.addressesAsString(locNode) + ", locNodeId="
+ node.id() +
-                        ", rmtNodeId=" + locNode.id() + ']';
-
-                    nodeCheckError(node, errMsg, sndMsg);
+                                String sndMsg = "Local node's binary marshaller \"compactFooter\"
property differs from " +
+                                    "the same property on remote node (make sure all nodes
in topology have the same value " +
+                                    "of \"compactFooter\" property) [locMarshallerCompactFooter="
+ rmtMarshCompactFooterBool +
+                                    ", rmtMarshallerCompactFooter=" + locMarshCompactFooterBool
+
+                                    ", locNodeAddrs=" + U.addressesAsString(node) + ", locPort="
+ node.discoveryPort() +
+                                    ", rmtNodeAddr=" + U.addressesAsString(locNode) + ",
locNodeId=" + node.id() +
+                                    ", rmtNodeId=" + locNode.id() + ']';
+
+                                nodeCheckError(
+                                    node,
+                                    errMsg,
+                                    sndMsg);
+                            }
+                        });
 
                     // Ignore join request.
                     return;


Mime
View raw message