You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/01/13 07:27:32 UTC
[1/5] incubator-ignite git commit: # ignite commented hanging test
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-43 13740b709 -> 311bbddc0
# ignite commented hanging test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5fd0d7c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fd0d7c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fd0d7c9
Branch: refs/heads/ignite-43
Commit: 5fd0d7c9ad979e46b46465f836508ad201a48ef3
Parents: 310f8e8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 15:25:12 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 15:25:12 2014 +0300
----------------------------------------------------------------------
.../gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd0d7c9/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
index 2775623..daf2b5a 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
@@ -36,7 +36,8 @@ public class GridCacheFailoverTestSuite extends TestSuite {
// Failure consistency tests.
suite.addTestSuite(GridCacheDhtAtomicRemoveFailureTest.class);
suite.addTestSuite(GridCacheDhtRemoveFailureTest.class);
- suite.addTestSuite(GridCacheNearRemoveFailureTest.class);
+ // TODO: IGNITE-80.
+ // suite.addTestSuite(GridCacheNearRemoveFailureTest.class);
// suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class); TODO GG-9150
suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.class);
[5/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1' into ignite-43
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/311bbddc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/311bbddc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/311bbddc
Branch: refs/heads/ignite-43
Commit: 311bbddc051181f50e299567c47c1b1ac9746e08
Parents: 13740b7 aceb586
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jan 13 09:27:15 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jan 13 09:27:15 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/IgniteSystemProperties.java | 13 +++++++++++++
.../spi/communication/tcp/TcpCommunicationSpi.java | 8 +++++---
.../main/java/org/gridgain/grid/util/GridUtils.java | 16 ++++++++++++++++
.../bamboo/GridCacheFailoverTestSuite.java | 3 ++-
4 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[4/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aceb5868
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aceb5868
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aceb5868
Branch: refs/heads/ignite-43
Commit: aceb586892adc2bc15756e372677a0edfc49cb83
Parents: 180720f 7f190ca
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jan 12 15:05:38 2015 +0400
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jan 12 15:05:38 2015 +0400
----------------------------------------------------------------------
.../org/apache/ignite/IgniteSystemProperties.java | 13 +++++++++++++
.../spi/communication/tcp/TcpCommunicationSpi.java | 8 +++++---
.../main/java/org/gridgain/grid/util/GridUtils.java | 16 ++++++++++++++++
.../bamboo/GridCacheFailoverTestSuite.java | 3 ++-
4 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aceb5868/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
[2/5] incubator-ignite git commit: GG-9673 Need to investigate MBeans
registration in Weblogic cluster environment Added jvmId property to mbean
name.
Posted by sb...@apache.org.
GG-9673 Need to investigate MBeans registration in Weblogic cluster environment Added jvmId property to mbean name.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a7b426cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a7b426cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a7b426cf
Branch: refs/heads/ignite-43
Commit: a7b426cffe243ad6270a06bc251e283acf3a5b43
Parents: 5fd0d7c
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Jan 12 12:48:55 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Jan 12 12:48:55 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/IgniteSystemProperties.java | 13 +++++++++++++
.../main/java/org/gridgain/grid/util/GridUtils.java | 16 ++++++++++++++++
2 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7b426cf/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index c403fd7..b4d9d81 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -12,6 +12,7 @@ package org.apache.ignite;
import org.jetbrains.annotations.*;
import javax.net.ssl.*;
+import java.lang.management.*;
/**
* Contains constants for all system properties and environmental variables in GridGain. These
@@ -448,6 +449,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.
*/
private IgniteSystemProperties() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7b426cf/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index 37c2109..62d27d3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -3867,6 +3867,8 @@ public abstract class GridUtils {
throws MalformedObjectNameException {
SB sb = new SB(JMX_DOMAIN + ':');
+ appendJvmId(sb);
+
if (gridName != null && !gridName.isEmpty())
sb.a("grid=").a(gridName).a(',');
@@ -3879,6 +3881,18 @@ public abstract class GridUtils {
}
/**
+ * @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}.
*
* @param cacheName Component name to mask, possibly {@code null}.
@@ -3902,6 +3916,8 @@ public abstract class GridUtils {
throws MalformedObjectNameException {
SB sb = new SB(JMX_DOMAIN + ':');
+ appendJvmId(sb);
+
if (gridName != null && !gridName.isEmpty())
sb.a("grid=").a(gridName).a(',');
[3/5] incubator-ignite git commit: # master Fixed recovery descriptor
creation
Posted by sb...@apache.org.
# master Fixed recovery descriptor creation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7f190ca9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7f190ca9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7f190ca9
Branch: refs/heads/ignite-43
Commit: 7f190ca9cd731f3f93c92fbbd16a4c652c7bb767
Parents: a7b426c
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jan 12 15:04:14 2015 +0400
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jan 12 15:04:14 2015 +0400
----------------------------------------------------------------------
.../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f190ca9/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index c80617e..3736d08 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -519,7 +519,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
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 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
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 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
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;