[ignite] branch master updated: IGNITE-13534 Fixed uninformative message in console about using deprecated active() - Fixes #8347.

[ilyak]

This is an automated email from the ASF dual-hosted git repository.

ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 5e37db2  IGNITE-13534 Fixed uninformative message in console about 
using deprecated active() - Fixes #8347.
5e37db2 is described below

commit 5e37db2f27a02b5c31c8b7a76b18f42e9d243111
Author: Ilya Kazakov <kazakov.i...@gmail.com>
AuthorDate: Wed Oct 21 14:03:12 2020 +0300

    IGNITE-13534 Fixed uninformative message in console about using deprecated 
active() - Fixes #8347.
    
    Signed-off-by: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
---
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 50c1a55..bd35e7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2175,9 +2175,9 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
             log.info(str);
         }
 
-        if (!ctx.state().clusterState().active()) {
-            U.quietAndInfo(log, ">>> Ignite cluster is not active (limited 
functionality available). " +
-                "Use control.(sh|bat) script or IgniteCluster interface to 
activate.");
+        if (ctx.state().clusterState().state() == ClusterState.INACTIVE) {
+            U.quietAndInfo(log, ">>> Ignite cluster is in INACTIVE state 
(limited functionality available). " +
+                "Use control.(sh|bat) script or 
IgniteCluster.state(ClusterState.ACTIVE) to change the state.");
         }
     }
 
@@ -4508,7 +4508,7 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
         reg.register("longJVMPauseLastEvents", 
this::getLongJVMPauseLastEvents, Map.class,
             LONG_JVM_PAUSE_LAST_EVENTS_DESC);
 
-        reg.register("active", () -> 
ctx.state().clusterState().active()/*this::active*/, Boolean.class,
+        reg.register("active", () -> 
ctx.state().clusterState().state().active(), Boolean.class,
             ACTIVE_DESC);
 
         reg.register("clusterState", this::clusterState, String.class, 
CLUSTER_STATE_DESC);