ignite git commit: IGNITE-5238: Resolved dependency problems of Ignite Spark and Ignite Rest modules. - Fixes #1973.
Repository: ignite
Updated Branches:
refs/heads/master 3b7e16628 -> 64c558404
IGNITE-5238: Resolved dependency problems of Ignite Spark and Ignite Rest
modules. - Fixes #1973.
Signed-off-by: shroman
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/64c55840
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/64c55840
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/64c55840
Branch: refs/heads/master
Commit: 64c558404e5d5f7aa6850fbef39b5703bb643691
Parents: 3b7e166
Author: shroman
Authored: Sat May 20 13:17:26 2017 +0900
Committer: shroman
Committed: Sat May 20 13:17:26 2017 +0900
--
modules/spark/pom.xml | 6 --
parent/pom.xml| 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/64c55840/modules/spark/pom.xml
--
diff --git a/modules/spark/pom.xml b/modules/spark/pom.xml
index 86ed9f6..51241ac 100644
--- a/modules/spark/pom.xml
+++ b/modules/spark/pom.xml
@@ -93,12 +93,6 @@
com.fasterxml.jackson.core
-jackson-core
-${jackson2.version}
-
-
-
-com.fasterxml.jackson.core
jackson-annotations
${jackson2.version}
http://git-wip-us.apache.org/repos/asf/ignite/blob/64c55840/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 12ff70a..88d4da8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -75,7 +75,7 @@
4.5.1
4.4.3
1.9.13
-2.8.8
+2.6.5
1.0.0_1
1.0.0
13.0
ignite git commit: ignite-5075
Repository: ignite
Updated Branches:
refs/heads/ignite-5075 ea0fef746 -> b5eab9692
ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5eab969
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5eab969
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5eab969
Branch: refs/heads/ignite-5075
Commit: b5eab9692188a287b22da8db5da5e9ba06b10f7a
Parents: ea0fef7
Author: sboikov
Authored: Fri May 19 16:41:48 2017 +0300
Committer: sboikov
Committed: Fri May 19 16:41:48 2017 +0300
--
.../processors/cache/CacheGroupInfrastructure.java | 5 +
.../cache/distributed/dht/GridDhtLocalPartition.java| 12
2 files changed, 17 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5eab969/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
index 1fc548e..81c0ae0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
@@ -780,4 +780,9 @@ public class CacheGroupInfrastructure {
preldr.onReconnected();
}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return "CacheGroupInfrastructure [grp=" + cacheOrGroupName() + ']';
+}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5eab969/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index bbb3cc5..b758610 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -109,9 +109,11 @@ public class GridDhtLocalPartition extends
GridCacheConcurrentMapImpl implements
private final GridFutureAdapter rent;
/** */
+@GridToStringExclude
private final GridCacheSharedContext ctx;
/** */
+@GridToStringExclude
private final CacheGroupInfrastructure grp;
/** Create time. */
@@ -119,30 +121,39 @@ public class GridDhtLocalPartition extends
GridCacheConcurrentMapImpl implements
private final long createTime = U.currentTimeMillis();
/** Eviction history. */
+@GridToStringExclude
private volatile Map evictHist = new
HashMap<>();
/** Lock. */
+@GridToStringExclude
private final ReentrantLock lock = new ReentrantLock();
/** */
+@GridToStringExclude
private final ConcurrentMap> cachesEntryMaps;
/** */
+@GridToStringExclude
private final ConcurrentMap cacheSizes;
/** */
+@GridToStringExclude
private final ConcurrentMap
singleCacheEntryMap;
/** Remove queue. */
+@GridToStringExclude
private final ConcurrentLinkedDeque8 rmvQueue = new
ConcurrentLinkedDeque8<>();
/** Group reservations. */
+@GridToStringExclude
private final CopyOnWriteArrayList
reservations = new CopyOnWriteArrayList<>();
/** */
+@GridToStringExclude
private final CacheDataStore store;
/** Partition updates. */
+@GridToStringExclude
private final ConcurrentNavigableMap updates = new
ConcurrentSkipListMap<>();
/** Last applied update. */
@@ -1103,6 +1114,7 @@ public class GridDhtLocalPartition extends
GridCacheConcurrentMapImpl implements
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridDhtLocalPartition.class, this,
+"grp", grp.cacheOrGroupName(),
"state", state(),
"reservations", reservations(),
"empty", isEmpty(),
ignite git commit: ignite-5075
Repository: ignite
Updated Branches:
refs/heads/ignite-5075 7c137ac05 -> ea0fef746
ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea0fef74
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea0fef74
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea0fef74
Branch: refs/heads/ignite-5075
Commit: ea0fef746a3fa98595fe1a514a9cf38cde854e22
Parents: 7c137ac
Author: sboikov
Authored: Fri May 19 14:17:35 2017 +0300
Committer: sboikov
Committed: Fri May 19 14:17:35 2017 +0300
--
.../cache/distributed/GridDistributedTxRemoteAdapter.java | 2 ++
.../internal/processors/cache/transactions/IgniteTxAdapter.java | 2 +-
.../processors/cache/transactions/IgniteTxLocalAdapter.java | 2 ++
.../org/apache/ignite/yardstick/cache/load/model/ModelUtil.java | 3 +++
4 files changed, 8 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fef74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index 9cb04d4..299fcf3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -594,6 +594,8 @@ public abstract class GridDistributedTxRemoteAdapter
extends IgniteTxAdapter
dhtVer,
txEntry.updateCounter());
else {
+assert val != null :
txEntry;
+
cached.innerSet(this,
eventNodeId(),
nodeId,
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fef74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 5cba0cf..96af425 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -1480,7 +1480,7 @@ public abstract class IgniteTxAdapter extends
GridMetadataAwareAdapter implement
if (modified)
cacheVal =
cacheCtx.toCacheObject(cacheCtx.unwrapTemporary(val));
-GridCacheOperation op = modified ? (val == null ? DELETE : UPDATE)
: NOOP;
+GridCacheOperation op = modified ? (cacheVal == null ? DELETE :
UPDATE) : NOOP;
if (op == NOOP) {
ExpiryPolicy expiry = cacheCtx.expiryForTxEntry(txEntry);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea0fef74/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 5a708d7..52a0f56 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -660,6 +660,8 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter implements Ig
txEntry.updateCounter(;
if (op == CREATE || op == UPDATE) {
+assert val != null : txEntry;
+
GridCacheUpdateTxResult updRes =
cached.innerSet(
this,
eventNodeId(),
http://git-wip-us.apache.org/repos/asf/i
ignite git commit: ignite-5075
Repository: ignite
Updated Branches:
refs/heads/ignite-5075 7a6c27e49 -> 7c137ac05
ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c137ac0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c137ac0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c137ac0
Branch: refs/heads/ignite-5075
Commit: 7c137ac0578f8068b355e415a3eafcc7f16f81b6
Parents: 7a6c27e
Author: sboikov
Authored: Fri May 19 13:23:50 2017 +0300
Committer: sboikov
Committed: Fri May 19 13:23:50 2017 +0300
--
.../processors/cache/ClusterCachesInfo.java | 25 +++-
1 file changed, 14 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c137ac0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index eb8aa91..708b8f6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -1060,22 +1060,23 @@ class ClusterCachesInfo {
CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"cacheMode", "Cache mode",
cfg.getCacheMode(), startCfg.getCacheMode(), true);
-CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"rebalanceMode", "Rebalance mode",
-cfg.getRebalanceMode(), startCfg.getRebalanceMode(), true);
-
CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"affinity", "Affinity function",
attr1.cacheAffinityClassName(), attr2.cacheAffinityClassName(),
true);
CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"nodeFilter", "Node filter",
attr1.nodeFilterClassName(), attr2.nodeFilterClassName(), true);
-if (cfg.getCacheMode() == PARTITIONED) {
-CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"backups", "Backups",
-cfg.getBackups(), startCfg.getBackups(), true);
-}
-
CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"memoryPolicyName", "Memory policy",
-cfg.getCacheMode(), startCfg.getCacheMode(), true);
+cfg.getMemoryPolicyName(), startCfg.getMemoryPolicyName(), true);
+
+CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"topologyValidator", "Topology validator",
+attr1.topologyValidatorClassName(),
attr2.topologyValidatorClassName(), true);
+
+CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"partitionLossPolicy", "Partition Loss Policy",
+cfg.getPartitionLossPolicy(), startCfg.getPartitionLossPolicy(),
true);
+
+CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"rebalanceMode", "Rebalance mode",
+cfg.getRebalanceMode(), startCfg.getRebalanceMode(), true);
CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"rebalanceDelay", "Rebalance delay",
cfg.getRebalanceDelay(), startCfg.getRebalanceDelay(), false);
@@ -1083,8 +1084,10 @@ class ClusterCachesInfo {
CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"rebalanceOrder", "Rebalance order",
cfg.getRebalanceOrder(), startCfg.getRebalanceOrder(), false);
-CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"partitionLossPolicy", "Partition Loss Policy",
-cfg.getPartitionLossPolicy(), startCfg.getPartitionLossPolicy(),
true);
+if (cfg.getCacheMode() == PARTITIONED) {
+CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg,
"backups", "Backups",
+cfg.getBackups(), startCfg.getBackups(), true);
+}
}
/**
ignite git commit: ignite-5075
Repository: ignite
Updated Branches:
refs/heads/ignite-5075 e65697d29 -> 7a6c27e49
ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a6c27e4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a6c27e4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a6c27e4
Branch: refs/heads/ignite-5075
Commit: 7a6c27e49cc76c88e77aa8754e7b8112e3607c53
Parents: e65697d
Author: sboikov
Authored: Fri May 19 13:06:04 2017 +0300
Committer: sboikov
Committed: Fri May 19 13:06:04 2017 +0300
--
.../apache/ignite/internal/processors/cache/GridCacheMapEntry.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/7a6c27e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 35d9f1b..1ff10e5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -3221,7 +3221,7 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
* @param oldRow Old row if available.
* @throws IgniteCheckedException If update failed.
*/
-protected void storeValue(@Nullable CacheObject val,
+protected void storeValue(CacheObject val,
long expireTime,
GridCacheVersion ver,
@Nullable CacheDataRow oldRow) throws IgniteCheckedException {
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-5075-test1 [deleted] ef48f8653
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/master-backup-3477 [deleted] b99c1980d
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477-putdown [deleted] 121af5ce5
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477-offheap-cmp [deleted] e02bf968c
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477-no-wlock [deleted] ca035ca61
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477-idx [deleted] 225218e88
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477-gc-pressure [deleted] f894f563e
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477-master [deleted] 922b2582d
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477-compact2 [deleted] e6236f005
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477-debug [deleted] 6be762fda
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-3477 [deleted] 31dea2364
[ignite] Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-5054-splitter-2 [deleted] 1455e5327
ignite git commit: ignite-5075
Repository: ignite
Updated Branches:
refs/heads/ignite-5075 84b56f505 -> e65697d29
ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e65697d2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e65697d2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e65697d2
Branch: refs/heads/ignite-5075
Commit: e65697d290132fccef3b982fd436b4ffb3b7ac0a
Parents: 84b56f5
Author: sboikov
Authored: Fri May 19 11:57:14 2017 +0300
Committer: sboikov
Committed: Fri May 19 12:16:42 2017 +0300
--
.../affinity/GridAffinityProcessor.java | 2 +-
.../processors/affinity/GridAffinityUtils.java | 2 +-
.../cache/CacheGroupInfrastructure.java | 25 ++
.../processors/cache/ClusterCachesInfo.java | 5 ++-
.../cache/GridCacheAffinityManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java| 36 +++-
.../cache/affinity/GridCacheAffinityImpl.java | 7 +---
.../dht/GridDhtPartitionTopologyImpl.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java| 8 ++---
...niteTopologyValidatorGridSplitCacheTest.java | 8 -
10 files changed, 73 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e65697d2/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
index e57cf54..b137d29 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java
@@ -395,7 +395,7 @@ public class GridAffinityProcessor extends
GridProcessorAdapter {
new GridAffinityAssignment(topVer, assign0.assignment(),
assign0.idealAssignment());
AffinityInfo info = new AffinityInfo(
-cctx.config().getAffinity(),
+cctx.group().config().getAffinity(),
cctx.config().getAffinityMapper(),
assign,
cctx.cacheObjectContext());
http://git-wip-us.apache.org/repos/asf/ignite/blob/e65697d2/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
index abd5292..35fe965 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityUtils.java
@@ -187,7 +187,7 @@ class GridAffinityUtils {
new GridAffinityAssignment(topVer, assign0.assignment(),
assign0.idealAssignment());
return F.t(
-affinityMessage(ctx, cctx.config().getAffinity()),
+affinityMessage(ctx, cctx.group().affinityFunction()),
affinityMessage(ctx, cctx.config().getAffinityMapper()),
assign);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e65697d2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
index 1e28144..1fc548e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
@@ -18,13 +18,17 @@
package org.apache.ignite.internal.processors.cache;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cache.affinity.AffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataPageEvictionMode;
+import org.apache.ignite.configuration.TopologyValidator;
import org.apache.ignite.eve
ignite git commit: IGNITE-5244 Added web agent download button.
Repository: ignite
Updated Branches:
refs/heads/master 8dee53492 -> 3b7e16628
IGNITE-5244 Added web agent download button.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3b7e1662
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b7e1662
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b7e1662
Branch: refs/heads/master
Commit: 3b7e1662820f4cdaec8db7a8206295ca9dd45668
Parents: 8dee534
Author: Ilya Borisov
Authored: Fri May 19 15:58:26 2017 +0700
Committer: Andrey Novikov
Committed: Fri May 19 15:58:26 2017 +0700
--
.../components/web-console-header/component.js | 19 +--
.../components/web-console-header/style.scss| 36 ++--
.../components/web-console-header/template.pug | 11 +-
.../frontend/app/primitives/btn/index.scss | 11 --
.../frontend/gulpfile.babel.js/paths.js | 1 +
.../frontend/public/images/icons/download.svg | 2 ++
.../frontend/public/images/icons/index.js | 1 +
.../frontend/public/stylesheets/variables.scss | 1 +
8 files changed, 74 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/3b7e1662/modules/web-console/frontend/app/components/web-console-header/component.js
--
diff --git
a/modules/web-console/frontend/app/components/web-console-header/component.js
b/modules/web-console/frontend/app/components/web-console-header/component.js
index 35d9be2..339ec46 100644
---
a/modules/web-console/frontend/app/components/web-console-header/component.js
+++
b/modules/web-console/frontend/app/components/web-console-header/component.js
@@ -21,10 +21,23 @@ import './style.scss';
export default {
template,
controller: class {
-static $inject = ['$rootScope', 'IgniteBranding'];
+static $inject = ['$scope', '$state', 'IgniteBranding'];
-constructor($rootScope, branding) {
-Object.assign(this, {$rootScope, branding});
+static webAgentDownloadVisibleStates = [
+'base.configuration',
+'base.sql',
+'base.settings'
+];
+
+constructor($scope, $state, branding) {
+Object.assign(this, {$scope, $state, branding});
+}
+
+$onInit() {
+this.$scope.$on('$stateChangeSuccess', () => {
+this.isWebAgentDownloadVisible =
+
this.constructor.webAgentDownloadVisibleStates.some((state) =>
this.$state.includes(state));
+});
}
},
transclude: {
http://git-wip-us.apache.org/repos/asf/ignite/blob/3b7e1662/modules/web-console/frontend/app/components/web-console-header/style.scss
--
diff --git
a/modules/web-console/frontend/app/components/web-console-header/style.scss
b/modules/web-console/frontend/app/components/web-console-header/style.scss
index 35f4d28..00ef141 100644
--- a/modules/web-console/frontend/app/components/web-console-header/style.scss
+++ b/modules/web-console/frontend/app/components/web-console-header/style.scss
@@ -19,13 +19,27 @@ web-console-header {
@import "./../../../public/stylesheets/variables.scss";
$nav-item-margin: 42px;
+$bottom-border-width: 4px;
display: block;
font-family: Roboto;
font-size: 16px;
-border-bottom: 4px solid red;
+border-bottom: $bottom-border-width solid red;
background: white;
-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.1);
+position: relative;
+
+&:after {
+// Shows header shadow over absoluteley positioned child content,
+// otherwise z ordering issues happen.
+display: block;
+width: 100%;
+content: '';
+height: 20px;
+position: absolute;
+overflow: hidden;
+box-shadow: 0 4px 4px -2px rgba(0, 0, 0, 0.3);
+bottom: -4px;
+}
.wch-slot {
&>* {
@@ -51,6 +65,7 @@ web-console-header {
flex-wrap: wrap;
align-items: center;
padding: 18.5px 0;
+position: relative;
}
.wch-logo {
@@ -123,4 +138,21 @@ web-console-header {
border-top: 1px solid darken($brand-warning, 15%);
}
}
+
+.wch-web-agent-download {
+border-bottom-right-radius: $ignite-button-border-radius;
+border-bottom-left-radius: $ignite-button-border-radius;
+position: absolute;
+top: 100%;
+right: 0;
+margin-top: $bottom-border-width;
+// If defined on button, shadow would conflict with already present
+// shadows of .btn-ignite, so we shadow wrapper instead.
+box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.3);
+
+.btn-ignite--primary {
+bord
[2/2] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84b56f50 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84b56f50 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84b56f50 Branch: refs/heads/ignite-5075 Commit: 84b56f505da7b28cfd85ec4e6721c6bf63278fad Parents: 4841b55 8dee534 Author: sboikov Authored: Fri May 19 11:28:37 2017 +0300 Committer: sboikov Committed: Fri May 19 11:28:37 2017 +0300 -- .../rendezvous/RendezvousAffinityFunction.java | 20 ++-- 1 file changed, 2 insertions(+), 18 deletions(-) --
[1/2] ignite git commit: Changed RendezvousAffinityFunction Externalizable->Serializable, also affinityBackupFilter was not serialized.
Repository: ignite
Updated Branches:
refs/heads/ignite-5075 4841b5587 -> 84b56f505
Changed RendezvousAffinityFunction Externalizable->Serializable, also
affinityBackupFilter was not serialized.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8dee5349
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8dee5349
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8dee5349
Branch: refs/heads/ignite-5075
Commit: 8dee534924a33c9227ce7327a6dea4b1bcefad25
Parents: 9e88f97
Author: sboikov
Authored: Fri May 19 11:27:13 2017 +0300
Committer: sboikov
Committed: Fri May 19 11:27:13 2017 +0300
--
.../rendezvous/RendezvousAffinityFunction.java | 20 ++--
1 file changed, 2 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/8dee5349/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
index 0be9878..f673e9c 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
@@ -69,7 +69,7 @@ import org.jetbrains.annotations.Nullable;
*
* Cache affinity can be configured for individual caches via {@link
CacheConfiguration#getAffinity()} method.
*/
-public class RendezvousAffinityFunction implements AffinityFunction,
Externalizable {
+public class RendezvousAffinityFunction implements AffinityFunction,
Serializable {
/** */
private static final long serialVersionUID = 0L;
@@ -83,7 +83,7 @@ public class RendezvousAffinityFunction implements
AffinityFunction, Externaliza
private int parts;
/** Mask to use in calculation when partitions count is power of 2. */
-private transient int mask = -1;
+private int mask = -1;
/** Exclude neighbors flag. */
private boolean exclNeighbors;
@@ -501,22 +501,6 @@ public class RendezvousAffinityFunction implements
AffinityFunction, Externaliza
// No-op.
}
-/** {@inheritDoc} */
-@Override public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(parts);
-out.writeBoolean(exclNeighbors);
-out.writeObject(backupFilter);
-}
-
-/** {@inheritDoc} */
-@SuppressWarnings("unchecked")
-@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
-setPartitions(in.readInt());
-
-exclNeighbors = in.readBoolean();
-backupFilter = (IgniteBiPredicate)in.readObject();
-}
-
/**
*
*/
ignite git commit: Changed RendezvousAffinityFunction Externalizable->Serializable, also affinityBackupFilter was not serialized.
Repository: ignite
Updated Branches:
refs/heads/master 9e88f979b -> 8dee53492
Changed RendezvousAffinityFunction Externalizable->Serializable, also
affinityBackupFilter was not serialized.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8dee5349
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8dee5349
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8dee5349
Branch: refs/heads/master
Commit: 8dee534924a33c9227ce7327a6dea4b1bcefad25
Parents: 9e88f97
Author: sboikov
Authored: Fri May 19 11:27:13 2017 +0300
Committer: sboikov
Committed: Fri May 19 11:27:13 2017 +0300
--
.../rendezvous/RendezvousAffinityFunction.java | 20 ++--
1 file changed, 2 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/8dee5349/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
index 0be9878..f673e9c 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
@@ -69,7 +69,7 @@ import org.jetbrains.annotations.Nullable;
*
* Cache affinity can be configured for individual caches via {@link
CacheConfiguration#getAffinity()} method.
*/
-public class RendezvousAffinityFunction implements AffinityFunction,
Externalizable {
+public class RendezvousAffinityFunction implements AffinityFunction,
Serializable {
/** */
private static final long serialVersionUID = 0L;
@@ -83,7 +83,7 @@ public class RendezvousAffinityFunction implements
AffinityFunction, Externaliza
private int parts;
/** Mask to use in calculation when partitions count is power of 2. */
-private transient int mask = -1;
+private int mask = -1;
/** Exclude neighbors flag. */
private boolean exclNeighbors;
@@ -501,22 +501,6 @@ public class RendezvousAffinityFunction implements
AffinityFunction, Externaliza
// No-op.
}
-/** {@inheritDoc} */
-@Override public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(parts);
-out.writeBoolean(exclNeighbors);
-out.writeObject(backupFilter);
-}
-
-/** {@inheritDoc} */
-@SuppressWarnings("unchecked")
-@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
-setPartitions(in.readInt());
-
-exclNeighbors = in.readBoolean();
-backupFilter = (IgniteBiPredicate)in.readObject();
-}
-
/**
*
*/
[1/9] ignite git commit: IGNITE-4842 Now containsKey() respects isReadFromBackup() flag.
Repository: ignite
Updated Branches:
refs/heads/ignite-5075 e88450df1 -> 4841b5587
IGNITE-4842 Now containsKey() respects isReadFromBackup() flag.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d84fd29d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d84fd29d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d84fd29d
Branch: refs/heads/ignite-5075
Commit: d84fd29d924ea1f81ce2bfdb7f8e42c7b85b4c05
Parents: 6be8d97
Author: dkarachentsev
Authored: Thu May 18 19:11:08 2017 +0300
Committer: dkarachentsev
Committed: Thu May 18 19:11:08 2017 +0300
--
.../processors/cache/GridCacheAdapter.java | 4 +-
.../cache/IgniteCacheContainsKeyAtomicTest.java | 103 +++
.../testsuites/IgniteCacheTestSuite4.java | 3 +
3 files changed, 108 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d84fd29d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 2820bb7..307c5cf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -635,7 +635,7 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache implements
IgniteInternalCachehttp://git-wip-us.apache.org/repos/asf/ignite/blob/d84fd29d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAtomicTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAtomicTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAtomicTest.java
new file mode 100644
index 000..981d245
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheContainsKeyAtomicTest.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import java.util.Collections;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.testframework.GridTestUtils;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
+import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
+
+/**
+ * Verifies that containsKey() works as expected on atomic cache.
+ */
+public class IgniteCacheContainsKeyAtomicTest extends
GridCacheAbstractSelfTest {
+/** Cache name. */
+public static final String CACHE_NAME = "replicated";
+
+/** {@inheritDoc} */
+@Override protected int gridCount() {
+return 4;
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+super.afterTest();
+
+IgniteCache cache = ignite(0).cache(CACHE_NAME);
+
+if (cache != null)
+cache.clear();
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testContainsPutIfAbsent() throws Exception {
+checkPutIfAbsent(false);
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testContainsPutIfAbsentAll() throws Exception {
+checkPutIfAbsent(true);
+}
+
+/**
+ * @param all Check for set of keys.
+ * @throws Exception If failed.
+ */
+private void checkPutIfAbsent(final boolean all) throws Exception {
+Ignite srv = ignite(0);
+
+final IgniteCache cache1 =
srv.getOrCre
[5/9] ignite git commit: Added Affinity topology version and Pending exchanges to Visor data collector task.
Added Affinity topology version and Pending exchanges to Visor data collector
task.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7402ea11
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7402ea11
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7402ea11
Branch: refs/heads/ignite-5075
Commit: 7402ea11051eb328702ca85d12477accfd22337c
Parents: 86465f5
Author: Alexey Kuznetsov
Authored: Fri May 19 14:18:23 2017 +0700
Committer: Alexey Kuznetsov
Committed: Fri May 19 14:18:23 2017 +0700
--
.../node/VisorAffinityTopologyVersion.java | 87
.../visor/node/VisorNodeDataCollectorJob.java | 6 ++
.../node/VisorNodeDataCollectorJobResult.java | 38 +
.../visor/node/VisorNodeDataCollectorTask.java | 4 +
.../node/VisorNodeDataCollectorTaskResult.java | 28 ++-
5 files changed, 162 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/7402ea11/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAffinityTopologyVersion.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAffinityTopologyVersion.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAffinityTopologyVersion.java
new file mode 100644
index 000..83b2fb1
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAffinityTopologyVersion.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.visor.node;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorDataTransferObject;
+
+/**
+ * Data transfer object for {@link AffinityTopologyVersion}
+ */
+public class VisorAffinityTopologyVersion extends VisorDataTransferObject {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** */
+private long topVer;
+
+/** */
+private int minorTopVer;
+
+/**
+ * Default constructor.
+ */
+public VisorAffinityTopologyVersion() {
+// No-op.
+}
+
+/**
+ * Create data transfer object for affinity topology version.
+ *
+ * @param affTopVer Affinity topology version.
+ */
+public VisorAffinityTopologyVersion(AffinityTopologyVersion affTopVer) {
+topVer = affTopVer.topologyVersion();
+minorTopVer = affTopVer.minorTopologyVersion();
+}
+
+/**
+ * @return Topology version.
+ */
+public long getTopologyVersion() {
+return topVer;
+}
+
+/**
+ * @return Minor topology version.
+ */
+public int getMinorTopologyVersion() {
+return minorTopVer;
+}
+
+/** {@inheritDoc} */
+@Override protected void writeExternalData(ObjectOutput out) throws
IOException {
+out.writeLong(topVer);
+out.writeInt(minorTopVer);
+}
+
+/** {@inheritDoc} */
+@Override protected void readExternalData(byte protoVer, ObjectInput in)
throws IOException, ClassNotFoundException {
+topVer = in.readLong();
+minorTopVer = in.readInt();
+}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return S.toString(VisorAffinityTopologyVersion.class, this);
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7402ea11/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index 125e219..573cc83 100644
---
a/modules/core/src/main/java/org/apache/ignite/i
[8/9] ignite git commit: Fixed validator suite name.
Fixed validator suite name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e88f979
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e88f979
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e88f979
Branch: refs/heads/ignite-5075
Commit: 9e88f979b20acd851ceea58d67182ee06d60
Parents: 9193c58
Author: sboikov
Authored: Fri May 19 10:36:12 2017 +0300
Committer: sboikov
Committed: Fri May 19 10:36:12 2017 +0300
--
.../ignite/configuration/TopologyValidator.java | 10 ++--
.../testsuites/IgniteCacheTestSuite3.java | 2 +-
.../IgniteTopologyValidatorTestSuit.java| 44 -
.../IgniteTopologyValidatorTestSuite.java | 50
4 files changed, 56 insertions(+), 50 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
index abd69be..320be10 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
@@ -17,12 +17,11 @@
package org.apache.ignite.configuration;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.cluster.ClusterNode;
-
-import javax.cache.CacheException;
import java.io.Serializable;
import java.util.Collection;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
/**
* Topology validator is used to verify that cluster topology is valid for
further cache operations.
@@ -57,8 +56,9 @@ import java.util.Collection;
public interface TopologyValidator extends Serializable {
/**
* Validates topology.
+ *
* @param nodes Collection of nodes.
* @return {@code true} in case topology is valid for specific cache,
otherwise {@code false}
*/
-boolean validate(Collection nodes);
+public boolean validate(Collection nodes);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index d0b74d6..222ac30 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -180,7 +180,7 @@ public class IgniteCacheTestSuite3 extends TestSuite {
suite.addTest(IgniteCacheMetricsSelfTestSuite.suite());
// Topology validator.
-suite.addTest(IgniteTopologyValidatorTestSuit.suite());
+suite.addTest(IgniteTopologyValidatorTestSuite.suite());
// Eviction.
suite.addTest(IgniteCacheEvictionSelfTestSuite.suite());
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
deleted file mode 100644
index 8c4cd11..000
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testsuites;
-
-import junit.framework.*;
-
[4/9] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/214263ec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/214263ec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/214263ec Branch: refs/heads/ignite-5075 Commit: 214263ec55213a5073fb2ab034f588a5e51381f4 Parents: e88450d 86465f5 Author: sboikov Authored: Fri May 19 09:51:42 2017 +0300 Committer: sboikov Committed: Fri May 19 09:51:42 2017 +0300 -- .../processors/cache/GridCacheAdapter.java | 4 +- .../cache/GridCacheSharedContext.java | 17 ++- .../GridDhtPartitionsExchangeFuture.java| 6 ++ .../cache/IgniteCacheContainsKeyAtomicTest.java | 103 +++ .../testsuites/IgniteCacheTestSuite4.java | 3 + .../frontend/app/primitives/dropdown/index.pug | 2 +- 6 files changed, 131 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/214263ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/214263ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/214263ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java --
[9/9] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4841b558 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4841b558 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4841b558 Branch: refs/heads/ignite-5075 Commit: 4841b5587ce7cb3b76e7c9541c9ac106d6b1c2d8 Parents: 214263e 9e88f97 Author: sboikov Authored: Fri May 19 10:36:43 2017 +0300 Committer: sboikov Committed: Fri May 19 10:36:43 2017 +0300 -- .../ignite/configuration/TopologyValidator.java | 10 +-- .../processors/cache/ClusterCachesInfo.java | 14 +++- .../node/VisorAffinityTopologyVersion.java | 87 .../visor/node/VisorNodeDataCollectorJob.java | 6 ++ .../node/VisorNodeDataCollectorJobResult.java | 38 + .../visor/node/VisorNodeDataCollectorTask.java | 4 + .../node/VisorNodeDataCollectorTaskResult.java | 28 ++- .../processors/cache/CacheGetFromJobTest.java | 5 ++ .../testsuites/IgniteCacheTestSuite3.java | 2 +- .../IgniteTopologyValidatorTestSuit.java| 44 -- .../IgniteTopologyValidatorTestSuite.java | 50 +++ 11 files changed, 235 insertions(+), 53 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4841b558/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4841b558/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java --
[2/9] ignite git commit: master - Improve internal javadoc
master - Improve internal javadoc
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a20fe961
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a20fe961
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a20fe961
Branch: refs/heads/ignite-5075
Commit: a20fe961e90c1f9b43f0a0771b3ef33b795e4006
Parents: d84fd29
Author: Alexey Goncharuk
Authored: Thu May 18 20:54:17 2017 +0300
Committer: Alexey Goncharuk
Committed: Thu May 18 20:54:17 2017 +0300
--
.../processors/cache/GridCacheSharedContext.java | 17 -
.../preloader/GridDhtPartitionsExchangeFuture.java | 6 ++
2 files changed, 22 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a20fe961/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 55f3c42..1df74ef 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -41,6 +41,9 @@ import
org.apache.ignite.internal.pagemem.store.IgnitePageStoreManager;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import
org.apache.ignite.internal.processors.cache.database.IgniteCacheDatabaseSharedManager;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionExchangeId;
+import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
import org.apache.ignite.internal.processors.cache.jta.CacheJtaManagerAdapter;
import org.apache.ignite.internal.processors.cache.store.CacheStoreManager;
@@ -714,7 +717,19 @@ public class GridCacheSharedContext {
}
/**
- * Waits for partition locks and transactions release.
+ * Captures all ongoing operations that we need to wait before we can
proceed to the next topology version.
+ * This method must be called only after
+ * {@link
GridDhtPartitionTopology#updateTopologyVersion(GridDhtPartitionExchangeId,
GridDhtPartitionsExchangeFuture, long, boolean)}
+ * method is called so that all new updates will wait to switch to the new
version.
+ * This method will capture:
+ *
+ * All non-released cache locks
+ * All non-committed transactions (local and remote)
+ * All pending atomic updates
+ * All pending DataStreamer updates
+ *
+ *
+ * Captured updates are wrapped in a future that will be completed once
pending objects are released.
*
* @param topVer Topology version.
* @return {@code true} if waiting was successful.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a20fe961/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index b4cb3c1..544f847 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -837,6 +837,12 @@ public class GridDhtPartitionsExchangeFuture extends
GridFutureAdapter
[7/9] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9193c58b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9193c58b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9193c58b Branch: refs/heads/ignite-5075 Commit: 9193c58b6b3c9c5ab794a2523afa0121d41b0a1d Parents: d9a30e8 7402ea1 Author: sboikov Authored: Fri May 19 10:27:50 2017 +0300 Committer: sboikov Committed: Fri May 19 10:27:50 2017 +0300 -- .../node/VisorAffinityTopologyVersion.java | 87 .../visor/node/VisorNodeDataCollectorJob.java | 6 ++ .../node/VisorNodeDataCollectorJobResult.java | 38 + .../visor/node/VisorNodeDataCollectorTask.java | 4 + .../node/VisorNodeDataCollectorTaskResult.java | 28 ++- 5 files changed, 162 insertions(+), 1 deletion(-) --
[3/9] ignite git commit: IGNITE-5230 Fixed dropdown trigger.
IGNITE-5230 Fixed dropdown trigger. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/86465f58 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/86465f58 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/86465f58 Branch: refs/heads/ignite-5075 Commit: 86465f585d82c1eec3466b8af3d648ec57040de2 Parents: a20fe96 Author: Andrey Novikov Authored: Fri May 19 09:19:14 2017 +0700 Committer: Andrey Novikov Committed: Fri May 19 09:19:14 2017 +0700 -- modules/web-console/frontend/app/primitives/dropdown/index.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/86465f58/modules/web-console/frontend/app/primitives/dropdown/index.pug -- diff --git a/modules/web-console/frontend/app/primitives/dropdown/index.pug b/modules/web-console/frontend/app/primitives/dropdown/index.pug index 76fe2ed..7015433 100644 --- a/modules/web-console/frontend/app/primitives/dropdown/index.pug +++ b/modules/web-console/frontend/app/primitives/dropdown/index.pug @@ -24,7 +24,7 @@ mixin ignite-form-field-bsdropdown(label, model, name, disabled, required, optio bs-dropdown='' -data-trigger='hover focus click' +data-trigger='hover focus' data-placement='bottom-right' data-container='self' data-animation=''
[6/9] ignite git commit: Fixed CacheGetFromJobTest failure (wait for correct exchange version for cache start operation).
Fixed CacheGetFromJobTest failure (wait for correct exchange version for cache
start operation).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d9a30e8b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d9a30e8b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d9a30e8b
Branch: refs/heads/ignite-5075
Commit: d9a30e8bc285672418f800b527d0aa8e7dd3a4ff
Parents: 86465f5
Author: sboikov
Authored: Fri May 19 10:27:24 2017 +0300
Committer: sboikov
Committed: Fri May 19 10:27:24 2017 +0300
--
.../internal/processors/cache/ClusterCachesInfo.java | 14 --
.../processors/cache/CacheGetFromJobTest.java | 5 +
2 files changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9a30e8b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 28ec600..7150cf4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -350,8 +350,18 @@ class ClusterCachesInfo {
if (!needExchange && desc != null) {
if (desc.clientCacheStartVersion() != null)
waitTopVer = desc.clientCacheStartVersion();
-else
-waitTopVer = desc.startTopologyVersion();
+else {
+AffinityTopologyVersion nodeStartVer =
+new
AffinityTopologyVersion(ctx.discovery().localNode().order(), 0);
+
+if (desc.startTopologyVersion() != null)
+waitTopVer = desc.startTopologyVersion();
+else
+waitTopVer = desc.receivedFromStartVersion();
+
+if (waitTopVer == null ||
nodeStartVer.compareTo(waitTopVer) > 0)
+waitTopVer = nodeStartVer;
+}
}
}
else if (req.globalStateChange())
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9a30e8b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
index a48f342..7c9eeec 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
@@ -41,6 +41,11 @@ public class CacheGetFromJobTest extends
GridCacheAbstractSelfTest {
stopAllGrids();
}
+/** {@inheritDoc} */
+@Override protected long getTestTimeout() {
+return 5 * 60_000;
+}
+
/**
* @throws Exception If failed.
*/
ignite git commit: Fixed validator suite name.
Repository: ignite
Updated Branches:
refs/heads/master 9193c58b6 -> 9e88f979b
Fixed validator suite name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e88f979
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e88f979
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e88f979
Branch: refs/heads/master
Commit: 9e88f979b20acd851ceea58d67182ee06d60
Parents: 9193c58
Author: sboikov
Authored: Fri May 19 10:36:12 2017 +0300
Committer: sboikov
Committed: Fri May 19 10:36:12 2017 +0300
--
.../ignite/configuration/TopologyValidator.java | 10 ++--
.../testsuites/IgniteCacheTestSuite3.java | 2 +-
.../IgniteTopologyValidatorTestSuit.java| 44 -
.../IgniteTopologyValidatorTestSuite.java | 50
4 files changed, 56 insertions(+), 50 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
index abd69be..320be10 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/TopologyValidator.java
@@ -17,12 +17,11 @@
package org.apache.ignite.configuration;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.cluster.ClusterNode;
-
-import javax.cache.CacheException;
import java.io.Serializable;
import java.util.Collection;
+import javax.cache.CacheException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
/**
* Topology validator is used to verify that cluster topology is valid for
further cache operations.
@@ -57,8 +56,9 @@ import java.util.Collection;
public interface TopologyValidator extends Serializable {
/**
* Validates topology.
+ *
* @param nodes Collection of nodes.
* @return {@code true} in case topology is valid for specific cache,
otherwise {@code false}
*/
-boolean validate(Collection nodes);
+public boolean validate(Collection nodes);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
index d0b74d6..222ac30 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java
@@ -180,7 +180,7 @@ public class IgniteCacheTestSuite3 extends TestSuite {
suite.addTest(IgniteCacheMetricsSelfTestSuite.suite());
// Topology validator.
-suite.addTest(IgniteTopologyValidatorTestSuit.suite());
+suite.addTest(IgniteTopologyValidatorTestSuite.suite());
// Eviction.
suite.addTest(IgniteCacheEvictionSelfTestSuite.suite());
http://git-wip-us.apache.org/repos/asf/ignite/blob/9e88f979/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
deleted file mode 100644
index 8c4cd11..000
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuit.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
[1/2] ignite git commit: Fixed CacheGetFromJobTest failure (wait for correct exchange version for cache start operation).
Repository: ignite
Updated Branches:
refs/heads/master 7402ea110 -> 9193c58b6
Fixed CacheGetFromJobTest failure (wait for correct exchange version for cache
start operation).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d9a30e8b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d9a30e8b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d9a30e8b
Branch: refs/heads/master
Commit: d9a30e8bc285672418f800b527d0aa8e7dd3a4ff
Parents: 86465f5
Author: sboikov
Authored: Fri May 19 10:27:24 2017 +0300
Committer: sboikov
Committed: Fri May 19 10:27:24 2017 +0300
--
.../internal/processors/cache/ClusterCachesInfo.java | 14 --
.../processors/cache/CacheGetFromJobTest.java | 5 +
2 files changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9a30e8b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 28ec600..7150cf4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -350,8 +350,18 @@ class ClusterCachesInfo {
if (!needExchange && desc != null) {
if (desc.clientCacheStartVersion() != null)
waitTopVer = desc.clientCacheStartVersion();
-else
-waitTopVer = desc.startTopologyVersion();
+else {
+AffinityTopologyVersion nodeStartVer =
+new
AffinityTopologyVersion(ctx.discovery().localNode().order(), 0);
+
+if (desc.startTopologyVersion() != null)
+waitTopVer = desc.startTopologyVersion();
+else
+waitTopVer = desc.receivedFromStartVersion();
+
+if (waitTopVer == null ||
nodeStartVer.compareTo(waitTopVer) > 0)
+waitTopVer = nodeStartVer;
+}
}
}
else if (req.globalStateChange())
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9a30e8b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
index a48f342..7c9eeec 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGetFromJobTest.java
@@ -41,6 +41,11 @@ public class CacheGetFromJobTest extends
GridCacheAbstractSelfTest {
stopAllGrids();
}
+/** {@inheritDoc} */
+@Override protected long getTestTimeout() {
+return 5 * 60_000;
+}
+
/**
* @throws Exception If failed.
*/
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9193c58b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9193c58b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9193c58b Branch: refs/heads/master Commit: 9193c58b6b3c9c5ab794a2523afa0121d41b0a1d Parents: d9a30e8 7402ea1 Author: sboikov Authored: Fri May 19 10:27:50 2017 +0300 Committer: sboikov Committed: Fri May 19 10:27:50 2017 +0300 -- .../node/VisorAffinityTopologyVersion.java | 87 .../visor/node/VisorNodeDataCollectorJob.java | 6 ++ .../node/VisorNodeDataCollectorJobResult.java | 38 + .../visor/node/VisorNodeDataCollectorTask.java | 4 + .../node/VisorNodeDataCollectorTaskResult.java | 28 ++- 5 files changed, 162 insertions(+), 1 deletion(-) --
ignite git commit: Added Affinity topology version and Pending exchanges to Visor data collector task.
Repository: ignite
Updated Branches:
refs/heads/master 86465f585 -> 7402ea110
Added Affinity topology version and Pending exchanges to Visor data collector
task.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7402ea11
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7402ea11
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7402ea11
Branch: refs/heads/master
Commit: 7402ea11051eb328702ca85d12477accfd22337c
Parents: 86465f5
Author: Alexey Kuznetsov
Authored: Fri May 19 14:18:23 2017 +0700
Committer: Alexey Kuznetsov
Committed: Fri May 19 14:18:23 2017 +0700
--
.../node/VisorAffinityTopologyVersion.java | 87
.../visor/node/VisorNodeDataCollectorJob.java | 6 ++
.../node/VisorNodeDataCollectorJobResult.java | 38 +
.../visor/node/VisorNodeDataCollectorTask.java | 4 +
.../node/VisorNodeDataCollectorTaskResult.java | 28 ++-
5 files changed, 162 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/7402ea11/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAffinityTopologyVersion.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAffinityTopologyVersion.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAffinityTopologyVersion.java
new file mode 100644
index 000..83b2fb1
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAffinityTopologyVersion.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.visor.node;
+
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.VisorDataTransferObject;
+
+/**
+ * Data transfer object for {@link AffinityTopologyVersion}
+ */
+public class VisorAffinityTopologyVersion extends VisorDataTransferObject {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** */
+private long topVer;
+
+/** */
+private int minorTopVer;
+
+/**
+ * Default constructor.
+ */
+public VisorAffinityTopologyVersion() {
+// No-op.
+}
+
+/**
+ * Create data transfer object for affinity topology version.
+ *
+ * @param affTopVer Affinity topology version.
+ */
+public VisorAffinityTopologyVersion(AffinityTopologyVersion affTopVer) {
+topVer = affTopVer.topologyVersion();
+minorTopVer = affTopVer.minorTopologyVersion();
+}
+
+/**
+ * @return Topology version.
+ */
+public long getTopologyVersion() {
+return topVer;
+}
+
+/**
+ * @return Minor topology version.
+ */
+public int getMinorTopologyVersion() {
+return minorTopVer;
+}
+
+/** {@inheritDoc} */
+@Override protected void writeExternalData(ObjectOutput out) throws
IOException {
+out.writeLong(topVer);
+out.writeInt(minorTopVer);
+}
+
+/** {@inheritDoc} */
+@Override protected void readExternalData(byte protoVer, ObjectInput in)
throws IOException, ClassNotFoundException {
+topVer = in.readLong();
+minorTopVer = in.readInt();
+}
+
+/** {@inheritDoc} */
+@Override public String toString() {
+return S.toString(VisorAffinityTopologyVersion.class, this);
+}
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7402ea11/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index
