You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/11/26 13:09:26 UTC
[1/7] ignite git commit: Fixed test to stop nodes after stop.
Repository: ignite
Updated Branches:
refs/heads/ignite-1956 2c67cd0fe -> 1e023b013
Fixed test to stop nodes after stop.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be505f48
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be505f48
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be505f48
Branch: refs/heads/ignite-1956
Commit: be505f4846492cb37645349cd4d47ddc0f7e35e4
Parents: f2092e7
Author: sboikov <sb...@gridgain.com>
Authored: Thu Nov 26 12:55:28 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Nov 26 12:55:28 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/IgniteCacheSizeFailoverTest.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/be505f48/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
index 00b7c0f..1738a0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
@@ -63,6 +63,13 @@ public class IgniteCacheSizeFailoverTest extends GridCommonAbstractTest {
return cfg;
}
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
/**
* @throws Exception If failed.
*/
[5/7] ignite git commit: Simplified
GridDiscoveryManager.resolveDiscoCache (with previous code observed on TC
NoSuchElementException from Collections.min(discoCacheHist.entrySet()).
Posted by vo...@apache.org.
Simplified GridDiscoveryManager.resolveDiscoCache (with previous code observed on TC NoSuchElementException from Collections.min(discoCacheHist.entrySet()).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c3eeb6dc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c3eeb6dc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c3eeb6dc
Branch: refs/heads/ignite-1956
Commit: c3eeb6dc2ded5a22d80078b031a305b8c9f06805
Parents: e8a14da
Author: sboikov <sb...@gridgain.com>
Authored: Thu Nov 26 13:30:36 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Nov 26 13:30:36 2015 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c3eeb6dc/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 4880338..92d66d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -43,6 +43,7 @@ import java.util.UUID;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
@@ -175,14 +176,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
};
- /** Disco history entries comparator. */
- private static final Comparator<Map.Entry<AffinityTopologyVersion, DiscoCache>> histCmp =
- new Comparator<Map.Entry<AffinityTopologyVersion, DiscoCache>>() {
- @Override public int compare(Map.Entry<AffinityTopologyVersion, DiscoCache> o1, Map.Entry<AffinityTopologyVersion, DiscoCache> o2) {
- return o1.getKey().compareTo(o2.getKey());
- }
- };
-
/** Discovery event worker. */
private final DiscoveryWorker discoWrk = new DiscoveryWorker();
@@ -208,7 +201,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
private final AtomicBoolean lastSegChkRes = new AtomicBoolean(true);
/** Topology cache history. */
- private final Map<AffinityTopologyVersion, DiscoCache> discoCacheHist =
+ private final ConcurrentNavigableMap<AffinityTopologyVersion, DiscoCache> discoCacheHist =
new GridBoundedConcurrentOrderedMap<>(DISCOVERY_HISTORY_SIZE);
/** Topology snapshots history. */
@@ -1638,10 +1631,12 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
if (cache == null) {
// Find the eldest acceptable discovery cache.
- Map.Entry<AffinityTopologyVersion, DiscoCache> eldest = Collections.min(discoCacheHist.entrySet(), histCmp);
+ Map.Entry<AffinityTopologyVersion, DiscoCache> eldest = discoCacheHist.firstEntry();
- if (topVer.compareTo(eldest.getKey()) < 0)
- cache = eldest.getValue();
+ if (eldest != null) {
+ if (topVer.compareTo(eldest.getKey()) < 0)
+ cache = eldest.getValue();
+ }
}
if (cache == null) {
[7/7] ignite git commit: Merge branch 'ignite-1.5' into ignite-1956
Posted by vo...@apache.org.
Merge branch 'ignite-1.5' into ignite-1956
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e023b01
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e023b01
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e023b01
Branch: refs/heads/ignite-1956
Commit: 1e023b013041738dfe3099bd489733681e95a29e
Parents: 2c67cd0 c584cca
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Nov 26 15:09:07 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Nov 26 15:09:07 2015 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 19 +++++++------------
.../processors/cache/GridCacheIoManager.java | 2 --
.../processors/cache/GridCacheProcessor.java | 7 -------
.../dht/GridPartitionedSingleGetFuture.java | 1 -
.../distributed/IgniteCacheSizeFailoverTest.java | 7 +++++++
5 files changed, 14 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[6/7] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c584ccae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c584ccae
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c584ccae
Branch: refs/heads/ignite-1956
Commit: c584ccae974cde2221220cc5daade57844f37132
Parents: c3eeb6d dae1b87
Author: sboikov <sb...@gridgain.com>
Authored: Thu Nov 26 13:31:03 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Nov 26 13:31:03 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheIoManager.java | 2 --
.../ignite/internal/processors/cache/GridCacheProcessor.java | 7 -------
.../cache/distributed/dht/GridPartitionedSingleGetFuture.java | 1 -
3 files changed, 10 deletions(-)
----------------------------------------------------------------------
[4/7] ignite git commit: Merge branch 'ignite-1.5' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5
Posted by vo...@apache.org.
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dae1b87a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dae1b87a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dae1b87a
Branch: refs/heads/ignite-1956
Commit: dae1b87af17abd83d072beb11243976bac943b2a
Parents: 4976361 e8a14da
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Nov 26 13:25:18 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Nov 26 13:25:18 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/IgniteBinary.java | 10 +++++-----
.../main/java/org/apache/ignite/binary/BinaryObject.java | 2 +-
.../main/java/org/apache/ignite/binary/BinaryType.java | 2 +-
.../internal/processors/cache/GridCacheMessage.java | 1 +
.../processors/cache/portable/IgniteBinaryImpl.java | 9 +++++----
.../internal/processors/cacheobject/NoOpBinary.java | 8 ++++----
.../portable/BinaryObjectBuilderAdditionalSelfTest.java | 6 +++---
.../internal/portable/GridPortableMetaDataSelfTest.java | 10 +++++-----
.../cache/distributed/IgniteCacheSizeFailoverTest.java | 7 +++++++
...dCacheClientNodeBinaryObjectMetadataMultinodeTest.java | 8 ++++----
.../GridCacheClientNodeBinaryObjectMetadataTest.java | 4 ++--
.../platform/PlatformComputeBinarizableArgTask.java | 2 +-
.../Apache.Ignite.Core.Tests/Examples/ExamplesTest.cs | 5 ++++-
.../Apache.Ignite.Examples/Messaging/MessagingExample.cs | 9 +++++++--
14 files changed, 50 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[2/7] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8a14dab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8a14dab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8a14dab
Branch: refs/heads/ignite-1956
Commit: e8a14dabe0029e3ff6a4be4e49f409c73e304f9a
Parents: be505f4 e386798
Author: sboikov <sb...@gridgain.com>
Authored: Thu Nov 26 12:56:04 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Nov 26 12:56:04 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/IgniteBinary.java | 10 +++++-----
.../main/java/org/apache/ignite/binary/BinaryObject.java | 2 +-
.../main/java/org/apache/ignite/binary/BinaryType.java | 2 +-
.../processors/cache/portable/IgniteBinaryImpl.java | 9 +++++----
.../internal/processors/cacheobject/NoOpBinary.java | 8 ++++----
.../portable/BinaryObjectBuilderAdditionalSelfTest.java | 6 +++---
.../internal/portable/GridPortableMetaDataSelfTest.java | 10 +++++-----
...dCacheClientNodeBinaryObjectMetadataMultinodeTest.java | 8 ++++----
.../GridCacheClientNodeBinaryObjectMetadataTest.java | 4 ++--
.../platform/PlatformComputeBinarizableArgTask.java | 2 +-
.../Apache.Ignite.Core.Tests/Examples/ExamplesTest.cs | 5 ++++-
.../Apache.Ignite.Examples/Messaging/MessagingExample.cs | 9 +++++++--
12 files changed, 42 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[3/7] ignite git commit: Removed debug.
Posted by vo...@apache.org.
Removed debug.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49763619
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49763619
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49763619
Branch: refs/heads/ignite-1956
Commit: 49763619f9220a794d3453944a7fc8dda9ce4d44
Parents: bfb839c
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Nov 26 13:24:41 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Nov 26 13:24:41 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheIoManager.java | 2 --
.../ignite/internal/processors/cache/GridCacheProcessor.java | 7 -------
.../cache/distributed/dht/GridPartitionedSingleGetFuture.java | 1 -
3 files changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/49763619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index f7fe5bd..0f006a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -146,8 +146,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
}
if (fut != null && !fut.isDone()) {
- U.debug(log, "<> Will wait for affinity ready future [fut=" + fut + ", msg=" + msg + ']');
-
fut.listen(new CI1<IgniteInternalFuture<?>>() {
@Override public void apply(IgniteInternalFuture<?> t) {
cctx.kernalContext().closure().runLocalSafe(new Runnable() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/49763619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 6822ded..6654a15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1049,9 +1049,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cacheCtx.onStarted();
- U.debug(log, "Started cache [name=" + U.maskName(cfg.getName()) + ", deploymentId=" +
- cacheCtx.dynamicDeploymentId() + ']');
-
if (log.isInfoEnabled())
log.info("Started cache [name=" + U.maskName(cfg.getName()) + ", mode=" + cfg.getCacheMode() + ']');
}
@@ -1604,10 +1601,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (sharedCtx.cacheContext(CU.cacheId(cfg.getName())) != null)
return;
- U.debug(log, "prepare cache start [locNodeId=" + ctx.localNodeId() +
- ", initiatingNodeId=" + initiatingNodeId + ", deploymentId=" + deploymentId + ", topVer=" + topVer +
- ", name=" + cfg.getName() + ']');
-
if (affNodeStart || clientNodeStart) {
if (clientNodeStart && !affNodeStart) {
if (nearCfg != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/49763619/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index a5e5d53..2d13c2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -401,7 +401,6 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im
return null;
}
catch (GridCacheEntryRemovedException ignored) {
- U.debug(log, ">>>>>>>>> " + entry);
// No-op, will retry.
}
}