Merge remote-tracking branch 'origin/master'

Author: Yakov Zhdanov

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

@@ -12,6 +12,7 @@
 import org.jetbrains.annotations.*;
 
 import javax.net.ssl.*;
+import java.lang.management.*;
 
 /**
  * Contains constants for all system properties and environmental variables in GridGain. These
@@ -447,6 +448,18 @@ public final class IgniteSystemProperties {
      */
     public static final String GG_WORK_DIR = "GRIDGAIN_WORK_DIR";
 
+    /**
+     * If this property is set to {@code true} then GridGain will append
+     * hash code of {@link Ignite} class as hex string and append
+     * JVM name returned by {@link RuntimeMXBean#getName()}.
+     * <p>
+     * This may be helpful when running GridGain in some application server
+     * clusters or similar environments to avoid MBean name collisions.
+     * <p>
+     * Default is {@code false}.
+     */
+    public static final String GG_MBEAN_APPEND_JVM_ID = "GRIDGAIN_MBEAN_APPEND_JVM_ID";
+
     /**
      * Enforces singleton.
      */

modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java

@@ -519,7 +519,8 @@ private GridTcpNioCommunicationClient connected(
 
                     GridCommunicationClient oldClient = clients.putIfAbsent(node.id(), client);
 
-                    assert oldClient == null;
+                    assert oldClient == null : "Client already created [node=" + node + ", client=" + client +
+                            ", oldClient=" + oldClient + ", recoveryDesc=" + recovery + ']';
                 }
 
                 return client;
@@ -1830,7 +1831,8 @@ private GridCommunicationClient reserveClient(ClusterNode node) throws IgniteChe
                             if (client0 != null) {
                                 GridCommunicationClient old = clients.put(nodeId, client0);
 
-                                assert old == null;
+                                assert old == null : "Client already created " +
+                                        "[node=" + node + ", client=" + client0 + ", oldClient=" + old + ']';
                             }
                             else
                                 U.sleep(200);
@@ -2359,7 +2361,7 @@ private GridNioRecoveryDescriptor recoveryDescriptor(ClusterNode node) {
             int queueLimit = unackedMsgsBufSize != 0 ? unackedMsgsBufSize : (maxSize * 5);
 
             GridNioRecoveryDescriptor old =
-                recoveryDescs.put(id, recovery = new GridNioRecoveryDescriptor(queueLimit, node, log));
+                recoveryDescs.putIfAbsent(id, recovery = new GridNioRecoveryDescriptor(queueLimit, node, log));
 
             if (old != null)
                 recovery = old;

modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java

@@ -3867,6 +3867,8 @@ public static ObjectName makeMBeanName(@Nullable String gridName, @Nullable Stri
         throws MalformedObjectNameException {
         SB sb = new SB(JMX_DOMAIN + ':');
 
+        appendJvmId(sb);
+
         if (gridName != null && !gridName.isEmpty())
             sb.a("grid=").a(gridName).a(',');
 
@@ -3878,6 +3880,18 @@ public static ObjectName makeMBeanName(@Nullable String gridName, @Nullable Stri
         return new ObjectName(sb.toString());
     }
 
+    /**
+     * @param sb Sb.
+     */
+    private static void appendJvmId(SB sb) {
+        if (getBoolean(GG_MBEAN_APPEND_JVM_ID)) {
+            String gridId = Integer.toHexString(Ignite.class.getClassLoader().hashCode()) + "_"
+                + ManagementFactory.getRuntimeMXBean().getName();
+
+            sb.a("jvmId=").a(gridId).a(',');
+        }
+    }
+
     /**
      * Mask component name to make sure that it is not {@code null}.
      *
@@ -3902,6 +3916,8 @@ public static ObjectName makeCacheMBeanName(@Nullable String gridName, @Nullable
         throws MalformedObjectNameException {
         SB sb = new SB(JMX_DOMAIN + ':');
 
+        appendJvmId(sb);
+
         if (gridName != null && !gridName.isEmpty())
             sb.a("grid=").a(gridName).a(',');