You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/06/19 20:32:57 UTC

[1/2] incubator-ignite git commit: #IGNITE-1034 - Corrected messages after code review.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-sprint-6 e0e1994dd -> 415264e3e


#IGNITE-1034 - Corrected messages after code review.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/03dc03d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03dc03d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03dc03d4

Branch: refs/heads/ignite-sprint-6
Commit: 03dc03d42eeabedbb82862461b523421e49744b9
Parents: e1b8800
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Jun 19 11:32:23 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Jun 19 11:32:23 2015 -0700

----------------------------------------------------------------------
 .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03dc03d4/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 3997768..1ec2128 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
@@ -1917,7 +1917,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
                 if (node != null && node.isClient()) {
                     String msg = "Client node outbound queue size exceeded slowClientQueueLimit, " +
-                        "the client will be dropped (consider changing \'slowClientQueueLimit\') [clientNode=" + node +
+                        "the client will be dropped (consider changing \'slowClientQueueLimit\') [" +
+                        "srvNode=" + getSpiContext().localNode().id() +
+                        ", clientNode=" + node +
                         ", slowClientQueueLimit=" + slowClientQueueLimit + ']';
 
                     LT.warn(log, null, msg);


[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6

Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/415264e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/415264e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/415264e3

Branch: refs/heads/ignite-sprint-6
Commit: 415264e3e59d98e711fe37d7e4c12ef2416d9e7d
Parents: 03dc03d e0e1994
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Fri Jun 19 11:32:38 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Fri Jun 19 11:32:38 2015 -0700

----------------------------------------------------------------------
 .../cache/GridCachePartitionExchangeManager.java  |  1 +
 .../processors/cache/jta/GridCacheXAResource.java | 18 +++++++++---------
 .../processors/cache/GridCacheJtaSelfTest.java    |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------