ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-5414 Fixed cluster topology serialization.
Date Mon, 12 Jun 2017 08:54:18 GMT
Repository: ignite
Updated Branches:
  refs/heads/master ca6cd142d -> 0879ca885


IGNITE-5414 Fixed cluster topology serialization.


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

Branch: refs/heads/master
Commit: 0879ca88553ac1299fe21bd1e60cf64e3edf4096
Parents: ca6cd14
Author: Alexey Kuznetsov <akuznetsov@gridgain.com>
Authored: Mon Jun 12 15:53:18 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@gridgain.com>
Committed: Mon Jun 12 15:53:18 2017 +0700

----------------------------------------------------------------------
 .../console/agent/handlers/ClusterListener.java | 28 ++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0879ca88/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
index 0da4469..cde4701 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
@@ -190,12 +190,12 @@ public class ClusterListener {
     }
 
     /** */
-    private class TopologySnapshot {
+    private static class TopologySnapshot {
         /** */
         private Collection<UUID> nids;
 
         /** */
-        private String clusterVersion;
+        private String clusterVer;
 
         /**
          * @param nodes Nodes.
@@ -210,7 +210,21 @@ public class ClusterListener {
                     }
                 });
 
-            clusterVersion = Collections.min(vers).toString();
+            clusterVer = Collections.min(vers).toString();
+        }
+
+        /**
+         * @return Cluster version.
+         */
+        public String getClusterVersion() {
+            return clusterVer;
+        }
+
+        /**
+         * @return Cluster nodes IDs.
+         */
+        public Collection<UUID> getNids() {
+            return nids;
         }
 
         /**  */
@@ -256,7 +270,9 @@ public class ClusterListener {
                         clusterDisconnect();
                 }
             }
-            catch (IOException ignore) {
+            catch (Exception e) {
+                log.error("WatchTask failed", e);
+
                 clusterDisconnect();
             }
         }
@@ -296,7 +312,9 @@ public class ClusterListener {
                         clusterDisconnect();
                 }
             }
-            catch (IOException ignore) {
+            catch (Exception e) {
+                log.error("BroadcastTask failed", e);
+
                 clusterDisconnect();
 
                 watch();


Mime
View raw message