ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: zk
Date Tue, 28 Nov 2017 11:35:08 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-zk cf50b1c9e -> a45fb7804


zk


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

Branch: refs/heads/ignite-zk
Commit: a45fb78048eb33d0b0a2d135021510ac57c93ed5
Parents: cf50b1c
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Nov 28 14:35:02 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Nov 28 14:35:02 2017 +0300

----------------------------------------------------------------------
 .../discovery/zk/internal/ZookeeperDiscoveryImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a45fb780/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index 9f833f1..4ae06ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -292,7 +292,7 @@ public class ZookeeperDiscoveryImpl {
         byte[] msgBytes;
 
         try {
-            msgBytes = marshal(msg);
+            msgBytes = U.zip(marshal(msg));
         }
         catch (IgniteCheckedException e) {
             throw new IgniteSpiException("Failed to marshal custom message: " + msg, e);
@@ -367,7 +367,7 @@ public class ZookeeperDiscoveryImpl {
         byte[] joinDataBytes;
 
         try {
-            joinDataBytes = marshal(joinData);
+            joinDataBytes = U.zip(marshal(joinData));
         }
         catch (Exception e) {
             throw new IgniteSpiException("Failed to marshal joining node data", e);
@@ -724,7 +724,7 @@ public class ZookeeperDiscoveryImpl {
         }
 
         // TODO ZK: fail node if can not unmarshal.
-        ZkJoiningNodeData joiningNodeData = unmarshal(joinData);
+        ZkJoiningNodeData joiningNodeData = unmarshalZip(joinData);
 
         ZookeeperClusterNode joinedNode = joiningNodeData.node();
 
@@ -922,7 +922,7 @@ public class ZookeeperDiscoveryImpl {
                     DiscoverySpiCustomMessage msg;
 
                     try {
-                        msg = unmarshal(evtBytes);
+                        msg = unmarshalZip(evtBytes);
 
                         state.evtsData.evtIdGen++;
 
@@ -1034,7 +1034,7 @@ public class ZookeeperDiscoveryImpl {
                         else {
                             String path = zkPaths.joinEventDataPath(evtData.eventId());
 
-                            joiningData = unmarshal(state.zkClient.getData(path));
+                            joiningData = unmarshalZip(state.zkClient.getData(path));
 
                             DiscoveryDataBag dataBag = new DiscoveryDataBag(evtData0.nodeId);
 
@@ -1075,7 +1075,7 @@ public class ZookeeperDiscoveryImpl {
                             else
                                 path = zkPaths.customEventDataPath(false, evtData0.evtPath);
 
-                            msg = unmarshal(state.zkClient.getData(path));
+                            msg = unmarshalZip(state.zkClient.getData(path));
 
                             evtData0.msg = msg;
                         }
@@ -1313,7 +1313,7 @@ public class ZookeeperDiscoveryImpl {
 
                             long evtId = state.evtsData.evtIdGen;
 
-                            byte[] ackBytes = marshal(ack);
+                            byte[] ackBytes = U.zip(marshal(ack));
 
                             String path = zkPaths.ackEventDataPath(evtId);
 


Mime
View raw message