IGNITE-9163 Web console: Fixed incorrect cluster state for clusters of version 1.x.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00bbd8ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00bbd8ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00bbd8ea Branch: refs/heads/ignite-8446 Commit: 00bbd8eae84a0b37d585b5b384729bf7b3440a66 Parents: 83ee6d3 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Fri Aug 3 14:32:03 2018 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Fri Aug 3 14:32:03 2018 +0700 ---------------------------------------------------------------------- .../apache/ignite/console/agent/handlers/ClusterListener.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/00bbd8ea/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 0c7560c..1c93798 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 @@ -66,6 +66,9 @@ public class ClusterListener implements AutoCloseable { private static final IgniteLogger log = new Slf4jLogger(LoggerFactory.getLogger(ClusterListener.class)); /** */ + private static final IgniteProductVersion IGNITE_2_0 = IgniteProductVersion.fromString("2.0.0"); + + /** */ private static final IgniteProductVersion IGNITE_2_1 = IgniteProductVersion.fromString("2.1.0"); /** */ @@ -418,6 +421,10 @@ public class ClusterListener implements AutoCloseable { * @throws IOException If failed to collect cluster active state. */ public boolean active(IgniteProductVersion ver, UUID nid) throws IOException { + // 1.x clusters are always active. + if (ver.compareTo(IGNITE_2_0) < 0) + return true; + Map<String, Object> params = U.newHashMap(10); boolean v23 = ver.compareTo(IGNITE_2_3) >= 0;
