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 2017/06/28 08:46:31 UTC
[1/4] ignite git commit: IGNITE-5536 Fixed Docker file generation.
Repository: ignite
Updated Branches:
refs/heads/ignite-2.1.2-exchange 20c7f6c43 -> 38c209d7a
IGNITE-5536 Fixed Docker file generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3dbeac44
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3dbeac44
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3dbeac44
Branch: refs/heads/ignite-2.1.2-exchange
Commit: 3dbeac440591c8404bdbea78fc46cdff7c2f432e
Parents: 764eeea
Author: vsisko <vs...@gridgain.com>
Authored: Wed Jun 28 15:07:30 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Jun 28 15:07:30 2017 +0700
----------------------------------------------------------------------
.../app/modules/configuration/generator/Docker.service.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3dbeac44/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
index 91457e8..ea49c41 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
@@ -19,6 +19,8 @@
* Docker file generation entry point.
*/
export default class IgniteDockerGenerator {
+ escapeFileName = (name) => name.replace(/[\\\/*\"\[\],\.:;|=<>?]/g, '-').replace(/ /g, '_');
+
/**
* Generate from section.
*
@@ -44,7 +46,7 @@ export default class IgniteDockerGenerator {
this.from(cluster, targetVer),
'',
'# Set config uri for node.',
- `ENV CONFIG_URI config/${cluster.name}-server.xml`,
+ `ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml`,
'',
'# Copy ignite-http-rest from optional.',
'ENV OPTION_LIBS ignite-rest-http',
@@ -62,8 +64,7 @@ export default class IgniteDockerGenerator {
'',
'# Copy project jars to node classpath.',
`RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\`,
- ` find ${cluster.name}/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/${cluster.name} \\; && \\`,
- ` cp -r ${cluster.name}/config/* $IGNITE_HOME/config`
+ ` find ${cluster.name}/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/${cluster.name} \\;`
].join('\n');
}
[2/4] ignite git commit: ignite-2.1.2 Limit amount of debug logging
Posted by sb...@apache.org.
ignite-2.1.2 Limit amount of debug logging
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6972e95
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6972e95
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6972e95
Branch: refs/heads/ignite-2.1.2-exchange
Commit: d6972e95367d93c1015b6bab8dd4dc78ae2fc1e6
Parents: 764eeea
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jun 28 11:30:47 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jun 28 11:30:47 2017 +0300
----------------------------------------------------------------------
.../affinity/GridAffinityAssignmentCache.java | 14 ++++++++---
.../GridCachePartitionExchangeManager.java | 25 +++++++++++++++-----
2 files changed, 30 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6972e95/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index b478462..71ec3ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -88,7 +88,7 @@ public class GridAffinityAssignmentCache {
private final AtomicReference<GridAffinityAssignment> head;
/** Ready futures. */
- private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts = new ConcurrentHashMap8<>();
+ private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts = new ConcurrentSkipListMap<>();
/** Log. */
private final IgniteLogger log;
@@ -434,10 +434,18 @@ public class GridAffinityAssignmentCache {
*/
public void dumpDebugInfo() {
if (!readyFuts.isEmpty()) {
- U.warn(log, "Pending affinity ready futures [grp=" + cacheOrGrpName + ", lastVer=" + lastVersion() + "]:");
+ U.warn(log, "First 3 pending affinity ready futures [grp=" + cacheOrGrpName +
+ ", total=" + readyFuts.size() +
+ ", lastVer=" + lastVersion() + "]:");
- for (AffinityReadyFuture fut : readyFuts.values())
+ int cnt = 0;
+
+ for (AffinityReadyFuture fut : readyFuts.values()) {
U.warn(log, ">>> " + fut);
+
+ if (++cnt == 3)
+ break;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6972e95/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 322da18..19d99a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -154,7 +154,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
private final AtomicReference<GridDhtTopologyFuture> lastFinishedFut = new AtomicReference<>();
/** */
- private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts = new ConcurrentHashMap8<>();
+ private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts =
+ new ConcurrentSkipListMap<>();
/** */
private final ConcurrentSkipListMap<AffinityTopologyVersion, IgnitePair<IgniteProductVersion>> nodeVers =
@@ -1402,10 +1403,16 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
exchWorker.dumpExchangeDebugInfo();
if (!readyFuts.isEmpty()) {
- U.warn(diagnosticLog, "Pending affinity ready futures:");
+ U.warn(diagnosticLog, "First 5 pending affinity ready futures [total=" + readyFuts.size() + ']');
+
+ int cnt = 0;
- for (AffinityReadyFuture fut : readyFuts.values())
+ for (AffinityReadyFuture fut : readyFuts.values()) {
U.warn(diagnosticLog, ">>> " + fut);
+
+ if (++cnt == 5)
+ break;
+ }
}
IgniteDiagnosticPrepareContext diagCtx = cctx.kernalContext().cluster().diagnosticEnabled() ?
@@ -1775,11 +1782,17 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
* Dump debug info.
*/
void dumpExchangeDebugInfo() {
- U.warn(log, "Pending exchange futures:");
+ U.warn(log, "First 10 pending exchange futures [total=" + futQ.size() + ']');
- for (CachePartitionExchangeWorkerTask task: futQ) {
- if (isExchangeTask(task))
+ int cnt = 0;
+
+ for (CachePartitionExchangeWorkerTask task : futQ) {
+ if (isExchangeTask(task)) {
U.warn(log, ">>> " + ((GridDhtPartitionsExchangeFuture)task).shortInfo());
+
+ if (++cnt == 10)
+ break;
+ }
}
}
[3/4] ignite git commit: Merge remote-tracking branch
'community/ignite-2.1.2' into ignite-2.1.2
Posted by sb...@apache.org.
Merge remote-tracking branch 'community/ignite-2.1.2' into ignite-2.1.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1ced55b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1ced55b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1ced55b6
Branch: refs/heads/ignite-2.1.2-exchange
Commit: 1ced55b6fabfd009e98a2d2010bf6e9a01a30fb9
Parents: d6972e9 3dbeac4
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jun 28 11:31:18 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jun 28 11:31:18 2017 +0300
----------------------------------------------------------------------
.../app/modules/configuration/generator/Docker.service.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[4/4] ignite git commit: Merge branch 'ignite-2.1.2' into
ignite-2.1.2-exchange
Posted by sb...@apache.org.
Merge branch 'ignite-2.1.2' into ignite-2.1.2-exchange
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/38c209d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/38c209d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/38c209d7
Branch: refs/heads/ignite-2.1.2-exchange
Commit: 38c209d7a45a2293dd0a9d95c76089aedeb0f2b6
Parents: 20c7f6c 1ced55b
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jun 28 11:46:08 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jun 28 11:46:08 2017 +0300
----------------------------------------------------------------------
.../affinity/GridAffinityAssignmentCache.java | 14 ++++++++---
.../GridCachePartitionExchangeManager.java | 25 +++++++++++++++-----
.../configuration/generator/Docker.service.js | 7 +++---
3 files changed, 34 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/38c209d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------