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 2016/12/06 08:09:14 UTC
[7/7] ignite git commit: Merge remote-tracking branch
'remotes/community/ignite-comm-balance' into ignite-comm-balance-master
Merge remote-tracking branch 'remotes/community/ignite-comm-balance' into ignite-comm-balance-master
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f11bb6bc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f11bb6bc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f11bb6bc
Branch: refs/heads/ignite-comm-balance-master
Commit: f11bb6bcd274f2f33f410c4e9be78ca4a5bbac1c
Parents: 3d28a65 21ea0b8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 6 11:08:58 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 6 11:08:58 2016 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 50 ++++---
.../apache/ignite/internal/IgniteKernal.java | 43 ++++--
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../managers/communication/GridIoManager.java | 5 +-
.../GridCachePartitionExchangeManager.java | 2 +-
.../GridDistributedTxFinishResponse.java | 32 +----
.../cache/query/GridCacheQueryRequest.java | 2 +-
.../ignite/internal/util/StripedExecutor.java | 132 +++++++++----------
.../ignite/tools/classgen/ClassesGenerator.java | 7 +-
9 files changed, 143 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f11bb6bc/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 1648c44,e229141..4972d1f
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -1007,10 -1031,13 +1032,12 @@@ public class IgniteKernal implements Ig
// at least one waiting request, then it is possible starvation.
if (exec.getPoolSize() == exec.getActiveCount() && completedCnt == lastCompletedCnt &&
!exec.getQueue().isEmpty())
- LT.warn(log, "Possible thread pool starvation detected (no task completed in last " +
- interval + "ms, is executorService pool size large enough?)");
+ LT.warn(
+ log,
- null,
+ "Possible thread pool starvation detected (no task completed in last " +
+ interval + "ms, is " + pool + " thread pool size large enough?)");
- lastCompletedCnt = completedCnt;
+ return completedCnt;
}
}, interval, interval);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/f11bb6bc/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f11bb6bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------