IGNITE-24585 Fixed NPE when getting cluster name on inactive cluster (#11892)

Author: NSAmelchev

modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java

@@ -1052,7 +1052,7 @@ public void testDeactivateWithCheckClusterNameInConfirmationByDefault() throws E
 
         deactivateActiveOrNotClusterWithCheckClusterNameInConfirmation(
             igniteEx,
-            igniteEx.context().cache().utilityCache().context().dynamicDeploymentId().toString()
+            igniteEx.cluster().id().toString()
         );
     }
 
@@ -1164,6 +1164,14 @@ public void testState() throws Exception {
         out = testOut.toString();
 
         assertTrue(out.contains("Cluster tag: " + newTag));
+
+        ignite.cluster().state(INACTIVE);
+
+        awaitPartitionMapExchange();
+
+        assertEquals(EXIT_CODE_OK, execute("--state"));
+
+        assertClusterState(INACTIVE, testOut.toString());
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java

@@ -1172,12 +1172,8 @@ public final class IgniteSystemProperties {
         " Default is false, which means that service security permissions will be respected")
     public static final String IGNITE_SECURITY_COMPATIBILITY_MODE = "IGNITE_SECURITY_COMPATIBILITY_MODE";
 
-    /**
-     * Ignite cluster name.
-     * <p>
-     * Defaults to utility cache deployment ID..
-     */
-    @SystemProperty(value = "Ignite cluster name. Defaults to utility cache deployment ID", type = String.class)
+    /** Ignite cluster name. Defaults to {@link IgniteCluster#id()}. */
+    @SystemProperty(value = "Ignite cluster name. Defaults to cluster ID", type = String.class)
     public static final String IGNITE_CLUSTER_NAME = "IGNITE_CLUSTER_NAME";
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java

@@ -852,16 +852,9 @@ public String latestVersion() {
      * @return Cluster name.
      * */
     public String clusterName() {
-        try {
-            ctx.cache().awaitStarted();
-        }
-        catch (IgniteCheckedException e) {
-            throw U.convertException(e);
-        }
-
         return IgniteSystemProperties.getString(
             IGNITE_CLUSTER_NAME,
-            ctx.cache().utilityCache().context().dynamicDeploymentId().toString()
+            String.valueOf(ctx.grid().cluster().id())
         );
     }
 

modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterNameTest.java

@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.cluster;
+
+import org.apache.ignite.cluster.ClusterState;
+import org.apache.ignite.configuration.DataRegionConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Test;
+import org.junit.runners.Parameterized;
+
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * Tests cluster name.
+ */
+public class IgniteClusterNameTest extends GridCommonAbstractTest {
+    /** */
+    @Parameterized.Parameter
+    public boolean isPersistenceEnabled;
+
+    /** */
+    @Parameterized.Parameters(name = "isPersistenceEnabled={0}")
+    public static Object[] parameters() {
+        return new Object[] {false, true};
+    }
+
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+        return super.getConfiguration(igniteInstanceName)
+            .setDataStorageConfiguration(new DataStorageConfiguration()
+                .setDefaultDataRegionConfiguration(new DataRegionConfiguration()
+                    .setPersistenceEnabled(isPersistenceEnabled)));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void afterTest() throws Exception {
+        super.afterTest();
+
+        stopAllGrids();
+
+        cleanPersistenceDir();
+    }
+
+    /** @throws Exception If failed. */
+    @Test
+    public void testDefaultClusterName() throws Exception {
+        IgniteEx srv = startGrid(0);
+        String id = srv.cluster().id().toString();
+
+        assertEquals(id, srv.context().cluster().clusterName());
+
+        if (isPersistenceEnabled) {
+            srv.cluster().state(ClusterState.ACTIVE);
+
+            assertEquals(id, srv.context().cluster().clusterName());
+        }
+
+        srv.cluster().state(ClusterState.INACTIVE);
+
+        assertEquals(id, srv.context().cluster().clusterName());
+
+        stopAllGrids();
+
+        srv = startGrid(0);
+
+        if (isPersistenceEnabled)
+            assertEquals(id, srv.context().cluster().clusterName());
+        else
+            assertNotEquals(id, srv.context().cluster().clusterName());
+    }
+}

modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/ClusterNameBeforeActivation.java

@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import org.apache.ignite.internal.cluster.IgniteClusterNameTest;
 import org.apache.ignite.internal.metric.CacheMetricsAddRemoveTest;
 import org.apache.ignite.internal.metric.CacheMetricsConflictResolverTest;
 import org.apache.ignite.internal.metric.CustomMetricsTest;
@@ -51,7 +52,6 @@
 import org.apache.ignite.internal.processors.cache.transform.CacheObjectTransformationCacheApiTest;
 import org.apache.ignite.internal.processors.cache.transform.CacheObjectTransformationEvolutionTest;
 import org.apache.ignite.internal.processors.cache.transform.CacheObjectTransformationTest;
-import org.apache.ignite.internal.processors.cluster.ClusterNameBeforeActivation;
 import org.apache.ignite.internal.processors.continuous.ContinuousQueryBuffersCleanupTest;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.DynamicSuite;
@@ -108,7 +108,7 @@ public static List<Class<?>> suite(Collection<Class> ignoredTests) {
         GridTestUtils.addTestIfNeeded(suite, RebalanceStatisticsTest.class, ignoredTests);
         GridTestUtils.addTestIfNeeded(suite, TxRecoveryOnCoordniatorFailTest.class, ignoredTests);
 
-        GridTestUtils.addTestIfNeeded(suite, ClusterNameBeforeActivation.class, ignoredTests);
+        GridTestUtils.addTestIfNeeded(suite, IgniteClusterNameTest.class, ignoredTests);
 
         GridTestUtils.addTestIfNeeded(suite, CacheClearAsyncDeadlockTest.class, ignoredTests);