[11/19] incubator-ignite git commit: Merge branch 'ignite-1189'
Merge branch 'ignite-1189' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd844a7f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd844a7f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd844a7f Branch: refs/heads/ignite-946 Commit: cd844a7f959c79e3b5e9364ab9993f1c3d4fc91e Parents: d9acbd1 e42f954 Author: nikolay_tikhonov Authored: Mon Aug 10 13:34:03 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Aug 10 13:34:03 2015 +0300 -- .../configuration/IgniteConfiguration.java | 1 - .../dht/atomic/GridDhtAtomicCache.java | 36 ++-- 2 files changed, 26 insertions(+), 11 deletions(-) --
[03/19] incubator-ignite git commit: ignite-1189: reproducing deadlock
ignite-1189: reproducing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/efa7e99b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/efa7e99b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/efa7e99b
Branch: refs/heads/ignite-946
Commit: efa7e99bbad76ce35a55e6ad9faa9aac8e57b5f4
Parents: 6b237e1
Author: Denis Magda
Authored: Tue Aug 4 09:12:12 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 09:12:12 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 36 +++-
.../IgniteCacheAtomicNodeRestartTest.java | 43
2 files changed, 78 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efa7e99b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 0a21979..18911fd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -85,6 +85,8 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
/** */
private GridNearAtomicCache near;
+private ThreadLocal> lockedEntries = new
ThreadLocal<>();
+
/**
* Empty constructor required by {@link Externalizable}.
*/
@@ -990,6 +992,20 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
final GridNearAtomicUpdateRequest req,
final CI2
completionCb
) {
+boolean printKeys = false;
+
+if (lockedEntries.get() != null) {
+for (GridDhtCacheEntry entry : lockedEntries.get())
+U.error(log, "Locked entry [entry=" + entry + ']');
+
+printKeys = true;
+}
+
+if (printKeys) {
+for (KeyCacheObject obj : req.keys())
+U.error(log, "Key requested: " + obj);
+}
+
IgniteInternalFuture forceFut = preldr.request(req.keys(),
req.topologyVersion());
if (forceFut.isDone())
@@ -1032,10 +1048,26 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
IgniteCacheExpiryPolicy expiry = null;
try {
+boolean printKeys = false;
+
+if (lockedEntries.get() != null) {
+for (GridDhtCacheEntry entry : lockedEntries.get())
+U.error(log, "Locked entry (2) [entry=" + entry + ']');
+
+printKeys = true;
+}
+
+if (printKeys) {
+for (KeyCacheObject obj : keys)
+U.error(log, "Key requested: " + obj);
+}
+
// If batch store update is enabled, we need to lock all entries.
// First, need to acquire locks on cache entries, then check
filter.
List locked = lockEntries(keys,
req.topologyVersion());
+lockedEntries.set(locked);
+
Collection>
deleted = null;
try {
@@ -1153,8 +1185,10 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
e.printStackTrace();
}
finally {
-if (locked != null)
+if (locked != null) {
+lockedEntries.set(null);
unlockEntries(locked, req.topologyVersion());
+}
// Enqueue if necessary after locks release.
if (deleted != null) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efa7e99b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index fa8898f..70e6c4c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -31,7 +31,50 @@ public class IgniteCacheAtomicNodeRestartTest extends
GridCachePartitionedN
[02/19] incubator-ignite git commit: ignite-1189: trying to reproduce failures
ignite-1189: trying to reproduce failures
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b237e11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b237e11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b237e11
Branch: refs/heads/ignite-946
Commit: 6b237e119caad68474cc785c0373da8ce31011d8
Parents: ac6d75d
Author: Denis Magda
Authored: Mon Aug 3 14:45:40 2015 +0300
Committer: Denis Magda
Committed: Mon Aug 3 14:45:40 2015 +0300
--
.../org/apache/ignite/internal/IgnitionEx.java | 21 +---
.../IgniteCacheAtomicNodeRestartTest.java | 4
2 files changed, 9 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b237e11/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index d355085..5cbe377 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -261,11 +261,8 @@ public class IgnitionEx {
public static boolean stop(@Nullable String name, boolean cancel) {
IgniteNamedInstance grid = name != null ? grids.get(name) : dfltGrid;
-if (grid != null) {
-IgniteState state = grid.state();
-
-if (state == STARTED)
-grid.stop(cancel);
+if (grid != null && grid.state() == STARTED) {
+grid.stop(cancel);
boolean fireEvt;
@@ -280,18 +277,10 @@ public class IgnitionEx {
}
}
-if (state == STARTED) {
-if (fireEvt)
-notifyStateChange(grid.getName(), grid.state());
-
-return true;
-}
-else {
-U.warn(null, "Ignoring stopping grid instance (has not been in
STARTED state): [grid=" + name +
-", state=" + state + ']');
+if (fireEvt)
+notifyStateChange(grid.getName(), grid.state());
-return false;
-}
+return true;
}
// We don't have log at this point...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b237e11/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index 1c4e616..fa8898f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -30,4 +30,8 @@ public class IgniteCacheAtomicNodeRestartTest extends
GridCachePartitionedNodeRe
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
+
+@Override public void testRestartWithPutTenNodesTwoBackups() throws
Throwable {
+
+}
}
[14/19] incubator-ignite git commit: ignite-1222
ignite-1222
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fbda19d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fbda19d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fbda19d4
Branch: refs/heads/ignite-946
Commit: fbda19d4b530051f0ab6784379afe66be7d44c76
Parents: cd844a7
Author: Anton Vinogradov
Authored: Mon Aug 10 16:11:46 2015 +0300
Committer: Anton Vinogradov
Committed: Mon Aug 10 16:11:46 2015 +0300
--
.../cache/CacheStopAndDestroySelfTest.java | 87
1 file changed, 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fbda19d4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
index 803789e..17f0db7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java
@@ -712,93 +712,6 @@ public class CacheStopAndDestroySelfTest extends
GridCommonAbstractTest {
}
/**
- * Tests concurrent close.
- *
- * @throws Exception If failed.
- */
-public void testConcurrentCloseSetWithTry() throws Exception {
-final AtomicInteger a1 = new AtomicInteger();
-final AtomicInteger a2 = new AtomicInteger();
-final AtomicInteger a3 = new AtomicInteger();
-final AtomicInteger a4 = new AtomicInteger();
-
-Thread t1 = new Thread(new Runnable() {
-@Override public void run() {
-Thread.currentThread().setName("test-thread-1");
-
-closeWithTry(a1, 0);
-}
-});
-Thread t2 = new Thread(new Runnable() {
-@Override public void run() {
-Thread.currentThread().setName("test-thread-2");
-
-closeWithTry(a2, 0);
-}
-});
-Thread t3 = new Thread(new Runnable() {
-@Override public void run() {
-Thread.currentThread().setName("test-thread-3");
-
-closeWithTry(a3, 2);
-}
-});
-Thread t4 = new Thread(new Runnable() {
-@Override public void run() {
-Thread.currentThread().setName("test-thread-4");
-
-closeWithTry(a4, 2);
-}
-});
-
-IgniteCache cache =
grid(0).getOrCreateCache(getDhtConfig());
-
-cache.close();
-
-t1.start();
-t2.start();
-t3.start();
-t4.start();
-
-try {
-U.sleep(1000);
-}
-finally {
-stop = true;
-}
-
-t1.join();
-t2.join();
-t3.join();
-t4.join();
-
-assert a1.get() > 1;
-assert a2.get() > 1;
-assert a3.get() > 1;
-assert a4.get() > 1;
-
-checkUsageFails(cache);
-}
-
-/**
- * @param a AtomicInteger.
- * @param node Node.
- */
-public void closeWithTry(AtomicInteger a, int node) {
-while (!stop) {
-try (IgniteCache cache =
grid(node).getOrCreateCache(getDhtConfig())) {
-a.incrementAndGet();
-
-assert cache.get(KEY_VAL) == null ||
cache.get(KEY_VAL).equals(KEY_VAL);
-
-cache.put(KEY_VAL, KEY_VAL);
-
-assert cache.get(KEY_VAL).equals(KEY_VAL);
-}
-}
-}
-
-/**
* Tests start -> destroy -> start -> close using CacheManager.
*/
public void testTckStyleCreateDestroyClose() {
[15/19] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19fb305d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19fb305d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19fb305d Branch: refs/heads/ignite-946 Commit: 19fb305d5ceff430911d8dc25685686f6446ea21 Parents: fbda19d 0798e6f Author: Anton Vinogradov Authored: Mon Aug 10 16:12:53 2015 +0300 Committer: Anton Vinogradov Committed: Mon Aug 10 16:12:53 2015 +0300 -- .../cache/GridCachePartitionExchangeManager.java| 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) --
[04/19] incubator-ignite git commit: ignite-1189: 2 reproducing deadlock
ignite-1189: 2 reproducing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ce3c8b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ce3c8b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ce3c8b7
Branch: refs/heads/ignite-946
Commit: 3ce3c8b71064ff4d8abd78cd95f4678cb7a74811
Parents: efa7e99
Author: Denis Magda
Authored: Tue Aug 4 10:33:57 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 10:33:57 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 40 +++-
1 file changed, 5 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ce3c8b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 18911fd..d6163c2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -85,8 +85,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
/** */
private GridNearAtomicCache near;
-private ThreadLocal> lockedEntries = new
ThreadLocal<>();
-
/**
* Empty constructor required by {@link Externalizable}.
*/
@@ -992,20 +990,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
final GridNearAtomicUpdateRequest req,
final CI2
completionCb
) {
-boolean printKeys = false;
-
-if (lockedEntries.get() != null) {
-for (GridDhtCacheEntry entry : lockedEntries.get())
-U.error(log, "Locked entry [entry=" + entry + ']');
-
-printKeys = true;
-}
-
-if (printKeys) {
-for (KeyCacheObject obj : req.keys())
-U.error(log, "Key requested: " + obj);
-}
-
IgniteInternalFuture forceFut = preldr.request(req.keys(),
req.topologyVersion());
if (forceFut.isDone())
@@ -1048,26 +1032,10 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
IgniteCacheExpiryPolicy expiry = null;
try {
-boolean printKeys = false;
-
-if (lockedEntries.get() != null) {
-for (GridDhtCacheEntry entry : lockedEntries.get())
-U.error(log, "Locked entry (2) [entry=" + entry + ']');
-
-printKeys = true;
-}
-
-if (printKeys) {
-for (KeyCacheObject obj : keys)
-U.error(log, "Key requested: " + obj);
-}
-
// If batch store update is enabled, we need to lock all entries.
// First, need to acquire locks on cache entries, then check
filter.
List locked = lockEntries(keys,
req.topologyVersion());
-lockedEntries.set(locked);
-
Collection>
deleted = null;
try {
@@ -1184,11 +1152,13 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
e.printStackTrace();
}
+catch (Exception e) {
+if (X.hasCause(e, InterruptedException.class))
+U.error(log, "FUCK Interrupted", e);
+}
finally {
-if (locked != null) {
-lockedEntries.set(null);
+if (locked != null)
unlockEntries(locked, req.topologyVersion());
-}
// Enqueue if necessary after locks release.
if (deleted != null) {
[18/19] incubator-ignite git commit: ignite-946: simplified VersionedEntry interface
ignite-946: simplified VersionedEntry interface
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6bef13e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6bef13e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6bef13e
Branch: refs/heads/ignite-946
Commit: b6bef13eef82d9a2e040c01881d07c186ade372e
Parents: dd3cecf
Author: Denis Magda
Authored: Tue Aug 11 10:17:24 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 11 10:17:24 2015 +0300
--
.../ignite/cache/version/VersionedEntry.java| 83 +---
.../cache/version/CacheVersionedEntryImpl.java | 23 +-
.../cache/version/GridCacheVersionManager.java | 4 +-
.../CacheVersionedEntryAbstractTest.java| 9 +--
4 files changed, 45 insertions(+), 74 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6bef13e/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
index 1aac68a..135d681 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/version/VersionedEntry.java
@@ -24,7 +24,7 @@ import javax.cache.processor.*;
import java.util.*;
/**
- * Cache entry that stores entry's version related information.
+ * Cache entry that stores entry's version related information along with its
data.
*
* To get a {@code VersionedEntry} of an {@link Cache.Entry} use {@link
Cache.Entry#unwrap(Class)} by passing
* {@code VersionedEntry} class to it as the argument.
@@ -42,62 +42,51 @@ import java.util.*;
* is excluded from responses.
* Java Example
*
- * Cache cache = grid(0).cache(null);
+ * IgniteCache cache = grid(0).cache(null);
*
- * cache.invoke(100, new EntryProcessor() {
- * public Object process(MutableEntry entry, Object...
arguments) throws EntryProcessorException {
- * VersionedEntry verEntry =
entry.unwrap(VersionedEntry.class);
- * return entry;
- * }
- * });
+ * VersionedEntry entry1 = cache.invoke(100,
+ * new EntryProcessor>() {
+ * public VersionedEntry
process(MutableEntry entry,
+ * Object... arguments) throws EntryProcessorException {
+ * return entry.unwrap(VersionedEntry.class);
+ * }
+ * });
+ *
+ * // Cache entry for the given key may be updated at some point later.
+ *
+ * VersionedEntry entry2 = cache.invoke(100,
+ * new EntryProcessor>() {
+ * public VersionedEntry
process(MutableEntry entry,
+ * Object... arguments) throws EntryProcessorException {
+ * return entry.unwrap(VersionedEntry.class);
+ * }
+ * });
+ *
+ * if (entry1.version().compareTo(entry2.version()) < 0) {
+ * // the entry has been updated
+ * }
*
*/
public interface VersionedEntry extends Cache.Entry {
/**
- * Versions comparator.
- */
-public static final Comparator VER_COMP = new
Comparator() {
-@Override public int compare(VersionedEntry o1, VersionedEntry o2) {
-int res = Integer.compare(o1.topologyVersion(),
o2.topologyVersion());
-
-if (res != 0)
-return res;
-
-res = Long.compare(o1.order(), o2.order());
-
-if (res != 0)
-return res;
-
-return Integer.compare(o1.nodeOrder(), o2.nodeOrder());
-}
-};
-
-/**
- * Gets the topology version at the time when the entry with a given pair
of key and value has been created.
- *
- * @return Topology version plus number of seconds from the start time of
the first grid node.
- */
-public int topologyVersion();
-
-/**
- * Gets versioned entry unique order.
- * Each time a cache entry for a given key is updated a new {@code
VersionedEntry} with increased order is created.
- *
- * @return Versioned entry unique order.
- */
-public long order();
-
-/**
- * Gets local node order at the time when the entry with a given pair of
key and value has been created.
+ * Returns a comparable object representing the version of this cache
entry.
+ *
+ * It is valid to compare cache entries' versions for the same key. In
this case the latter update will be
+ * represented by a higher version. The result of versions comparison of
cache entries of different keys is
+ * undefined.
*
- * @return Local node order on which this version has been assigned.
+ * @return Version of
[07/19] incubator-ignite git commit: ignite-1189: fixing deadlock
ignite-1189: fixing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d528bec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d528bec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d528bec
Branch: refs/heads/ignite-946
Commit: 4d528becc1cd3db9d4d2d6db2053895043aa3918
Parents: 132562b
Author: Denis Magda
Authored: Tue Aug 4 13:04:35 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 13:04:35 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 29 +---
1 file changed, 19 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d528bec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index cd6e28d..470efdd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1176,6 +1176,12 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
catch (Exception e) {
U.error(log, "Unexpected exception during cache update", e);
+
+res.addFailedKeys(keys, e);
+
+completionCb.apply(req, res);
+
+return;
}
if (remap) {
@@ -2167,19 +2173,22 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
// Enqueue entries while holding locks.
Collection skip = null;
-for (GridCacheMapEntry entry : locked) {
-if (entry != null && entry.deleted()) {
-if (skip == null)
-skip = new HashSet<>(locked.size(), 1.0f);
+try {
+for (GridCacheMapEntry entry : locked) {
+if (entry != null && entry.deleted()) {
+if (skip == null)
+skip = new HashSet<>(locked.size(), 1.0f);
-skip.add(entry.key());
+skip.add(entry.key());
+}
}
}
-
-// Release locks.
-for (GridCacheMapEntry entry : locked) {
-if (entry != null)
-UNSAFE.monitorExit(entry);
+finally {
+// Release locks.
+for (GridCacheMapEntry entry : locked) {
+if (entry != null)
+UNSAFE.monitorExit(entry);
+}
}
// Try evict partitions.
[09/19] incubator-ignite git commit: ignite-1189: eventually fixed the deadlock
ignite-1189: eventually fixed the deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67706063
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67706063
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67706063
Branch: refs/heads/ignite-946
Commit: 67706063d2e8d8cc3ed8d55cdfffccc0a21005c6
Parents: d78e4c8
Author: Denis Magda
Authored: Tue Aug 4 13:34:19 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 13:34:19 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 6 +-
.../IgniteCacheAtomicNodeRestartTest.java | 92
2 files changed, 5 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67706063/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 470efdd..14b4680 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1175,6 +1175,8 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
remap = true;
}
catch (Exception e) {
+// At least RuntimeException can be thrown by the code above when
GridCacheContext is cleaned and there is
+// an attempt to use cleaned resources.
U.error(log, "Unexpected exception during cache update", e);
res.addFailedKeys(keys, e);
@@ -2184,7 +2186,9 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
}
finally {
-// Release locks.
+// At least RuntimeException can be thrown by the code above when
GridCacheContext is cleaned and there is
+// an attempt to use cleaned resources.
+// That's why releasing locks in the finally block..
for (GridCacheMapEntry entry : locked) {
if (entry != null)
UNSAFE.monitorExit(entry);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67706063/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index caee4d0..1c4e616 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -30,96 +30,4 @@ public class IgniteCacheAtomicNodeRestartTest extends
GridCachePartitionedNodeRe
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
-
-/** {@inheritDoc} */
-@Override public void testRestartWithPutTenNodesTwoBackups() throws
Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-
-public void testRestartWithPutTenNodesTwoBackups2() throws Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-public void testRestartWithPutTenNodesTwoBackups3() throws Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-public void testRestartWithPutTenNodesTwoBackups4() throws Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-public void testRestartWithPutTenNodesTwoBackups5() throws Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-public void testRestartWithPutTenNodesTwoBackups6() throws Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-public void testRestartWithPutTenNodesTwoBackups7() throws Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-public void testRestartWithPutTenNodesTwoBackups8() throws Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-public void testRestartWithPutTenNodesTwoBackups9() throws Throwable {
-super.testRestartWithPutTenNodesTwoBackups();
-}
-public void testRestartWithPutTenN
[01/19] incubator-ignite git commit: ignite-1189: clearing grid information on stop even when grid's state is not STARTED
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-946 c1582fc32 -> 801d6df1a
ignite-1189: clearing grid information on stop even when grid's state is not
STARTED
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac6d75dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac6d75dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac6d75dc
Branch: refs/heads/ignite-946
Commit: ac6d75dc55eab0ce909c972a1124bf5fb42a5e3d
Parents: aec9764
Author: Denis Magda
Authored: Mon Aug 3 12:44:45 2015 +0300
Committer: Denis Magda
Committed: Mon Aug 3 12:44:45 2015 +0300
--
.../org/apache/ignite/internal/IgnitionEx.java | 21 +++-
1 file changed, 16 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ac6d75dc/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 5cbe377..d355085 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -261,8 +261,11 @@ public class IgnitionEx {
public static boolean stop(@Nullable String name, boolean cancel) {
IgniteNamedInstance grid = name != null ? grids.get(name) : dfltGrid;
-if (grid != null && grid.state() == STARTED) {
-grid.stop(cancel);
+if (grid != null) {
+IgniteState state = grid.state();
+
+if (state == STARTED)
+grid.stop(cancel);
boolean fireEvt;
@@ -277,10 +280,18 @@ public class IgnitionEx {
}
}
-if (fireEvt)
-notifyStateChange(grid.getName(), grid.state());
+if (state == STARTED) {
+if (fireEvt)
+notifyStateChange(grid.getName(), grid.state());
-return true;
+return true;
+}
+else {
+U.warn(null, "Ignoring stopping grid instance (has not been in
STARTED state): [grid=" + name +
+", state=" + state + ']');
+
+return false;
+}
}
// We don't have log at this point...
[05/19] incubator-ignite git commit: ignite-1189: 3 reproducing deadlock
ignite-1189: 3 reproducing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28c9977b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28c9977b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28c9977b
Branch: refs/heads/ignite-946
Commit: 28c9977bb8344f2d73c65d45656b673a9a4c634b
Parents: 3ce3c8b
Author: Denis Magda
Authored: Tue Aug 4 11:41:48 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 11:41:48 2015 +0300
--
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28c9977b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index d6163c2..4d73fb2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1153,8 +1153,9 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
e.printStackTrace();
}
catch (Exception e) {
-if (X.hasCause(e, InterruptedException.class))
-U.error(log, "FUCK Interrupted", e);
+U.error(log, "FUCK ERROR", e);
+
+throw e;
}
finally {
if (locked != null)
[13/19] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0798e6f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0798e6f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0798e6f1 Branch: refs/heads/ignite-946 Commit: 0798e6f1764aaf3e8101383b7a8ac3d7ed9b9d2c Parents: bd770a5 cd844a7 Author: sboikov Authored: Mon Aug 10 16:08:49 2015 +0300 Committer: sboikov Committed: Mon Aug 10 16:08:49 2015 +0300 -- .../configuration/IgniteConfiguration.java | 1 - .../dht/atomic/GridDhtAtomicCache.java | 36 ++-- 2 files changed, 26 insertions(+), 11 deletions(-) --
[17/19] incubator-ignite git commit: # Fixed potential NPE in GridCachePartitionExchangeManager.dumpPendingObjects
# Fixed potential NPE in GridCachePartitionExchangeManager.dumpPendingObjects
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae11e9b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae11e9b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae11e9b5
Branch: refs/heads/ignite-946
Commit: ae11e9b5aa9af4d0d58e2a16dd3a3331969961df
Parents: 19fb305
Author: sboikov
Authored: Tue Aug 11 09:42:02 2015 +0300
Committer: sboikov
Committed: Tue Aug 11 09:42:43 2015 +0300
--
.../GridCachePartitionExchangeManager.java | 32
1 file changed, 20 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae11e9b5/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 cf49197..e00d3b7 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
@@ -984,25 +984,33 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
*
*/
public void dumpPendingObjects() {
-U.warn(log, "Pending transactions:");
+IgniteTxManager tm = cctx.tm();
-for (IgniteInternalTx tx : cctx.tm().activeTransactions())
-U.warn(log, ">>> " + tx);
+if (tm != null) {
+U.warn(log, "Pending transactions:");
-U.warn(log, "Pending explicit locks:");
+for (IgniteInternalTx tx : tm.activeTransactions())
+U.warn(log, ">>> " + tx);
+}
-for (GridCacheExplicitLockSpan lockSpan :
cctx.mvcc().activeExplicitLocks())
-U.warn(log, ">>> " + lockSpan);
+GridCacheMvccManager mvcc = cctx.mvcc();
-U.warn(log, "Pending cache futures:");
+if (mvcc != null) {
+U.warn(log, "Pending explicit locks:");
-for (GridCacheFuture fut : cctx.mvcc().activeFutures())
-U.warn(log, ">>> " + fut);
+for (GridCacheExplicitLockSpan lockSpan :
mvcc.activeExplicitLocks())
+U.warn(log, ">>> " + lockSpan);
-U.warn(log, "Pending atomic cache futures:");
+U.warn(log, "Pending cache futures:");
-for (GridCacheFuture fut : cctx.mvcc().atomicFutures())
-U.warn(log, ">>> " + fut);
+for (GridCacheFuture fut : mvcc.activeFutures())
+U.warn(log, ">>> " + fut);
+
+U.warn(log, "Pending atomic cache futures:");
+
+for (GridCacheFuture fut : mvcc.atomicFutures())
+U.warn(log, ">>> " + fut);
+}
}
/**
[08/19] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1189
Merge remote-tracking branch 'remotes/origin/master' into ignite-1189 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d78e4c8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d78e4c8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d78e4c8e Branch: refs/heads/ignite-946 Commit: d78e4c8eef921775d2d5d1fcd5adf151c3d46923 Parents: 4d528be b056a73 Author: Denis Magda Authored: Tue Aug 4 13:32:45 2015 +0300 Committer: Denis Magda Committed: Tue Aug 4 13:32:45 2015 +0300 -- .../ClientAbstractMultiNodeSelfTest.java| 4 +- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 21 +- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 43 +- .../managers/communication/GridIoManager.java | 188 +++- .../processors/cache/GridCacheMvccManager.java | 73 +-- .../processors/cache/GridCacheProcessor.java| 2 +- .../processors/cache/GridCacheProxyImpl.java| 42 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../distributed/near/GridNearGetFuture.java | 20 +- .../ignite/internal/util/IgniteUtils.java | 16 + .../util/nio/GridCommunicationClient.java | 5 +- .../util/nio/GridNioFinishedFuture.java | 12 + .../ignite/internal/util/nio/GridNioFuture.java | 14 + .../internal/util/nio/GridNioFutureImpl.java| 15 + .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 5 + .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/GridShmemCommunicationClient.java | 7 +- .../util/nio/GridTcpNioCommunicationClient.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 43 +- .../ignite/spi/discovery/tcp/ClientImpl.java| 2 +- .../src/test/config/io-manager-benchmark.xml| 3 +- .../GridJobMasterLeaveAwareSelfTest.java| 10 +- .../IgniteClientReconnectAbstractTest.java | 5 +- .../IgniteClientReconnectCacheTest.java | 5 +- .../GridDeploymentMessageCountSelfTest.java | 5 +- .../cache/CacheStopAndDestroySelfTest.java | 8 +- .../GridCacheAtomicMessageCountSelfTest.java| 6 +- .../processors/cache/GridCacheMvccSelfTest.java | 1 - ...ridCacheReplicatedSynchronousCommitTest.java | 5 +- .../IgniteCacheAbstractStopBusySelfTest.java| 6 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 6 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 4 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 5 +- ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...teCacheClientNodePartitionsExchangeTest.java | 4 +- .../IgniteCacheNearOffheapGetSelfTest.java | 131 ++ ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../GridCacheDhtPreloadMessageCountTest.java| 5 +- ...ePrimaryNodeFailureRecoveryAbstractTest.java | 6 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../near/IgniteCacheNearTxRollbackTest.java | 6 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- ...CommunicationRecoveryAckClosureSelfTest.java | 464 +++ .../testsuites/IgniteCacheTestSuite2.java | 1 + .../IgniteSpiCommunicationSelfTestSuite.java| 1 + .../ignite/util/TestTcpCommunicationSpi.java| 6 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 15 +- .../parser/dialect/OracleMetadataDialect.java | 4 +- .../src/test/java/config/ignite-test-config.xml | 43 ++ .../ignite/internal/GridFactorySelfTest.java| 9 + .../visor/commands/kill/VisorKillCommand.scala | 2 +- 55 files changed, 1148 insertions(+), 197 deletions(-) --
[19/19] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-946
Merge remote-tracking branch 'remotes/origin/master' into ignite-946 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/801d6df1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/801d6df1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/801d6df1 Branch: refs/heads/ignite-946 Commit: 801d6df1acd2615c1a85e9e3829983011b5fd0a3 Parents: b6bef13 ae11e9b Author: Denis Magda Authored: Tue Aug 11 10:19:21 2015 +0300 Committer: Denis Magda Committed: Tue Aug 11 10:19:21 2015 +0300 -- .../configuration/IgniteConfiguration.java | 1 - .../GridCachePartitionExchangeManager.java | 48 +++ .../dht/atomic/GridDhtAtomicCache.java | 36 +--- .../cache/CacheStopAndDestroySelfTest.java | 87 4 files changed, 56 insertions(+), 116 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/801d6df1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java --
[12/19] incubator-ignite git commit: # Fixed potential NPE in GridCachePartitionExchangeManager.dumpDebugInfo
# Fixed potential NPE in GridCachePartitionExchangeManager.dumpDebugInfo
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd770a54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd770a54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd770a54
Branch: refs/heads/ignite-946
Commit: bd770a54a554c8c22f36ea00f8c735218c29b330
Parents: d9acbd1
Author: sboikov
Authored: Mon Aug 10 16:08:10 2015 +0300
Committer: sboikov
Committed: Mon Aug 10 16:08:10 2015 +0300
--
.../cache/GridCachePartitionExchangeManager.java| 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd770a54/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 c26f5c3..cf49197 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
@@ -962,15 +962,19 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
for (GridDhtPartitionsExchangeFuture fut : pendingExchangeFuts)
U.warn(log, ">>> " + fut);
-U.warn(log, "Last 10 exchange futures (total: " + exchFuts.size() +
"):");
+ExchangeFutureSet exchFuts = this.exchFuts;
-int cnt = 0;
+if (exchFuts != null) {
+U.warn(log, "Last 10 exchange futures (total: " + exchFuts.size()
+ "):");
-for (GridDhtPartitionsExchangeFuture fut : exchFuts) {
-U.warn(log, ">>> " + fut);
+int cnt = 0;
+
+for (GridDhtPartitionsExchangeFuture fut : exchFuts) {
+U.warn(log, ">>> " + fut);
-if (++cnt == 10)
-break;
+if (++cnt == 10)
+break;
+}
}
dumpPendingObjects();
[16/19] incubator-ignite git commit: ignite-946: renamed topologyVersion to topologyOrder for GridCacheVersion
ignite-946: renamed topologyVersion to topologyOrder for GridCacheVersion
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dd3cecf6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd3cecf6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd3cecf6
Branch: refs/heads/ignite-946
Commit: dd3cecf6a68deec93c084af2f7d7e1be9de9f877
Parents: c1582fc
Author: Denis Magda
Authored: Tue Aug 11 09:02:00 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 11 09:02:00 2015 +0300
--
.../cache/GridCacheAtomicVersionComparator.java | 4 +--
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../processors/cache/GridCacheUtils.java| 2 +-
.../cache/transactions/IgniteTxManager.java | 2 +-
.../cache/version/CacheVersionedEntryImpl.java | 4 +--
.../version/GridCachePlainVersionedEntry.java | 2 +-
.../version/GridCacheRawVersionedEntry.java | 2 +-
.../cache/version/GridCacheVersion.java | 28 ++--
.../cache/version/GridCacheVersionManager.java | 5 ++--
.../ignite/internal/util/IgniteUtils.java | 4 +--
.../cache/GridCacheEntryVersionSelfTest.java| 4 +--
11 files changed, 29 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3cecf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
index 3a06100..45288d9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicVersionComparator.java
@@ -32,8 +32,8 @@ public class GridCacheAtomicVersionComparator {
* @return Comparison value.
*/
public int compare(GridCacheVersion one, GridCacheVersion other, boolean
ignoreTime) {
-int topVer = one.topologyVersion();
-int otherTopVer = other.topologyVersion();
+int topVer = one.topologyOrder();
+int otherTopVer = other.topologyOrder();
if (topVer == otherTopVer) {
long globalTime = one.globalTime();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3cecf6/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 298f7a6..33c42c4 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
@@ -1927,7 +1927,7 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
// Incorporate conflict version into new version if needed.
if (conflictVer != null && conflictVer != newVer)
-newVer = new GridCacheVersionEx(newVer.topologyVersion(),
+newVer = new GridCacheVersionEx(newVer.topologyOrder(),
newVer.globalTime(),
newVer.order(),
newVer.nodeOrder(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3cecf6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index a313e3d..75f1dee 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -1060,7 +1060,7 @@ public class GridCacheUtils {
byte[] bytes = new byte[28];
-U.intToBytes(ver.topologyVersion(), bytes, 0);
+U.intToBytes(ver.topologyOrder(), bytes, 0);
U.longToBytes(ver.globalTime(), bytes, 4);
U.longToBytes(ver.order(), bytes, 12);
U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd3cecf6/modules/core/src/main/java/org/apache/i
[06/19] incubator-ignite git commit: ignite-1189: 4 reproducing deadlock
ignite-1189: 4 reproducing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/132562b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/132562b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/132562b4
Branch: refs/heads/ignite-946
Commit: 132562b431bc3250abe56ec48725c5ebe6083964
Parents: 28c9977
Author: Denis Magda
Authored: Tue Aug 4 12:26:00 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 12:26:00 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 8 ++--
.../IgniteCacheAtomicNodeRestartTest.java | 45
2 files changed, 48 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/132562b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 4d73fb2..cd6e28d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1152,11 +1152,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
e.printStackTrace();
}
-catch (Exception e) {
-U.error(log, "FUCK ERROR", e);
-
-throw e;
-}
finally {
if (locked != null)
unlockEntries(locked, req.topologyVersion());
@@ -1179,6 +1174,9 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
remap = true;
}
+catch (Exception e) {
+U.error(log, "Unexpected exception during cache update", e);
+}
if (remap) {
assert dhtFut == null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/132562b4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index 70e6c4c..caee4d0 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -36,7 +36,52 @@ public class IgniteCacheAtomicNodeRestartTest extends
GridCachePartitionedNodeRe
super.testRestartWithPutTenNodesTwoBackups();
}
+public void testRestartWithPutTenNodesTwoBackups2() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups3() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups4() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups5() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups6() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups7() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups8() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups9() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups10() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups11() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups12() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups13() throws Throwable {
+super.testRestartWithPutTenNodesTwoBa
[10/19] incubator-ignite git commit: IGNITE-1189 Removed unnecessary comment.
IGNITE-1189 Removed unnecessary comment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e42f954f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e42f954f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e42f954f
Branch: refs/heads/ignite-946
Commit: e42f954f043b6690dfcc10b7eb8817194eb898e2
Parents: 6770606
Author: nikolay_tikhonov
Authored: Mon Aug 10 13:33:28 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Aug 10 13:33:28 2015 +0300
--
.../java/org/apache/ignite/configuration/IgniteConfiguration.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e42f954f/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index e1aff25..546c382 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -194,7 +194,6 @@ public class IgniteConfiguration {
/** Default failure detection timeout in millis. */
@SuppressWarnings("UnnecessaryBoxing")
-//public static final Long DFLT_FAILURE_DETECTION_TIMEOUT = new
Long(10_000);
public static final Long DFLT_FAILURE_DETECTION_TIMEOUT = new Long(10_000);
/** Optional grid name. */
[1/3] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Repository: incubator-ignite Updated Branches: refs/heads/ignite-1191 [created] b0bdf04a6 Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/455d4dc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/455d4dc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/455d4dc2 Branch: refs/heads/ignite-1191 Commit: 455d4dc20325815f4557be12485af871dc7c1feb Parents: 2a8b548 ae11e9b Author: Valentin Kulichenko Authored: Mon Aug 10 23:59:15 2015 -0700 Committer: Valentin Kulichenko Committed: Mon Aug 10 23:59:15 2015 -0700 -- .../configuration/IgniteConfiguration.java | 1 - .../GridCachePartitionExchangeManager.java | 48 +++ .../dht/atomic/GridDhtAtomicCache.java | 36 +--- .../cache/CacheStopAndDestroySelfTest.java | 87 4 files changed, 56 insertions(+), 116 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/455d4dc2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java --
[3/3] incubator-ignite git commit: Merge branch 'ignite-104' into ignite-1191
Merge branch 'ignite-104' into ignite-1191 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0bdf04a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0bdf04a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0bdf04a Branch: refs/heads/ignite-1191 Commit: b0bdf04a6f49c92c2bac8c00290f70535ae410ec Parents: 2f10184 455d4dc Author: Valentin Kulichenko Authored: Tue Aug 11 00:25:10 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 11 00:25:10 2015 -0700 -- --
[2/3] incubator-ignite git commit: Merge branch 'ignite-104' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1191
Merge branch 'ignite-104' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1191 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f101848 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f101848 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f101848 Branch: refs/heads/ignite-1191 Commit: 2f101848aee3b4f33b66a99d147b9f01331f92bf Parents: ae11e9b 2a8b548 Author: Valentin Kulichenko Authored: Tue Aug 11 00:24:49 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 11 00:24:49 2015 -0700 -- .../ignite/codegen/MessageCodeGenerator.java| 8 + .../org/apache/ignite/internal/GridTopic.java | 2 +- .../IgniteLocalNodeStoppedException.java| 55 + .../managers/communication/GridIoManager.java | 247 +-- .../managers/communication/GridIoMessage.java | 48 +++- .../cache/GridCacheEvictionManager.java | 11 +- .../processors/cache/GridCacheIoManager.java| 132 -- .../processors/cache/GridCacheMapEntry.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 15 +- .../dht/atomic/GridAtomicMappingKey.java| 86 +++ .../dht/atomic/GridAtomicRequestTopic.java | 124 ++ .../dht/atomic/GridDhtAtomicCache.java | 128 ++ .../GridDhtAtomicDeferredUpdateResponse.java| 32 ++- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 95 --- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 81 +++--- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 33 ++- .../dht/atomic/GridNearAtomicUpdateFuture.java | 238 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 63 +++-- .../atomic/GridNearAtomicUpdateResponse.java| 34 ++- .../preloader/GridDhtPartitionDemandPool.java | 15 +- .../distributed/near/GridNearAtomicCache.java | 32 ++- .../query/GridCacheDistributedQueryManager.java | 8 +- .../resources/META-INF/classnames.properties| 3 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheTransformEventSelfTest.java| 14 +- ...niteCacheClientNodeChangingTopologyTest.java | 4 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 - .../IgniteCacheLoaderWriterAbstractTest.java| 2 +- .../IgniteCacheStoreSessionAbstractTest.java| 2 +- .../junits/common/GridCommonAbstractTest.java | 22 +- 31 files changed, 1197 insertions(+), 359 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f101848/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java --
[43/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/99e998a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/99e998a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/99e998a8
Branch: refs/heads/ignite-426
Commit: 99e998a8b46fc9e0ace50ac7c6c567beab69a47d
Parents: de86990e
Author: Valentin Kulichenko
Authored: Thu Aug 6 18:09:08 2015 -0700
Committer: Valentin Kulichenko
Committed: Thu Aug 6 18:09:08 2015 -0700
--
.../processors/cache/GridCacheEvictionManager.java | 11 ++-
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 11 +++
.../GridCacheExpiredEntriesPreloadAbstractSelfTest.java | 2 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java| 4 ++--
.../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 8 ++--
6 files changed, 19 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99e998a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 55669a7..fb3639d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -740,11 +740,20 @@ public class GridCacheEvictionManager extends
GridCacheManagerAdapter {
* @param topVer Topology version.
*/
public void touch(GridCacheEntryEx e, AffinityTopologyVersion topVer) {
+touch(e, topVer, null);
+}
+
+/**
+ * @param e Entry for eviction policy notification.
+ * @param topVer Topology version.
+ * @param ver Write version.
+ */
+public void touch(GridCacheEntryEx e, AffinityTopologyVersion topVer,
@Nullable GridCacheVersion ver) {
if (e.detached() || e.isInternal())
return;
try {
-if (e.markObsoleteIfEmpty(null) || e.obsolete())
+if (e.markObsoleteIfEmpty(ver) || e.obsolete())
e.context().cache().removeEntry(e);
}
catch (IgniteCheckedException ex) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99e998a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 6949ae2..8ea4539 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2497,7 +2497,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
finally {
if (entry != null)
-ctx.evicts().touch(entry, req.topologyVersion());
+ctx.evicts().touch(entry, req.topologyVersion(),
req.writeVersion());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99e998a8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index b6348f2..fb004bf 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -2317,8 +2317,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
GridCacheEntryEx entry = cctx.isNear() ?
cctx.near().dht().peekEx(key) :
cctx.cache().peekEx(key);
-
[19/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b27af71d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b27af71d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b27af71d
Branch: refs/heads/ignite-426
Commit: b27af71d81274ed351d5c43740f5c904db62adfb
Parents: 55a2fc6
Author: Valentin Kulichenko
Authored: Mon Aug 3 16:51:53 2015 -0700
Committer: Valentin Kulichenko
Committed: Mon Aug 3 16:51:53 2015 -0700
--
.../dht/atomic/GridDhtAtomicCache.java | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b27af71d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 9328932..4f1b887 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2409,7 +2409,25 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
* @param nodeId Sender node ID.
* @param req Dht atomic update request.
*/
-private void processDhtAtomicUpdateRequest(UUID nodeId,
GridDhtAtomicUpdateRequest req) {
+private void processDhtAtomicUpdateRequest(final UUID nodeId, final
GridDhtAtomicUpdateRequest req) {
+IgniteInternalFuture fut = ctx.preloader().request(req.keys(),
req.topologyVersion());
+
+if (fut.isDone())
+processDhtAtomicUpdateRequest0(nodeId, req);
+else {
+fut.listen(new CI1() {
+@Override public void apply(IgniteInternalFuture future) {
+processDhtAtomicUpdateRequest0(nodeId, req);
+}
+});
+}
+}
+
+/**
+ * @param nodeId Sender node ID.
+ * @param req Dht atomic update request.
+ */
+private void processDhtAtomicUpdateRequest0(UUID nodeId,
GridDhtAtomicUpdateRequest req) {
if (log.isDebugEnabled())
log.debug("Processing dht atomic update request [nodeId=" + nodeId
+ ", req=" + req + ']');
[31/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3be215d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3be215d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3be215d9
Branch: refs/heads/ignite-426
Commit: 3be215d941011283868b5d4ccaae2c8c6d1289df
Parents: 7d9ea01
Author: Valentin Kulichenko
Authored: Tue Aug 4 18:22:30 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 18:22:30 2015 -0700
--
.../IgniteCacheStoreSessionAbstractTest.java| 2 +-
.../junits/common/GridCommonAbstractTest.java | 20 +++-
2 files changed, 20 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3be215d9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
index 7784003..c6150f8 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
@@ -115,7 +115,7 @@ public abstract class IgniteCacheStoreSessionAbstractTest
extends IgniteCacheAbs
* @throws Exception If failed.
*/
private void testStoreSession(IgniteCache cache) throws
Exception {
-Set keys = new HashSet<>(primaryKeys(cache, 3, 100_000));
+Set keys = new HashSet<>(primaryKeys(cache, 3, 100_000,
true));
Integer key = keys.iterator().next();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3be215d9/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 8698b4a..247a99e 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -503,6 +503,17 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
* @return Collection of keys for which given cache is primary.
*/
protected List primaryKeys(IgniteCache cache, int cnt, int
startFrom) {
+return primaryKeys(cache, cnt, startFrom, false);
+}
+
+/**
+ * @param cache Cache.
+ * @param cnt Keys count.
+ * @param startFrom Start value for keys search.
+ * @param singlePart Single partition.
+ * @return Collection of keys for which given cache is primary.
+ */
+protected List primaryKeys(IgniteCache cache, int cnt, int
startFrom, boolean singlePart) {
assert cnt > 0 : cnt;
List found = new ArrayList<>(cnt);
@@ -511,10 +522,17 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
Affinity aff = (Affinity)affinity(cache);
+int part = -1;
+
for (int i = startFrom; i < startFrom + 100_000; i++) {
Integer key = i;
-if (aff.isPrimary(locNode, key)) {
+boolean add = part == -1 ? aff.isPrimary(locNode, key) :
aff.partition(key) == part;
+
+if (add) {
+if (singlePart)
+part = aff.partition(key);
+
found.add(key);
if (found.size() == cnt)
[25/50] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/98ad8925 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98ad8925 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98ad8925 Branch: refs/heads/ignite-426 Commit: 98ad89253b8e252d36a2e3c45d44466cb5b97d02 Parents: 2421fee 90adeae Author: Valentin Kulichenko Authored: Tue Aug 4 10:35:34 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 4 10:35:34 2015 -0700 -- .../h2/twostep/GridReduceQueryExecutor.java | 34 - ...idCacheReduceQueryMultithreadedSelfTest.java | 21 ++- .../yardstick/config/benchmark-query.properties | 3 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/IgniteBenchmarkArguments.java | 11 ++ .../cache/IgniteJdbcSqlQueryBenchmark.java | 134 +++ 6 files changed, 198 insertions(+), 7 deletions(-) --
[15/50] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branches 'ignite-104' and 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5cdd2440
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5cdd2440
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5cdd2440
Branch: refs/heads/ignite-426
Commit: 5cdd2440a6b9eb3c5fe0a7620202caf5cb2db441
Parents: 6c1655f 1c10ade
Author: Valentin Kulichenko
Authored: Fri Jul 31 13:38:39 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Jul 31 13:38:39 2015 -0700
--
.../JettyRestProcessorAbstractSelfTest.java | 14 +-
.../managers/communication/GridIoManager.java | 110 -
.../GridDhtPartitionsExchangeFuture.java| 20 +-
.../handlers/query/QueryCommandHandler.java | 6 +-
.../util/nio/GridCommunicationClient.java | 5 +-
.../util/nio/GridNioFinishedFuture.java | 12 +
.../ignite/internal/util/nio/GridNioFuture.java | 14 +
.../internal/util/nio/GridNioFutureImpl.java| 15 +
.../util/nio/GridNioRecoveryDescriptor.java | 13 +-
.../ignite/internal/util/nio/GridNioServer.java | 5 +
.../util/nio/GridNioSessionMetaKey.java | 5 +-
.../util/nio/GridShmemCommunicationClient.java | 7 +-
.../util/nio/GridTcpNioCommunicationClient.java | 14 +-
.../communication/tcp/TcpCommunicationSpi.java | 84 +++-
.../ignite/spi/discovery/tcp/ServerImpl.java| 45 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
...CommunicationRecoveryAckClosureSelfTest.java | 464 +++
.../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +-
.../IgniteSpiCommunicationSelfTestSuite.java| 1 +
.../http/jetty/GridJettyRestHandler.java| 12 +-
20 files changed, 779 insertions(+), 77 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5cdd2440/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 765ba65,7e17efc..479d116
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@@ -1059,9 -982,9 +1061,10 @@@ public class GridIoManager extends Grid
Message msg,
byte plc,
boolean ordered,
+boolean seq,
long timeout,
- boolean skipOnTimeout
+ boolean skipOnTimeout,
+ IgniteInClosure ackClosure
) throws IgniteCheckedException {
assert node != null;
assert topic != null;
@@@ -1079,10 -1002,11 +1082,13 @@@
if (ordered)
processOrderedMessage(locNodeId, ioMsg, plc, null);
+else if (seq)
+processSequentialMessage(locNodeId, ioMsg, plc, null);
else
processRegularMessage0(ioMsg, locNodeId);
+
+ if (ackClosure != null)
+ ackClosure.apply(null);
}
else {
if (topicOrd < 0)
@@@ -1132,7 -1059,7 +1141,7 @@@
if (node == null)
throw new IgniteCheckedException("Failed to send message to node
(has node left grid?): " + nodeId);
- send(node, topic, topic.ordinal(), msg, plc, false, false, 0, false);
-send(node, topic, topic.ordinal(), msg, plc, false, 0, false, null);
++send(node, topic, topic.ordinal(), msg, plc, false, false, 0, false,
null);
}
/**
@@@ -1144,7 -1071,7 +1153,7 @@@
*/
public void send(ClusterNode node, Object topic, Message msg, byte plc)
throws IgniteCheckedException {
- send(node, topic, -1, msg, plc, false, false, 0, false);
-send(node, topic, -1, msg, plc, false, 0, false, null);
++send(node, topic, -1, msg, plc, false, false, 0, false, null);
}
/**
@@@ -1156,7 -1083,7 +1165,7 @@@
*/
public void send(ClusterNode node, GridTopic topic, Message msg, byte plc)
throws IgniteCheckedException {
- send(node, topic, topic.ordinal(), msg, plc, false, false, 0, false);
-send(node, topic, topic.ordinal(), msg, plc, false, 0, false, null);
++send(node, topic, topic.ordinal(), msg, plc, false, false, 0, false,
null);
}
/**
@@@ -1178,7 -1105,7 +1187,7 @@@
) throws IgniteCheckedException {
assert timeout > 0 || skipOnTimeout;
- se
[24/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2421fee9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2421fee9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2421fee9 Branch: refs/heads/ignite-426 Commit: 2421fee936c1cfefa072c00da8ebce6897c2156f Parents: d26184a Author: Valentin Kulichenko Authored: Tue Aug 4 10:28:24 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 4 10:28:24 2015 -0700 -- .../managers/communication/GridIoManager.java | 75 +++- 1 file changed, 43 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2421fee9/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index a129cbe..b38106e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -980,10 +980,10 @@ public class GridIoManager extends GridManagerAdapter
[12/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f187add2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f187add2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f187add2
Branch: refs/heads/ignite-426
Commit: f187add2d9e96fda1da4ea5a98940cd4663ee355
Parents: 2d16d99
Author: Valentin Kulichenko
Authored: Thu Jul 30 16:59:48 2015 -0700
Committer: Valentin Kulichenko
Committed: Thu Jul 30 16:59:48 2015 -0700
--
.../distributed/dht/atomic/GridDhtAtomicCache.java | 5 +
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 12
2 files changed, 1 insertion(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f187add2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index a010baa..19c89e7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1182,9 +1182,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
e.printStackTrace();
}
finally {
-if (dhtFut != null && !remap)
-dhtFut.map();
-
if (locked != null)
unlockEntries(locked, req.topologyVersion());
@@ -1228,7 +1225,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
else {
// If there are backups, map backup update future.
if (dhtFut != null)
-dhtFut.onMapped();
+dhtFut.map();
// Otherwise, complete the call.
else
completionCb.apply(req, res);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f187add2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index c05f4c6..eb1b42c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -90,9 +90,6 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
/** */
private boolean waitForExchange;
-/** */
-private boolean mapped;
-
/**
* @param cctx Cache context.
* @param completionCb Callback to invoke when future is completed.
@@ -385,15 +382,6 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
}
}
-mapped = true;
-}
-
-/**
- * On mapped callback.
- */
-public void onMapped() {
-assert mapped;
-
checkComplete();
// Send response right away if no ACKs from backup is required.
[20/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e6b90cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e6b90cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e6b90cf
Branch: refs/heads/ignite-426
Commit: 8e6b90cf835fe67778b961dccec0682f448f8e57
Parents: b27af71
Author: Valentin Kulichenko
Authored: Mon Aug 3 17:57:25 2015 -0700
Committer: Valentin Kulichenko
Committed: Mon Aug 3 17:57:25 2015 -0700
--
.../dht/atomic/GridDhtAtomicCache.java | 6 ++
.../dht/atomic/GridNearAtomicUpdateFuture.java | 78 +---
2 files changed, 25 insertions(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e6b90cf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 4f1b887..a8dc8ef 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -134,6 +134,12 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
updateReplyClos = new CI2() {
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
@Override public void apply(GridNearAtomicUpdateRequest req,
GridNearAtomicUpdateResponse res) {
+if (res.nodeId().equals(locNodeId)) {
+processNearAtomicUpdateResponse(res.nodeId(), res);
+
+return;
+}
+
if (ctx.config().getAtomicWriteOrderMode() == CLOCK) {
// Always send reply in CLOCK ordering mode.
sendNearUpdateReply(res.nodeId(), res);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e6b90cf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index ff24964..5150113 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -1047,30 +1047,17 @@ public class GridNearAtomicUpdateFuture extends
GridFutureAdapter
singleNodeId = mappingKey.nodeId();
singleReq = req;
-if (cctx.localNodeId().equals(mappingKey.nodeId())) {
-cache.updateAllAsyncInternal(mappingKey.nodeId(), req,
-new CI2() {
-@Override public void apply(GridNearAtomicUpdateRequest
req,
-GridNearAtomicUpdateResponse res) {
-assert res.futureVersion().equals(futVer) : futVer;
-
-onResult(res.nodeId(), res);
-}
-});
-}
-else {
-try {
-if (log.isDebugEnabled())
-log.debug("Sending near atomic update request [nodeId=" +
req.nodeId() + ", req=" + req + ']');
+try {
+if (log.isDebugEnabled())
+log.debug("Sending near atomic update request [nodeId=" +
req.nodeId() + ", req=" + req + ']');
-sendRequest(mappingKey, req);
+sendRequest(mappingKey, req);
-if (syncMode == FULL_ASYNC &&
cctx.config().getAtomicWriteOrderMode() == PRIMARY)
-onDone(new GridCacheReturn(cctx, true, null, true));
-}
-catch (IgniteCheckedException e) {
-onDone(addFailedKeys(req.keys(), e));
-}
+if (syncMode == FULL_ASYNC &&
cctx.config().getAtomicWriteOrderMode() == PRIMARY)
+onDone(new GridCacheReturn(cctx, true, null, true));
+}
+catch (IgniteCheckedException e) {
+onDone(addFailedKeys(req.keys(), e));
}
}
@@ -1080,57 +1067,30 @@ public class GridNearAtomicUpdateFuture exten
[14/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c1655fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c1655fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c1655fb
Branch: refs/heads/ignite-426
Commit: 6c1655fbe4c344a5f6ceb82abe6b231af57fcbed
Parents: 1e98372
Author: Valentin Kulichenko
Authored: Thu Jul 30 17:35:15 2015 -0700
Committer: Valentin Kulichenko
Committed: Thu Jul 30 17:35:15 2015 -0700
--
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 7 +--
.../distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 3 +--
.../distributed/dht/atomic/GridNearAtomicUpdateFuture.java| 3 +--
3 files changed, 3 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c1655fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 3802b29..9328932 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2473,13 +2473,8 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
if (updRes.removeVersion() != null) {
if (ctx.deferredDelete())
ctx.onDeferredDelete(entry,
updRes.removeVersion());
-else {
-assert entry.obsolete();
-
-entry.onMarkedObsolete();
-
+else if
(entry.markObsoleteVersion(updRes.removeVersion()))
removeEntry(entry);
-}
}
entry.onUnlock();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c1655fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index eb1b42c..5c22b3b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -358,8 +358,7 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
if (part >= 0) {
Object topic = new
GridAtomicRequestTopic(cctx.cacheId(), part, false);
-cctx.io().sendOrderedMessage(nodeId, topic, req,
cctx.ioPolicy(),
-2 * cctx.gridConfig().getNetworkTimeout());
+cctx.io().sendSequentialMessage(nodeId, topic, req,
cctx.ioPolicy());
}
else {
assert part == -1;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c1655fb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 4642b1a..ff24964 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -1146,8 +1146,7 @@ public class GridNearAtomicUpdateFuture extends
GridFutureAdapter
if (mappingKey.partition() >= 0) {
Object topic = new GridAtomicRequestTopic(cctx.cacheId(),
mappingKey.partition(), true);
-cctx.io().sendOrderedMes
[05/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c73fc5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c73fc5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c73fc5d
Branch: refs/heads/ignite-426
Commit: 7c73fc5d8d81f3cded6bffd4dcf3d1e48ad84d64
Parents: e5c69b8
Author: Valentin Kulichenko
Authored: Wed Jul 29 17:26:44 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Jul 29 17:26:44 2015 -0700
--
.../dht/atomic/GridDhtAtomicCache.java | 9 ++---
.../dht/atomic/GridDhtAtomicUpdateFuture.java| 3 ---
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 19 ++-
.../distributed/near/GridNearAtomicCache.java| 4 ++--
4 files changed, 6 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c73fc5d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 02e48df..31606b2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1767,7 +1767,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
dhtFut.addNearWriteEntries(filteredReaders,
entry,
updRes.newValue(),
-op == TRANSFORM ? req.entryProcessor(i) : null,
updRes.newTtl(),
updRes.conflictExpireTime());
}
@@ -2034,13 +2033,10 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
if (dhtFut != null) {
-EntryProcessor entryProcessor =
-entryProcessorMap == null ? null :
entryProcessorMap.get(entry.key());
-
if (!batchRes.readersOnly())
dhtFut.addWriteEntry(entry,
writeVal,
-entryProcessor,
+entryProcessorMap == null ? null :
entryProcessorMap.get(entry.key()),
updRes.newTtl(),
CU.EXPIRE_TIME_CALCULATE,
null);
@@ -2049,7 +2045,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
dhtFut.addNearWriteEntries(filteredReaders,
entry,
writeVal,
-entryProcessor,
updRes.newTtl(),
CU.EXPIRE_TIME_CALCULATE);
}
@@ -2465,7 +2460,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
/*event*/true,
/*metrics*/true,
/*primary*/false,
-/*check version*/!req.forceTransformBackups(),
+/*check version*/op != TRANSFORM ||
!req.forceTransformBackups(),
req.topologyVersion(),
CU.empty0(),
replicate ? DR_BACKUP : DR_NONE,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c73fc5d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 15ec121..ab0c2e1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -270,14 +270,12 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
* @param readers Entry readers.
[16/50] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branches 'ignite-104' and 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b52a234
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b52a234
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b52a234
Branch: refs/heads/ignite-426
Commit: 6b52a234f8c8f845a088df225220d6dde30a5e3f
Parents: 5cdd244
Author: Valentin Kulichenko
Authored: Fri Jul 31 13:40:21 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Jul 31 13:40:21 2015 -0700
--
.../managers/communication/GridIoManager.java| 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b52a234/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 479d116..d125eef 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1227,7 +1227,7 @@ public class GridIoManager extends
GridManagerAdapter ackClosure) throws
IgniteCheckedException {
-send(node, topic, topic.ordinal(), msg, plc, false, 0, false,
ackClosure);
+send(node, topic, topic.ordinal(), msg, plc, false, false, 0, false,
ackClosure);
}
/**
@@ -1250,7 +1250,7 @@ public class GridIoManager extends
GridManagerAdapter 0 || skipOnTimeout;
-send(nodes, topic, -1, msg, plc, true, false, timeout, skipOnTimeout);
+send(nodes, topic, -1, msg, plc, true, false, timeout, skipOnTimeout,
null);
}
/**
@@ -1263,7 +1263,7 @@ public class GridIoManager extends
GridManagerAdapter ackClosure)
throws IgniteCheckedException {
-send(node, topic, -1, msg, plc, false, 0, false, ackClosure);
+send(node, topic, -1, msg, plc, false, false, 0, false, ackClosure);
}
/**
@@ -1279,7 +1279,7 @@ public class GridIoManager extends
GridManagerAdapter 0 || skipOnTimeout;
-send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout,
ackClosure);
+send(node, topic, (byte)-1, msg, plc, true, false, timeout,
skipOnTimeout, ackClosure);
}
/**
@@ -1508,7 +1508,7 @@ public class GridIoManager extends
GridManagerAdapter ackClosure
) throws IgniteCheckedException {
assert nodes != null;
assert topic != null;
@@ -1547,7 +1548,7 @@ public class GridIoManager extends
GridManagerAdapter
[46/50] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/455d4dc2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/455d4dc2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/455d4dc2 Branch: refs/heads/ignite-426 Commit: 455d4dc20325815f4557be12485af871dc7c1feb Parents: 2a8b548 ae11e9b Author: Valentin Kulichenko Authored: Mon Aug 10 23:59:15 2015 -0700 Committer: Valentin Kulichenko Committed: Mon Aug 10 23:59:15 2015 -0700 -- .../configuration/IgniteConfiguration.java | 1 - .../GridCachePartitionExchangeManager.java | 48 +++ .../dht/atomic/GridDhtAtomicCache.java | 36 +--- .../cache/CacheStopAndDestroySelfTest.java | 87 4 files changed, 56 insertions(+), 116 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/455d4dc2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java --
[10/50] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dad46913 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dad46913 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dad46913 Branch: refs/heads/ignite-426 Commit: dad46913f38626f1335232549e5236ff21547812 Parents: 5241e27 7ed4d15 Author: Valentin Kulichenko Authored: Thu Jul 30 11:53:26 2015 -0700 Committer: Valentin Kulichenko Committed: Thu Jul 30 11:53:26 2015 -0700 -- ...cheDhtLocalPartitionAfterRemoveSelfTest.java | 107 +++ 1 file changed, 107 insertions(+) --
[33/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29188822
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29188822
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29188822
Branch: refs/heads/ignite-426
Commit: 29188822bc4154b0a6abfc4a215a5aedc5c4206b
Parents: 19ff9a5
Author: Valentin Kulichenko
Authored: Tue Aug 4 18:28:58 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 18:28:58 2015 -0700
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29188822/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index fb004bf..b6348f2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -2317,7 +2317,8 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
GridCacheEntryEx entry = cctx.isNear() ?
cctx.near().dht().peekEx(key) :
cctx.cache().peekEx(key);
-if
(grid(idx).affinity(null).mapKeyToPrimaryAndBackups(key).contains(grid(idx).localNode()))
{
+if (atomicityMode() != ATOMIC &&
+
grid(idx).affinity(null).mapKeyToPrimaryAndBackups(key).contains(grid(idx).localNode()))
{
assertNotNull(entry);
assertTrue(entry.deleted());
}
@@ -3394,8 +3395,12 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
// Ensure that old TTL and expire time are not longer "visible".
entry = internalCache.peekEx(key);
-assertEquals(0, entry.ttl());
-assertEquals(0, entry.expireTime());
+if (atomicityMode() == ATOMIC)
+assertNull(entry);
+else {
+assertEquals(0, entry.ttl());
+assertEquals(0, entry.expireTime());
+}
// Ensure that next update will not pick old expire time.
[29/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aeac6aaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aeac6aaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aeac6aaa
Branch: refs/heads/ignite-426
Commit: aeac6aaa2641a4afaa38ec57c0046649601e1184
Parents: b73fa67
Author: Valentin Kulichenko
Authored: Tue Aug 4 17:11:48 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 17:11:48 2015 -0700
--
.../IgniteLocalNodeStoppedException.java| 55
.../processors/cache/GridCacheMvccManager.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 2 +-
.../GridCacheTransformEventSelfTest.java| 14 +
...niteCacheClientNodeChangingTopologyTest.java | 4 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 4 +-
7 files changed, 65 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aeac6aaa/modules/core/src/main/java/org/apache/ignite/internal/IgniteLocalNodeStoppedException.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteLocalNodeStoppedException.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteLocalNodeStoppedException.java
new file mode 100644
index 000..bc8eb5c
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteLocalNodeStoppedException.java
@@ -0,0 +1,55 @@
+/*
+ * 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;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Exception used when local node is stopping.
+ */
+public class IgniteLocalNodeStoppedException extends IgniteCheckedException {
+/** */
+private static final long serialVersionUID = 0L;
+
+/**
+ * Creates new exception with default error message.
+ */
+public IgniteLocalNodeStoppedException() {
+super("Local node is stopping.");
+}
+
+/**
+ * Creates new exception with given error message.
+ *
+ * @param msg Error message.
+ */
+public IgniteLocalNodeStoppedException(String msg) {
+super(msg);
+}
+
+/**
+ * Creates a new exception with given error message and optional nested
cause exception.
+ *
+ * @param msg Error message.
+ * @param cause Optional nested exception (can be {@code null}).
+ */
+public IgniteLocalNodeStoppedException(String msg, @Nullable Throwable
cause) {
+super(msg, cause);
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aeac6aaa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index 6a8c6fe..7416672 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -296,7 +296,7 @@ public class GridCacheMvccManager extends
GridCacheSharedManagerAdapter {
* Cancels all client futures.
*/
public void cancelClientFutures() {
-cancelClientFutures(new IgniteCheckedException("Operation has been
cancelled (node is stopping)."));
+cancelClientFutures(new IgniteLocalNodeStoppedException());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aeac6aaa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
---
[21/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6720885f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6720885f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6720885f
Branch: refs/heads/ignite-426
Commit: 6720885ff9f1541b917e0dc3f83e7629d4e2ffc1
Parents: 8e6b90c
Author: Valentin Kulichenko
Authored: Mon Aug 3 18:15:48 2015 -0700
Committer: Valentin Kulichenko
Committed: Mon Aug 3 18:15:48 2015 -0700
--
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6720885f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index a8dc8ef..f5119f6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2416,9 +2416,10 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
* @param req Dht atomic update request.
*/
private void processDhtAtomicUpdateRequest(final UUID nodeId, final
GridDhtAtomicUpdateRequest req) {
-IgniteInternalFuture fut = ctx.preloader().request(req.keys(),
req.topologyVersion());
+IgniteInternalFuture fut = !req.keys().isEmpty() ?
+ctx.preloader().request(req.keys(), req.topologyVersion()) : null;
-if (fut.isDone())
+if (fut == null || fut.isDone())
processDhtAtomicUpdateRequest0(nodeId, req);
else {
fut.listen(new CI1() {
[13/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1e98372e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e98372e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e98372e
Branch: refs/heads/ignite-426
Commit: 1e98372edca990804d1686521fd152c0549baa2c
Parents: f187add
Author: Valentin Kulichenko
Authored: Thu Jul 30 17:24:48 2015 -0700
Committer: Valentin Kulichenko
Committed: Thu Jul 30 17:24:48 2015 -0700
--
.../internal/processors/cache/GridCacheMapEntry.java | 5 -
.../distributed/dht/atomic/GridDhtAtomicCache.java| 9 +++--
.../cache/distributed/near/GridNearAtomicCache.java | 14 --
3 files changed, 7 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e98372e/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 79d7989..5d2af9a 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
@@ -2161,9 +2161,6 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
}
}
-if (!cctx.deferredDelete())
-markObsolete0(rmvVer, true);
-
res = hadVal;
}
@@ -2458,8 +2455,6 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
/** {@inheritDoc} */
@Override public boolean markObsoleteVersion(GridCacheVersion ver) {
-assert cctx.deferredDelete();
-
boolean marked;
synchronized (this) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e98372e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 19c89e7..3802b29 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1177,7 +1177,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
}
catch (GridCacheEntryRemovedException e) {
-assert !ctx.deferredDelete() : "Entry should not become
obsolete while holding lock.";
+assert false : "Entry should not become obsolete while holding
lock.";
e.printStackTrace();
}
@@ -1196,11 +1196,8 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
else {
GridDhtCacheEntry entry = e.get1();
-assert entry.obsolete();
-
-entry.onMarkedObsolete();
-
-removeEntry(entry);
+if (entry.markObsoleteVersion(e.get2()))
+removeEntry(entry);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e98372e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 707facc..b3f4a1d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -245,11 +245,8 @@ public class GridNearAtomicCache extends
GridNearCacheAdapter {
if (ctx.deferredDelete())
ctx.onDeferredDelete(entry,
updRes.removeVersio
[08/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa11f644
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa11f644
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa11f644
Branch: refs/heads/ignite-426
Commit: aa11f6446f14174e0ca4e67b85b1403ec6ed7016
Parents: 112c567
Author: Valentin Kulichenko
Authored: Wed Jul 29 18:01:36 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Jul 29 18:01:36 2015 -0700
--
.../dht/atomic/GridAtomicMappingKey.java| 86 ---
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 87 +---
2 files changed, 75 insertions(+), 98 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa11f644/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicMappingKey.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicMappingKey.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicMappingKey.java
deleted file mode 100644
index 52e3c7f..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicMappingKey.java
+++ /dev/null
@@ -1,86 +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.internal.processors.cache.distributed.dht.atomic;
-
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.util.*;
-
-/**
- * Mapping Key.
- */
-class GridAtomicMappingKey {
-/** Node ID. */
-private final UUID nodeId;
-
-/** Partition. */
-private final int part;
-
-/**
- * @param nodeId Node ID.
- * @param part Partition.
- */
-GridAtomicMappingKey(UUID nodeId, int part) {
-assert nodeId != null;
-assert part >= -1 : part;
-
-this.nodeId = nodeId;
-this.part = part;
-}
-
-/**
- * @return Node ID.
- */
-UUID nodeId() {
-return nodeId;
-}
-
-/**
- * @return Partition.
- */
-int partition() {
-return part;
-}
-
-/** {@inheritDoc} */
-@Override public boolean equals(Object o) {
-if (this == o)
-return true;
-
-if (o == null || getClass() != o.getClass())
-return false;
-
-GridAtomicMappingKey key = (GridAtomicMappingKey)o;
-
-return nodeId.equals(key.nodeId) && part == key.part;
-}
-
-/** {@inheritDoc} */
-@Override public int hashCode() {
-int res = nodeId.hashCode();
-
-res = 31 * res + part;
-
-return res;
-}
-
-/** {@inheritDoc} */
-@Override public String toString() {
-return S.toString(GridAtomicMappingKey.class, this);
-}
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa11f644/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 8595dc7..93c20da 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -73,7 +73,7 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
/** Mappings. */
@GridToStringInclude
-private ConcurrentMap
mappings = new ConcurrentHashMap8<>();
+private ConcurrentMap mappings =
new Concur
[44/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a8b5489
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a8b5489
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a8b5489
Branch: refs/heads/ignite-426
Commit: 2a8b548955581857b53c312f8ce9d1bfa1c853a7
Parents: 99e998a
Author: Valentin Kulichenko
Authored: Fri Aug 7 15:14:12 2015 -0700
Committer: Valentin Kulichenko
Committed: Fri Aug 7 15:14:12 2015 -0700
--
.../ignite/internal/processors/cache/GridCacheIoManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a8b5489/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 490a5d8..7e7042c 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
@@ -292,6 +292,8 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
if (e instanceof Error)
throw (Error)e;
+else if (e instanceof RuntimeException)
+throw (RuntimeException)e;
}
finally {
if (depEnabled)
@@ -541,7 +543,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
catch (Throwable e) {
U.error(log, "Failed processing message [senderId=" + nodeId + ",
msg=" + msg + ']', e);
-if (e instanceof Error)
+if (e instanceof Error || e instanceof RuntimeException)
throw e;
}
finally {
[32/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19ff9a56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19ff9a56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19ff9a56
Branch: refs/heads/ignite-426
Commit: 19ff9a5688ac198f380e0373e9ff961717d13072
Parents: 3be215d
Author: Valentin Kulichenko
Authored: Tue Aug 4 18:24:23 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 18:24:23 2015 -0700
--
.../cache/integration/IgniteCacheLoaderWriterAbstractTest.java | 2 +-
.../ignite/testframework/junits/common/GridCommonAbstractTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19ff9a56/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java
index 4812b3b..3291bdd 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheLoaderWriterAbstractTest.java
@@ -184,7 +184,7 @@ public abstract class IgniteCacheLoaderWriterAbstractTest
extends IgniteCacheAbs
IgniteCache cache = jcache(0);
-for (Object key : primaryKeys(cache, 100, 0))
+for (Object key : primaryKeys(cache, 100, 0, true))
vals.put(key, key);
assertTrue(cache.getAll(vals.keySet()).isEmpty());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19ff9a56/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 247a99e..f05af4b 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -524,7 +524,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
int part = -1;
-for (int i = startFrom; i < startFrom + 100_000; i++) {
+for (int i = startFrom; i < startFrom + 1_000_000; i++) {
Integer key = i;
boolean add = part == -1 ? aff.isPrimary(locNode, key) :
aff.partition(key) == part;
[27/50] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6f042aee Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6f042aee Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6f042aee Branch: refs/heads/ignite-426 Commit: 6f042aeef97b1624394bca06b7659c4c835b4a89 Parents: e3ebcb9 01c3e09 Author: Valentin Kulichenko Authored: Tue Aug 4 11:26:13 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 4 11:26:13 2015 -0700 -- .../cache/GridCacheSwapPreloadSelfTest.java | 2 + .../query/h2/twostep/GridMergeIndex.java| 7 +++ .../h2/twostep/GridMergeIndexUnsorted.java | 23 +++-- .../query/h2/twostep/GridMergeTable.java| 51 .../h2/twostep/GridReduceQueryExecutor.java | 28 +-- 5 files changed, 47 insertions(+), 64 deletions(-) --
[36/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05b27aaa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05b27aaa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05b27aaa Branch: refs/heads/ignite-426 Commit: 05b27aaae2e744212b864299ada5df2fe093d693 Parents: 1b09e15 Author: Valentin Kulichenko Authored: Tue Aug 4 22:25:46 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 4 22:25:46 2015 -0700 -- .../distributed/IgniteCacheClientNodeChangingTopologyTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05b27aaa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java index 3c6e5e4..72be216 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java @@ -350,7 +350,7 @@ public class IgniteCacheClientNodeChangingTopologyTest extends GridCommonAbstrac List msgs = spi.recordedMessages(); -assertEquals(6, msgs.size()); +assertEquals(writeOrder == CLOCK ? 6 : 3, msgs.size()); for (Object msg : msgs) assertTrue(((GridNearAtomicUpdateRequest)msg).clientRequest());
[22/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25a109b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25a109b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25a109b3 Branch: refs/heads/ignite-426 Commit: 25a109b31e80807790d1b5e61fb3412f142d84dc Parents: 6720885 Author: Valentin Kulichenko Authored: Mon Aug 3 21:31:35 2015 -0700 Committer: Valentin Kulichenko Committed: Mon Aug 3 21:31:35 2015 -0700 -- .../managers/communication/GridIoManager.java| 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25a109b3/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 1e609e3..a129cbe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -1000,6 +1000,16 @@ public class GridIoManager extends GridManagerAdapter
[17/50] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41508437 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41508437 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41508437 Branch: refs/heads/ignite-426 Commit: 41508437206d74e5cd5c3269883a876ca257300a Parents: 6b52a23 b056a73 Author: Valentin Kulichenko Authored: Mon Aug 3 13:42:41 2015 -0700 Committer: Valentin Kulichenko Committed: Mon Aug 3 13:42:41 2015 -0700 -- .../ClientAbstractMultiNodeSelfTest.java| 4 +- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 21 ++- .../apache/ignite/internal/IgniteKernal.java| 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 43 +++--- .../managers/communication/GridIoManager.java | 84 +++- .../processors/cache/GridCacheMvccManager.java | 73 ++- .../processors/cache/GridCacheProcessor.java| 2 +- .../processors/cache/GridCacheProxyImpl.java| 42 +++--- .../processors/cache/GridCacheSwapManager.java | 2 +- .../distributed/near/GridNearGetFuture.java | 20 +-- .../ignite/internal/util/IgniteUtils.java | 16 +++ .../ignite/spi/discovery/tcp/ClientImpl.java| 2 +- .../src/test/config/io-manager-benchmark.xml| 3 +- .../GridJobMasterLeaveAwareSelfTest.java| 10 +- .../IgniteClientReconnectAbstractTest.java | 5 +- .../IgniteClientReconnectCacheTest.java | 5 +- .../GridDeploymentMessageCountSelfTest.java | 5 +- .../cache/CacheStopAndDestroySelfTest.java | 8 +- .../GridCacheAtomicMessageCountSelfTest.java| 6 +- .../processors/cache/GridCacheMvccSelfTest.java | 1 - ...ridCacheReplicatedSynchronousCommitTest.java | 5 +- .../IgniteCacheAbstractStopBusySelfTest.java| 6 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 6 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 4 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 5 +- ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...teCacheClientNodePartitionsExchangeTest.java | 4 +- .../IgniteCacheNearOffheapGetSelfTest.java | 131 +++ ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../GridCacheDhtPreloadMessageCountTest.java| 5 +- ...ePrimaryNodeFailureRecoveryAbstractTest.java | 6 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../near/IgniteCacheNearTxRollbackTest.java | 6 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- .../testsuites/IgniteCacheTestSuite2.java | 1 + .../ignite/util/TestTcpCommunicationSpi.java| 6 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 15 ++- .../parser/dialect/OracleMetadataDialect.java | 4 +- .../src/test/java/config/ignite-test-config.xml | 43 ++ .../ignite/internal/GridFactorySelfTest.java| 9 ++ .../visor/commands/kill/VisorKillCommand.scala | 2 +- 43 files changed, 465 insertions(+), 178 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41508437/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java --
[26/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e3ebcb96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e3ebcb96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e3ebcb96
Branch: refs/heads/ignite-426
Commit: e3ebcb96efd469dd162b5b0e8cd3904ab7003a67
Parents: 98ad892
Author: Valentin Kulichenko
Authored: Tue Aug 4 11:08:45 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 11:08:45 2015 -0700
--
.../configuration/CacheConfiguration.java | 22
.../processors/cache/GridCacheContext.java | 8 ++---
.../dht/atomic/GridDhtAtomicCache.java | 35 +---
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 8 ++---
.../dht/atomic/GridNearAtomicUpdateFuture.java | 30 ++---
5 files changed, 24 insertions(+), 79 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3ebcb96/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index ff32551..3ad0f01 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -219,10 +219,6 @@ public class CacheConfiguration extends
MutableConfiguration {
/** Write ordering mode. */
private CacheAtomicWriteOrderMode atomicWriteOrderMode;
-/** Ordered updates mode. */
-// TODO: IGNITE-104 - Switch default to false
-private boolean atomicOrderedUpdates = true;
-
/** Number of backups for cache. */
private int backups = DFLT_BACKUPS;
@@ -349,7 +345,6 @@ public class CacheConfiguration extends
MutableConfiguration {
aff = cc.getAffinity();
affMapper = cc.getAffinityMapper();
atomicityMode = cc.getAtomicityMode();
-atomicOrderedUpdates = cc.isAtomicOrderedUpdates();
atomicWriteOrderMode = cc.getAtomicWriteOrderMode();
backups = cc.getBackups();
cacheLoaderFactory = cc.getCacheLoaderFactory();
@@ -901,23 +896,6 @@ public class CacheConfiguration extends
MutableConfiguration {
}
/**
- * @return Ordered updates mode.
- */
-public boolean isAtomicOrderedUpdates() {
-return atomicOrderedUpdates;
-}
-
-/**
- * @param atomicOrderedUpdates Ordered updates mode.
- * @return {@code this} for chaining.
- */
-public CacheConfiguration setAtomicOrderedUpdates(boolean
atomicOrderedUpdates) {
-this.atomicOrderedUpdates = atomicOrderedUpdates;
-
-return this;
-}
-
-/**
* Gets number of nodes used to back up single partition for {@link
CacheMode#PARTITIONED} cache.
*
* If not set, default value is {@link #DFLT_BACKUPS}.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3ebcb96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 05ce183..db62f20 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -537,12 +537,8 @@ public class GridCacheContext implements
Externalizable {
* @return {@code True} if entries should not be deleted from cache
immediately.
*/
public boolean deferredDelete(GridCacheAdapter cache) {
-boolean nearAtomic = cache.isNear() &&
cache.configuration().getAtomicityMode() == ATOMIC;
-boolean orderedUpdates =
cache.configuration().isAtomicOrderedUpdates();
-
-return cache.isDht() || cache.isColocated() ||
-(cache.isDhtAtomic() && !orderedUpdates) ||
-(nearAtomic && !orderedUpdates);
+// Only TRANSACTIONAL caches.
+return cache.isDht() || cache.isColocated();
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e3ebcb96/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distribute
[04/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e5c69b83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e5c69b83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e5c69b83
Branch: refs/heads/ignite-426
Commit: e5c69b831a8f564440bd0960cc2a865cd907525a
Parents: 424ab07
Author: Valentin Kulichenko
Authored: Wed Jul 29 14:19:24 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Jul 29 14:19:24 2015 -0700
--
.../dht/atomic/GridDhtAtomicCache.java | 9 --
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 33 +++-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 7 -
3 files changed, 37 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5c69b83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 7a8cc06..02e48df 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1178,6 +1178,9 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
e.printStackTrace();
}
finally {
+if (dhtFut != null && !remap)
+dhtFut.map();
+
if (locked != null)
unlockEntries(locked, req.topologyVersion());
@@ -1221,8 +1224,8 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
else {
// If there are backups, map backup update future.
if (dhtFut != null)
-dhtFut.map();
-// Otherwise, complete the call.
+dhtFut.onMapped();
+// Otherwise, complete the call.
else
completionCb.apply(req, res);
}
@@ -2523,7 +2526,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
catch (ClusterTopologyCheckedException ignored) {
U.warn(log, "Failed to send DHT atomic update response to node
because it left grid: " +
-req.nodeId());
+nodeId);
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to send DHT atomic update response (did node
leave grid?) [nodeId=" + nodeId +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e5c69b83/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 3a68263..15ec121 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -90,6 +90,9 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
/** */
private boolean waitForExchange;
+/** */
+private boolean mapped;
+
/**
* @param cctx Cache context.
* @param completionCb Callback to invoke when future is completed.
@@ -349,37 +352,51 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
GridAtomicMappingKey mappingKey = e.getKey();
GridDhtAtomicUpdateRequest req = e.getValue();
+UUID nodeId = mappingKey.nodeId();
+int part = mappingKey.partition();
+
+assert !nodeId.equals(cctx.localNodeId());
+
try {
if (log.isDebugEnabled())
-log.debug("Sending DHT atomic update request [nodeId="
+ req.nodeId() + ", req=" + req + ']');
+log.debug("Sending DHT atomic update request [nodeId="
+ nodeId + ", req=" + req + ']');
-if (mappingKey.partition() >= 0) {
-Object topic = CU.partitionMessageTopic(cctx,
mappingKey.pa
[47/50] incubator-ignite git commit: Merge branches 'ignite-426' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-426
Merge branches 'ignite-426' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-426 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01b5f569 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01b5f569 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01b5f569 Branch: refs/heads/ignite-426 Commit: 01b5f56970f2535347fc858299afcd8a566ac5ef Parents: 9fe0a8d ae11e9b Author: Valentin Kulichenko Authored: Tue Aug 11 00:02:27 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 11 00:02:27 2015 -0700 -- .../GridCachePartitionExchangeManager.java | 32 1 file changed, 20 insertions(+), 12 deletions(-) --
[34/50] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0551155b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0551155b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0551155b Branch: refs/heads/ignite-426 Commit: 0551155bcdab86ed3409f945db15ade564a167e0 Parents: 2918882 c087be2 Author: Valentin Kulichenko Authored: Tue Aug 4 18:45:49 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 4 18:45:49 2015 -0700 -- .../query/h2/twostep/GridMergeIndexUnsorted.java | 8 +--- .../processors/query/h2/twostep/GridMergeTable.java| 13 +++-- 2 files changed, 8 insertions(+), 13 deletions(-) --
[18/50] incubator-ignite git commit: IGNITE-104 - Fixed compilation
IGNITE-104 - Fixed compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55a2fc6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55a2fc6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55a2fc6b
Branch: refs/heads/ignite-426
Commit: 55a2fc6b1d0e25120f8bba9827d574f5c16af221
Parents: 4150843
Author: Valentin Kulichenko
Authored: Mon Aug 3 13:48:49 2015 -0700
Committer: Valentin Kulichenko
Committed: Mon Aug 3 13:48:49 2015 -0700
--
.../ignite/internal/managers/communication/GridIoManager.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55a2fc6b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 707e5d4..1e609e3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1121,7 +1121,7 @@ public class GridIoManager extends
GridManagerAdapter
* How to use it:
*
- * Replace {@link #send(ClusterNode, Object, int, Message, byte,
boolean, long, boolean, IgniteInClosure)}
+ * Replace {@link #send(ClusterNode, Object, int, Message, byte,
boolean, boolean, long, boolean, IgniteInClosure)}
* with this method.
* Start all grids for your test, then set {@link
#TURBO_DEBUG_MODE} to {@code true}.
* Perform test operations on the topology. No network will be
there.
@@ -1145,6 +1145,7 @@ public class GridIoManager extends
GridManagerAdapter
[01/50] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Repository: incubator-ignite Updated Branches: refs/heads/ignite-426 9fe0a8d56 -> fa494ff1c Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e6f0ac3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e6f0ac3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e6f0ac3c Branch: refs/heads/ignite-426 Commit: e6f0ac3c40be817c08b192b753791979bed7aff4 Parents: a99ef8b a127756 Author: Valentin Kulichenko Authored: Mon Jul 27 13:10:06 2015 -0700 Committer: Valentin Kulichenko Committed: Mon Jul 27 13:10:06 2015 -0700 -- RELEASE_NOTES.txt | 5 + assembly/release-base.xml | 5 + config/ignite-log4j2.xml| 81 +++ config/ignite-log4j2.xml~ | 65 ++ examples/config/example-ignite.xml | 2 +- modules/clients/README.txt | 16 + modules/clients/readme.md | 32 - modules/clients/readme.pdf | Bin 47887 -> 0 bytes .../rest/AbstractRestProcessorSelfTest.java | 1 + .../JettyRestProcessorAbstractSelfTest.java | 657 ++- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../configuration/ConnectorConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 63 +- .../apache/ignite/internal/IgniteKernal.java| 86 ++- .../GridClientConnectionManagerAdapter.java | 2 +- .../client/router/impl/GridTcpRouterImpl.java | 2 +- .../client/ssl/GridSslBasicContextFactory.java | 3 + .../client/ssl/GridSslContextFactory.java | 5 +- .../discovery/GridDiscoveryManager.java | 7 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/rest/GridRestCommand.java| 53 +- .../processors/rest/GridRestProcessor.java | 32 + .../handlers/cache/GridCacheCommandHandler.java | 373 ++- .../query/CacheQueryFieldsMetaResult.java | 133 .../rest/handlers/query/CacheQueryResult.java | 120 .../handlers/query/QueryCommandHandler.java | 292 + .../version/GridVersionCommandHandler.java | 14 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 20 +- .../rest/request/RestSqlQueryRequest.java | 125 .../processors/task/GridTaskProcessor.java | 3 +- .../ignite/internal/util/nio/GridNioServer.java | 28 +- .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/ssl/BlockingSslHandler.java| 519 +++ .../internal/util/nio/ssl/GridNioSslFilter.java | 53 +- .../util/nio/ssl/GridNioSslHandler.java | 79 ++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 58 ++ .../spi/IgniteSpiOperationTimeoutException.java | 43 ++ .../spi/IgniteSpiOperationTimeoutHelper.java| 102 +++ .../communication/tcp/TcpCommunicationSpi.java | 294 +++-- .../ignite/spi/discovery/tcp/ClientImpl.java| 52 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 529 +-- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 11 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 169 - .../tcp/internal/TcpDiscoveryNode.java | 21 + .../TcpDiscoveryConnectionCheckMessage.java | 64 ++ .../apache/ignite/ssl/SslContextFactory.java| 458 + .../org/apache/ignite/ssl/package-info.java | 22 + modules/core/src/test/config/log4j2-test.xml| 57 ++ modules/core/src/test/config/log4j2-test.xml~ | 63 ++ .../src/test/config/log4j2-verbose-test.xml | 48 ++ .../IgniteClientReconnectAbstractTest.java | 4 +- .../IgniteTopologyPrintFormatSelfTest.java | 6 +- .../CacheGetFutureHangsSelfTest.java| 214 ++ .../internal/util/nio/GridNioSslSelfTest.java | 2 +- .../GridAbstractCommunicationSelfTest.java | 13 + .../GridTcpCommunicationSpiAbstractTest.java| 2 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...tionSpiRecoveryFailureDetectionSelfTest.java | 54 ++ ...GridTcpCommunicationSpiRecoverySelfTest.java | 23 +- .../tcp/GridTcpCommunicationSpiSslSelfTest.java | 38 ++ ...unicationSpiTcpFailureDetectionSelfTest.java | 75 +++ .../tcp/IgniteCacheSslStartStopSelfTest.java| 46 ++ .../discovery/AbstractDiscoverySelfTest.java| 36 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 205 ++ .../tcp/TcpClientDiscoverySpiSelfTest.java | 116 +++- .../tcp/TcpDiscoverySpiConfigSelfTest.java | 1 + .../TcpDiscoverySpiFailureTimeoutSelfTest.java | 402 .../tcp/TcpDiscoverySpiSslSelfTest.java | 28 + .../discovery/tcp/TcpDiscoverySslSelfTest.java | 42 ++ .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../ig
[49/50] incubator-ignite git commit: Merge branch 'ignite-104' into ignite-1191
Merge branch 'ignite-104' into ignite-1191 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0bdf04a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0bdf04a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0bdf04a Branch: refs/heads/ignite-426 Commit: b0bdf04a6f49c92c2bac8c00290f70535ae410ec Parents: 2f10184 455d4dc Author: Valentin Kulichenko Authored: Tue Aug 11 00:25:10 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 11 00:25:10 2015 -0700 -- --
[28/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b73fa67f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b73fa67f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b73fa67f
Branch: refs/heads/ignite-426
Commit: b73fa67ffb2c86c4a09efe554bfc738a21a52d3b
Parents: 6f042ae
Author: Valentin Kulichenko
Authored: Tue Aug 4 11:28:31 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 11:28:31 2015 -0700
--
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b73fa67f/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index aa84346..bafdfef 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -103,7 +103,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(IgniteClientNodeAffinityTest.class);
// Swap tests.
-//suite.addTestSuite(GridCacheSwapPreloadSelfTest.class); // TODO:
IGNITE-104
+suite.addTestSuite(GridCacheSwapPreloadSelfTest.class);
suite.addTestSuite(GridCacheSwapReloadSelfTest.class);
// Common tests.
[03/50] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/424ab07c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/424ab07c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/424ab07c Branch: refs/heads/ignite-426 Commit: 424ab07cb3dff8f7aeafeb1de5af1af8045145e3 Parents: 03e48ba 5288b2d Author: Valentin Kulichenko Authored: Wed Jul 29 12:39:02 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Jul 29 12:39:02 2015 -0700 -- .../datastreamer/DataStreamerImpl.java | 22 .../datastreamer/DataStreamerUpdateJob.java | 20 +- 2 files changed, 41 insertions(+), 1 deletion(-) --
[41/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc394436
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc394436
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc394436
Branch: refs/heads/ignite-426
Commit: bc394436a89c945cbca1c4f158b00f19951cf47e
Parents: 6c7358d
Author: Valentin Kulichenko
Authored: Wed Aug 5 17:05:35 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Aug 5 17:05:35 2015 -0700
--
.../dht/atomic/GridAtomicRequestTopic.java | 44
.../dht/atomic/GridDhtAtomicCache.java | 8 ++--
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +-
4 files changed, 42 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc394436/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicRequestTopic.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicRequestTopic.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicRequestTopic.java
index 9feb409..709f739 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicRequestTopic.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridAtomicRequestTopic.java
@@ -28,13 +28,41 @@ class GridAtomicRequestTopic implements Externalizable {
private static final long serialVersionUID = 0L;
/** */
+private static final byte NEAR_UPDATE_REQ = 1;
+
+/** */
+private static final byte DHT_UPDATE_REQ = 2;
+
+/** */
private int cacheId;
/** */
private int part;
/** */
-private boolean near;
+private byte type;
+
+/**
+ * Near request topic.
+ *
+ * @param cacheId Cache ID.
+ * @param part Partition.
+ * @return Topic.
+ */
+static GridAtomicRequestTopic nearUpdateRequest(int cacheId, int part) {
+return new GridAtomicRequestTopic(cacheId, part, NEAR_UPDATE_REQ);
+}
+
+/**
+ * DHT request topic.
+ *
+ * @param cacheId Cache ID.
+ * @param part Partition.
+ * @return Topic.
+ */
+static GridAtomicRequestTopic dhtUpdateRequest(int cacheId, int part) {
+return new GridAtomicRequestTopic(cacheId, part, DHT_UPDATE_REQ);
+}
/**
* For {@link Externalizable}.
@@ -46,12 +74,12 @@ class GridAtomicRequestTopic implements Externalizable {
/**
* @param cacheId Cache ID.
* @param part Partition.
- * @param near Near flag.
+ * @param type Type.
*/
-GridAtomicRequestTopic(int cacheId, int part, boolean near) {
+private GridAtomicRequestTopic(int cacheId, int part, byte type) {
this.cacheId = cacheId;
this.part = part;
-this.near = near;
+this.type = type;
}
/** {@inheritDoc} */
@@ -62,7 +90,7 @@ class GridAtomicRequestTopic implements Externalizable {
GridAtomicRequestTopic topic = (GridAtomicRequestTopic)o;
-return cacheId == topic.cacheId && part == topic.part && near ==
topic.near;
+return cacheId == topic.cacheId && part == topic.part && type ==
topic.type;
}
/** {@inheritDoc} */
@@ -70,7 +98,7 @@ class GridAtomicRequestTopic implements Externalizable {
int res = cacheId;
res = 31 * res + part;
-res = 31 * res + (near ? 1 : 0);
+res = 31 * res + type;
return res;
}
@@ -79,14 +107,14 @@ class GridAtomicRequestTopic implements Externalizable {
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(cacheId);
out.writeInt(part);
-out.writeBoolean(near);
+out.writeByte(type);
}
/** {@inheritDoc} */
@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
cacheId = in.readInt();
part = in.readInt();
-near = in.readBoolean();
+type = in.readByte();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc394436/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/o
[09/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5241e274
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5241e274
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5241e274
Branch: refs/heads/ignite-426
Commit: 5241e2747ad54e901d9e4908caee40a3e38b5ab7
Parents: aa11f64
Author: Valentin Kulichenko
Authored: Wed Jul 29 23:26:59 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Jul 29 23:26:59 2015 -0700
--
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5241e274/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 3084e68..be35d00 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1164,7 +1164,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
}
catch (GridCacheEntryRemovedException e) {
-assert false : "Entry should not become obsolete while holding
lock.";
+assert !ctx.deferredDelete() : "Entry should not become
obsolete while holding lock.";
e.printStackTrace();
}
[07/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/112c567c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/112c567c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/112c567c
Branch: refs/heads/ignite-426
Commit: 112c567cb780fc04a0d81c9b8b1e1f60cd2fbabf
Parents: 9781ea4
Author: Valentin Kulichenko
Authored: Wed Jul 29 17:58:33 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Jul 29 17:58:33 2015 -0700
--
.../dht/atomic/GridNearAtomicUpdateRequest.java | 48 +++-
.../atomic/GridNearAtomicUpdateResponse.java| 20 ++--
2 files changed, 20 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/112c567c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
index 734cf6d..86c5ab8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java
@@ -666,60 +666,54 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage implements Gri
writer.incrementState();
case 16:
-//if (!writer.writeInt("part", part))
-//return false;
-
-writer.incrementState();
-
-case 17:
if (!writer.writeBoolean("retval", retval))
return false;
writer.incrementState();
-case 18:
+case 17:
if (!writer.writeBoolean("skipStore", skipStore))
return false;
writer.incrementState();
-case 19:
+case 18:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
-case 20:
+case 19:
if (!writer.writeByte("syncMode", syncMode != null ?
(byte)syncMode.ordinal() : -1))
return false;
writer.incrementState();
-case 21:
+case 20:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
-case 22:
+case 21:
if (!writer.writeBoolean("topLocked", topLocked))
return false;
writer.incrementState();
-case 23:
+case 22:
if (!writer.writeMessage("topVer", topVer))
return false;
writer.incrementState();
-case 24:
+case 23:
if (!writer.writeMessage("updateVer", updateVer))
return false;
writer.incrementState();
-case 25:
+case 24:
if (!writer.writeCollection("vals", vals,
MessageCollectionItemType.MSG))
return false;
@@ -850,14 +844,6 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage implements Gri
reader.incrementState();
case 16:
-//part = reader.readInt("part");
-//
-//if (!reader.isLastRead())
-//return false;
-
-reader.incrementState();
-
-case 17:
retval = reader.readBoolean("retval");
if (!reader.isLastRead())
@@ -865,7 +851,7 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage implements Gri
reader.incrementState();
-case 18:
+case 17:
skipStore = reader.readBoolean("skipStore");
if (!reader.isLastRead())
@@ -873,7 +859,7 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage implements Gri
reader.incrementState();
-case 19:
+case 18:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -881,7 +867,7 @@ public class GridNearAtomicUpdateRequest extends
GridCacheMessage implements Gri
reader.incrementState();
-case 20:
[39/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d995af8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d995af8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d995af8
Branch: refs/heads/ignite-426
Commit: 3d995af8af09568f900ff0ffed1ccca37543ceab
Parents: c8b67de
Author: Valentin Kulichenko
Authored: Wed Aug 5 16:19:07 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Aug 5 16:19:07 2015 -0700
--
.../ignite/internal/processors/cache/GridCacheContext.java | 4 ++--
.../processors/cache/GridCacheAbstractRemoveFailureTest.java | 6 --
2 files changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d995af8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index db62f20..5f17746 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -537,8 +537,8 @@ public class GridCacheContext implements
Externalizable {
* @return {@code True} if entries should not be deleted from cache
immediately.
*/
public boolean deferredDelete(GridCacheAdapter cache) {
-// Only TRANSACTIONAL caches.
-return cache.isDht() || cache.isColocated();
+return cache.isDht() || cache.isDhtAtomic() || cache.isColocated() ||
+(cache.isNear() && cache.configuration().getAtomicityMode() ==
ATOMIC);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d995af8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 2b6a6b0..b71f848 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -322,11 +322,13 @@ public abstract class GridCacheAbstractRemoveFailureTest
extends GridCacheAbstra
boolean primary =
affinity(cache).isPrimary(ignite.cluster().localNode(), expVal.getKey());
boolean backup =
affinity(cache).isBackup(ignite.cluster().localNode(), expVal.getKey());
-log.error("Unexpected cache data [exp=" + expVal +
+log.error("Unexpected cache data [" +
+"key=" + expVal.getKey() +
+", exp=" + expVal.getValue().get() +
", actual=" + val +
", nodePrimary=" + primary +
", nodeBackup=" + backup +
-", nodeIdx" + i +
+", nodeIdx=" + i +
", nodeId=" + ignite.cluster().localNode().id() + ']');
}
}
[35/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b09e15f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b09e15f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b09e15f
Branch: refs/heads/ignite-426
Commit: 1b09e15f34af5a7c4296eab8c278bac8103af48d
Parents: 0551155
Author: Valentin Kulichenko
Authored: Tue Aug 4 22:20:14 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 22:20:14 2015 -0700
--
.../near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b09e15f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
index f30ea71..64bace5 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java
@@ -412,10 +412,12 @@ public class GridCacheNearOnlyMultiNodeFullApiSelfTest
extends GridCachePartitio
GridCacheEntryEx entry = dht.peekEx(key);
-assert entry != null;
-
-assertEquals(0, entry.ttl());
-assertEquals(0, entry.expireTime());
+if (atomicityMode() == CacheAtomicityMode.ATOMIC)
+assertNull(entry);
+else {
+assertEquals(0, entry.ttl());
+assertEquals(0, entry.expireTime());
+}
}
// Ensure that next update will not pick old expire time.
[48/50] incubator-ignite git commit: Merge branch 'ignite-104' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1191
Merge branch 'ignite-104' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1191 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f101848 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f101848 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f101848 Branch: refs/heads/ignite-426 Commit: 2f101848aee3b4f33b66a99d147b9f01331f92bf Parents: ae11e9b 2a8b548 Author: Valentin Kulichenko Authored: Tue Aug 11 00:24:49 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 11 00:24:49 2015 -0700 -- .../ignite/codegen/MessageCodeGenerator.java| 8 + .../org/apache/ignite/internal/GridTopic.java | 2 +- .../IgniteLocalNodeStoppedException.java| 55 + .../managers/communication/GridIoManager.java | 247 +-- .../managers/communication/GridIoMessage.java | 48 +++- .../cache/GridCacheEvictionManager.java | 11 +- .../processors/cache/GridCacheIoManager.java| 132 -- .../processors/cache/GridCacheMapEntry.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 15 +- .../dht/atomic/GridAtomicMappingKey.java| 86 +++ .../dht/atomic/GridAtomicRequestTopic.java | 124 ++ .../dht/atomic/GridDhtAtomicCache.java | 128 ++ .../GridDhtAtomicDeferredUpdateResponse.java| 32 ++- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 95 --- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 81 +++--- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 33 ++- .../dht/atomic/GridNearAtomicUpdateFuture.java | 238 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 63 +++-- .../atomic/GridNearAtomicUpdateResponse.java| 34 ++- .../preloader/GridDhtPartitionDemandPool.java | 15 +- .../distributed/near/GridNearAtomicCache.java | 32 ++- .../query/GridCacheDistributedQueryManager.java | 8 +- .../resources/META-INF/classnames.properties| 3 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheTransformEventSelfTest.java| 14 +- ...niteCacheClientNodeChangingTopologyTest.java | 4 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 - .../IgniteCacheLoaderWriterAbstractTest.java| 2 +- .../IgniteCacheStoreSessionAbstractTest.java| 2 +- .../junits/common/GridCommonAbstractTest.java | 22 +- 31 files changed, 1197 insertions(+), 359 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f101848/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java --
[37/50] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7b161f0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7b161f0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7b161f0f Branch: refs/heads/ignite-426 Commit: 7b161f0f2e107a3adbbfaeddc5b086ab5890ce5f Parents: 05b27aa 023ffe0 Author: Valentin Kulichenko Authored: Wed Aug 5 11:41:55 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Aug 5 11:41:55 2015 -0700 -- .../processors/cache/GridCacheProcessor.java| 10 +++- .../ignite/internal/util/GridLogThrottle.java | 63 +++- .../ignite/spi/discovery/tcp/ClientImpl.java| 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 5 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 5 ++ .../query/h2/twostep/GridMapQueryExecutor.java | 7 ++- .../h2/twostep/GridReduceQueryExecutor.java | 7 ++- modules/log4j2/README.txt | 15 - .../ignite/logger/log4j2/Log4J2Logger.java | 2 +- .../ignite/logger/log4j2/Log4j2FileAware.java | 35 --- 11 files changed, 107 insertions(+), 62 deletions(-) --
[42/50] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de86990e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de86990e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de86990e Branch: refs/heads/ignite-426 Commit: de86990ee3fcff825da0f156fba1de4de6f8e92a Parents: bc39443 d9acbd1 Author: Valentin Kulichenko Authored: Thu Aug 6 11:36:25 2015 -0700 Committer: Valentin Kulichenko Committed: Thu Aug 6 11:36:25 2015 -0700 -- assembly/release-hadoop.xml | 5 + .../cache/query/GridCacheSqlQuery.java | 33 ++- .../cache/query/GridCacheTwoStepQuery.java | 34 +-- .../ignite/spi/discovery/tcp/ClientImpl.java| 28 +- .../TcpDiscoveryMulticastIpFinder.java | 7 +- .../processors/query/h2/IgniteH2Indexing.java | 27 +- .../processors/query/h2/sql/GridSqlElement.java | 18 +- .../query/h2/sql/GridSqlFunction.java | 17 +- .../processors/query/h2/sql/GridSqlQuery.java | 4 +- .../query/h2/sql/GridSqlQueryParser.java| 94 --- .../query/h2/sql/GridSqlQuerySplitter.java | 117 + .../processors/query/h2/sql/GridSqlSelect.java | 76 +++--- .../processors/query/h2/sql/GridSqlType.java| 24 +- .../processors/query/h2/sql/GridSqlUnion.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 211 ++- .../query/h2/twostep/GridThreadLocalTable.java | 262 +++ .../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +- .../config/benchmark-multicast.properties | 1 + parent/pom.xml | 97 --- scripts/git-apply-patch.sh | 94 --- scripts/git-patch-functions.sh | 56 +--- 21 files changed, 697 insertions(+), 512 deletions(-) --
[23/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d26184ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d26184ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d26184ab
Branch: refs/heads/ignite-426
Commit: d26184ab0cfbf81dc55b502342cd56baa50d1421
Parents: 25a109b
Author: Valentin Kulichenko
Authored: Mon Aug 3 21:38:56 2015 -0700
Committer: Valentin Kulichenko
Committed: Mon Aug 3 21:38:56 2015 -0700
--
.../java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d26184ab/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
index bafdfef..aa84346 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java
@@ -103,7 +103,7 @@ public class IgniteCacheTestSuite extends TestSuite {
suite.addTestSuite(IgniteClientNodeAffinityTest.class);
// Swap tests.
-suite.addTestSuite(GridCacheSwapPreloadSelfTest.class);
+//suite.addTestSuite(GridCacheSwapPreloadSelfTest.class); // TODO:
IGNITE-104
suite.addTestSuite(GridCacheSwapReloadSelfTest.class);
// Common tests.
[38/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c8b67de1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c8b67de1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c8b67de1
Branch: refs/heads/ignite-426
Commit: c8b67de10e3a4ccee5c828fb31f542821724ae0b
Parents: 7b161f0
Author: Valentin Kulichenko
Authored: Wed Aug 5 15:28:30 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Aug 5 15:28:30 2015 -0700
--
.../dht/atomic/GridNearAtomicUpdateFuture.java | 33 +---
1 file changed, 14 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8b67de1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index c4704cf..5b364a5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -395,27 +395,23 @@ public class GridNearAtomicUpdateFuture extends
GridFutureAdapter
Iterator conflictPutValsIt = conflictPutVals != null
? conflictPutVals.iterator() : null;
Iterator conflictRmvValsIt = conflictRmvVals != null
? conflictRmvVals.iterator() : null;
-for (Object key : failed) {
-while (keyIt.hasNext()) {
-Object nextKey = keyIt.next();
-Object nextVal = valsIt != null ? valsIt.next() : null;
-GridCacheDrInfo nextConflictPutVal = conflictPutValsIt != null
? conflictPutValsIt.next() : null;
-GridCacheVersion nextConflictRmvVal = conflictRmvValsIt !=
null ? conflictRmvValsIt.next() : null;
+while (keyIt.hasNext()) {
+Object nextKey = keyIt.next();
+Object nextVal = valsIt != null ? valsIt.next() : null;
+GridCacheDrInfo nextConflictPutVal = conflictPutValsIt != null ?
conflictPutValsIt.next() : null;
+GridCacheVersion nextConflictRmvVal = conflictRmvValsIt != null ?
conflictRmvValsIt.next() : null;
-if (F.eq(key, nextKey)) {
-remapKeys.add(nextKey);
+if (failed.contains(nextKey)) {
+remapKeys.add(nextKey);
-if (remapVals != null)
-remapVals.add(nextVal);
+if (remapVals != null)
+remapVals.add(nextVal);
-if (remapConflictPutVals != null)
-remapConflictPutVals.add(nextConflictPutVal);
+if (remapConflictPutVals != null)
+remapConflictPutVals.add(nextConflictPutVal);
-if (remapConflictRmvVals != null)
-remapConflictRmvVals.add(nextConflictRmvVal);
-
-break;
-}
+if (remapConflictRmvVals != null)
+remapConflictRmvVals.add(nextConflictRmvVal);
}
}
@@ -473,8 +469,7 @@ public class GridNearAtomicUpdateFuture extends
GridFutureAdapter
CachePartialUpdateCheckedException cause = X.cause(err,
CachePartialUpdateCheckedException.class);
-if (F.isEmpty(cause.failedKeys()))
-cause.printStackTrace();
+assert !F.isEmpty(cause.failedKeys());
remap(cause.failedKeys());
[40/50] incubator-ignite git commit: Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c7358db Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c7358db Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c7358db Branch: refs/heads/ignite-426 Commit: 6c7358db22e008f383acb356a3922107531c063b Parents: 3d995af 2173b0e Author: Valentin Kulichenko Authored: Wed Aug 5 16:54:04 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Aug 5 16:54:04 2015 -0700 -- .../org/apache/ignite/spark/IgniteContext.scala | 19 +-- 1 file changed, 17 insertions(+), 2 deletions(-) --
[02/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/03e48ba8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/03e48ba8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/03e48ba8
Branch: refs/heads/ignite-426
Commit: 03e48ba8ccb417cfd1f512f2bd1efe6ceb6c86fa
Parents: e6f0ac3
Author: Valentin Kulichenko
Authored: Tue Jul 28 22:19:49 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Jul 28 22:19:49 2015 -0700
--
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/03e48ba8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index bb036da..7a8cc06 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1764,7 +1764,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
dhtFut.addNearWriteEntries(filteredReaders,
entry,
updRes.newValue(),
-null,
+op == TRANSFORM ? req.entryProcessor(i) : null,
updRes.newTtl(),
updRes.conflictExpireTime());
}
[11/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d16d99f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d16d99f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d16d99f
Branch: refs/heads/ignite-426
Commit: 2d16d99f64fdfbff591124abcb4c5d42ac29d8bf
Parents: dad4691
Author: Valentin Kulichenko
Authored: Thu Jul 30 16:48:30 2015 -0700
Committer: Valentin Kulichenko
Committed: Thu Jul 30 16:48:30 2015 -0700
--
.../ignite/codegen/MessageCodeGenerator.java| 2 +
.../org/apache/ignite/internal/GridTopic.java | 83
.../managers/communication/GridIoManager.java | 199 ++-
.../managers/communication/GridIoMessage.java | 48 +++--
.../processors/cache/GridCacheIoManager.java| 99 +++--
.../processors/cache/GridCacheUtils.java| 11 -
.../dht/atomic/GridAtomicMappingKey.java| 86
.../dht/atomic/GridAtomicRequestTopic.java | 96 +
.../dht/atomic/GridDhtAtomicCache.java | 33 ++-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 89 ++---
.../dht/atomic/GridNearAtomicUpdateFuture.java | 172 +++-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 63 --
.../atomic/GridNearAtomicUpdateResponse.java| 36 +++-
.../preloader/GridDhtPartitionDemandPool.java | 15 +-
.../query/GridCacheDistributedQueryManager.java | 8 +-
.../resources/META-INF/classnames.properties| 2 +-
16 files changed, 730 insertions(+), 312 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d16d99f/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
--
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index c560118..2510d65 100644
---
a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -142,6 +142,8 @@ public class MessageCodeGenerator {
MessageCodeGenerator gen = new MessageCodeGenerator(srcDir);
+//gen.generateAndWrite(GridIoMessage.class);
+
//gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
//gen.generateAndWrite(GridNearAtomicUpdateResponse.class);
//gen.generateAndWrite(GridDhtAtomicUpdateRequest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d16d99f/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
index e9da40c..56aea1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
@@ -183,15 +183,6 @@ public enum GridTopic {
}
/**
- * @param id1 ID1.
- * @param id2 ID2.
- * @return Grid message topic with specified IDs.
- */
-public Object topic(int id1, int id2) {
-return new T9(this, id1, id2);
-}
-
-/**
*
*/
private static class T1 implements Externalizable {
@@ -765,78 +756,4 @@ public enum GridTopic {
return S.toString(T8.class, this);
}
}
-
-/**
- */
-private static class T9 implements Externalizable {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** */
-private GridTopic topic;
-
-/** */
-private int id1;
-
-/** */
-private int id2;
-
-/**
- * No-arg constructor needed for {@link Serializable}.
- */
-public T9() {
-// No-op.
-}
-
-/**
- * @param topic Topic.
- * @param id1 ID1.
- * @param id2 ID2.
- */
-private T9(GridTopic topic, int id1, int id2) {
-this.topic = topic;
-this.id1 = id1;
-this.id2 = id2;
-}
-
-/** {@inheritDoc} */
-@Override public int hashCode() {
-int res = topic.ordinal();
-
-res += 31 * res + id1;
-res += 31 * res + id2;
-
-return res;
-}
-
-/** {@inheritDoc} */
-@Override public boolean equals(Object obj) {
-if (obj.getClass() == T9.class) {
-T9 that = (T9)obj;
-
-return topic == that.topic && id1 == that.id1 && id2 ==
that.id2;
-
[50/50] incubator-ignite git commit: Merge branch 'ignite-1191' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-426
Merge branch 'ignite-1191' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-426 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa494ff1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa494ff1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa494ff1 Branch: refs/heads/ignite-426 Commit: fa494ff1c44616aa20cb75aa5b6704cfbe1efd36 Parents: 01b5f56 b0bdf04 Author: Valentin Kulichenko Authored: Tue Aug 11 00:26:25 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Aug 11 00:26:25 2015 -0700 -- .../ignite/codegen/MessageCodeGenerator.java| 8 + .../org/apache/ignite/internal/GridTopic.java | 2 +- .../IgniteLocalNodeStoppedException.java| 55 + .../managers/communication/GridIoManager.java | 247 +-- .../managers/communication/GridIoMessage.java | 48 +++- .../cache/GridCacheEvictionManager.java | 11 +- .../processors/cache/GridCacheIoManager.java| 132 -- .../processors/cache/GridCacheMapEntry.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 15 +- .../dht/atomic/GridAtomicMappingKey.java| 86 +++ .../dht/atomic/GridAtomicRequestTopic.java | 124 ++ .../dht/atomic/GridDhtAtomicCache.java | 128 ++ .../GridDhtAtomicDeferredUpdateResponse.java| 32 ++- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 95 --- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 81 +++--- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 33 ++- .../dht/atomic/GridNearAtomicUpdateFuture.java | 238 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 63 +++-- .../atomic/GridNearAtomicUpdateResponse.java| 34 ++- .../preloader/GridDhtPartitionDemandPool.java | 15 +- .../distributed/near/GridNearAtomicCache.java | 32 ++- .../query/GridCacheDistributedQueryManager.java | 8 +- .../resources/META-INF/classnames.properties| 3 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheTransformEventSelfTest.java| 14 +- ...niteCacheClientNodeChangingTopologyTest.java | 4 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 - .../IgniteCacheLoaderWriterAbstractTest.java| 2 +- .../IgniteCacheStoreSessionAbstractTest.java| 2 +- .../junits/common/GridCommonAbstractTest.java | 22 +- 31 files changed, 1197 insertions(+), 359 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa494ff1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fa494ff1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java --
[06/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9781ea43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9781ea43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9781ea43
Branch: refs/heads/ignite-426
Commit: 9781ea4384a553e5126b8a7320f7070f6a340809
Parents: 7c73fc5
Author: Valentin Kulichenko
Authored: Wed Jul 29 17:57:49 2015 -0700
Committer: Valentin Kulichenko
Committed: Wed Jul 29 17:57:49 2015 -0700
--
.../org/apache/ignite/internal/GridTopic.java | 17 +-
.../processors/cache/GridCacheIoManager.java| 3 +-
.../processors/cache/GridCacheUtils.java| 4 +-
.../dht/atomic/GridDhtAtomicCache.java | 29 ++--
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 172 ++-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 27 +--
.../atomic/GridNearAtomicUpdateResponse.java| 28 +--
8 files changed, 87 insertions(+), 195 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9781ea43/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
index 3cf92f8..e9da40c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTopic.java
@@ -185,11 +185,10 @@ public enum GridTopic {
/**
* @param id1 ID1.
* @param id2 ID2.
- * @param id3 ID3.
* @return Grid message topic with specified IDs.
*/
-public Object topic(int id1, int id2, byte id3) {
-return new T9(this, id1, id2, id3);
+public Object topic(int id1, int id2) {
+return new T9(this, id1, id2);
}
/**
@@ -782,9 +781,6 @@ public enum GridTopic {
/** */
private int id2;
-/** */
-private int id3;
-
/**
* No-arg constructor needed for {@link Serializable}.
*/
@@ -796,13 +792,11 @@ public enum GridTopic {
* @param topic Topic.
* @param id1 ID1.
* @param id2 ID2.
- * @param id3 ID3.
*/
-private T9(GridTopic topic, int id1, int id2, byte id3) {
+private T9(GridTopic topic, int id1, int id2) {
this.topic = topic;
this.id1 = id1;
this.id2 = id2;
-this.id3 = id3;
}
/** {@inheritDoc} */
@@ -811,7 +805,6 @@ public enum GridTopic {
res += 31 * res + id1;
res += 31 * res + id2;
-res += 31 * res + id3;
return res;
}
@@ -821,7 +814,7 @@ public enum GridTopic {
if (obj.getClass() == T9.class) {
T9 that = (T9)obj;
-return topic == that.topic && id1 == that.id1 && id2 ==
that.id2 && id3 == that.id3;
+return topic == that.topic && id1 == that.id1 && id2 ==
that.id2;
}
return false;
@@ -832,7 +825,6 @@ public enum GridTopic {
out.writeByte(topic.ordinal());
out.writeInt(id1);
out.writeInt(id2);
-out.writeByte(id3);
}
/** {@inheritDoc} */
@@ -840,7 +832,6 @@ public enum GridTopic {
topic = fromOrdinal(in.readByte());
id1 = in.readInt();
id2 = in.readInt();
-id3 = in.readByte();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9781ea43/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 dec6aef..5858424 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
@@ -394,8 +394,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
GridNearAtomicUpdateResponse res = new
GridNearAtomicUpdateResponse(
ctx.cacheId(),
nodeId,
-req.futureVersion(),
-req.partition());
+req.futureVersion());
res.error(req.classError());
[30/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d9ea018
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d9ea018
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d9ea018
Branch: refs/heads/ignite-426
Commit: 7d9ea018b28dedaece1f71598921232829fecdb8
Parents: aeac6aa
Author: Valentin Kulichenko
Authored: Tue Aug 4 18:02:46 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Aug 4 18:02:46 2015 -0700
--
.../processors/cache/distributed/near/GridNearAtomicCache.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d9ea018/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index b3f4a1d..2255988 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -285,8 +285,6 @@ public class GridNearAtomicCache extends
GridNearCacheAdapter {
Collection backupKeys = req.keys();
-boolean intercept = req.forceTransformBackups() &&
ctx.config().getInterceptor() != null;
-
String taskName =
ctx.kernalContext().task().resolveTaskName(req.taskNameHash());
for (int i = 0; i < req.nearSize(); i++) {
@@ -341,7 +339,7 @@ public class GridNearAtomicCache extends
GridNearCacheAdapter {
expireTime,
null,
false,
-intercept,
+/*intercept*/false,
req.subjectId(),
taskName);
[45/50] incubator-ignite git commit: # Fixed potential NPE in GridCachePartitionExchangeManager.dumpPendingObjects
# Fixed potential NPE in GridCachePartitionExchangeManager.dumpPendingObjects
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae11e9b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae11e9b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae11e9b5
Branch: refs/heads/ignite-426
Commit: ae11e9b5aa9af4d0d58e2a16dd3a3331969961df
Parents: 19fb305
Author: sboikov
Authored: Tue Aug 11 09:42:02 2015 +0300
Committer: sboikov
Committed: Tue Aug 11 09:42:43 2015 +0300
--
.../GridCachePartitionExchangeManager.java | 32
1 file changed, 20 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae11e9b5/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 cf49197..e00d3b7 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
@@ -984,25 +984,33 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
*
*/
public void dumpPendingObjects() {
-U.warn(log, "Pending transactions:");
+IgniteTxManager tm = cctx.tm();
-for (IgniteInternalTx tx : cctx.tm().activeTransactions())
-U.warn(log, ">>> " + tx);
+if (tm != null) {
+U.warn(log, "Pending transactions:");
-U.warn(log, "Pending explicit locks:");
+for (IgniteInternalTx tx : tm.activeTransactions())
+U.warn(log, ">>> " + tx);
+}
-for (GridCacheExplicitLockSpan lockSpan :
cctx.mvcc().activeExplicitLocks())
-U.warn(log, ">>> " + lockSpan);
+GridCacheMvccManager mvcc = cctx.mvcc();
-U.warn(log, "Pending cache futures:");
+if (mvcc != null) {
+U.warn(log, "Pending explicit locks:");
-for (GridCacheFuture fut : cctx.mvcc().activeFutures())
-U.warn(log, ">>> " + fut);
+for (GridCacheExplicitLockSpan lockSpan :
mvcc.activeExplicitLocks())
+U.warn(log, ">>> " + lockSpan);
-U.warn(log, "Pending atomic cache futures:");
+U.warn(log, "Pending cache futures:");
-for (GridCacheFuture fut : cctx.mvcc().atomicFutures())
-U.warn(log, ">>> " + fut);
+for (GridCacheFuture fut : mvcc.activeFutures())
+U.warn(log, ">>> " + fut);
+
+U.warn(log, "Pending atomic cache futures:");
+
+for (GridCacheFuture fut : mvcc.atomicFutures())
+U.warn(log, ">>> " + fut);
+}
}
/**
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-1.3.3-p1 [created] 7d747d2ac
incubator-ignite git commit: 1.3.3-p1-SNAPSHOT
Repository: incubator-ignite Updated Branches: refs/heads/ignite-1.3.3-p1 7d747d2ac -> 834b34765 1.3.3-p1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/834b3476 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/834b3476 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/834b3476 Branch: refs/heads/ignite-1.3.3-p1 Commit: 834b34765fac4cb87d9d8f4bdb39c14a9e61275d Parents: 7d747d2 Author: Ignite Teamcity Authored: Tue Aug 11 10:53:58 2015 +0300 Committer: Ignite Teamcity Committed: Tue Aug 11 10:53:58 2015 +0300 -- examples/pom.xml | 2 +- modules/aop/pom.xml| 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml| 2 +- modules/clients/pom.xml| 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml| 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties | 2 +- modules/extdata/p2p/pom.xml| 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml| 2 +- modules/gce/pom.xml| 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml| 2 +- modules/jta/pom.xml| 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml| 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml| 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml| 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- pom.xml| 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/834b3476/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 1338a18..014cb0a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -1.3.3-SNAPSHOT +1.3.3-p1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/834b3476/modules/aop/pom.xml -- diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml index 194ffab..1983567 100644 --- a/modules/aop/pom.xml +++ b/modules/aop/pom.xml @@ -31,7 +31,7 @@ ignite-aop -1.3.3-SNAPSHOT +1.3.3-p1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/834b3476/modules/apache-license-gen/pom.xml -- diff --git a/modules/apache-license-gen/pom.xml b/modules/apache-license-gen/pom.xml index 11259a5..c723729 100644 --- a/modules/apache-license-gen/pom.xml +++ b/modules/apache-license-gen/pom.xml @@ -31,5 +31,5 @@ org.apache.ignite ignite-apache-license-gen -1.3.3-SNAPSHOT +1.3.3-p1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/834b3476/modules/aws/pom.xml -- diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml index 37f6250..1f92999 100644 --- a/modules/aws/pom.xml +++ b/modules/aws/pom.xml @@ -31,7 +31,7 @@ ignite-aws -1.3.3-SNAPSHOT +1.3.3-p1-SNAPSHOT http://git-wip-us.apache.org/re
incubator-ignite git commit: # ignite-1175: call 'onDeferredDelete' from innerRemover
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1.3.3-p1 834b34765 -> 51dcd518e
# ignite-1175: call 'onDeferredDelete' from innerRemover
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51dcd518
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51dcd518
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51dcd518
Branch: refs/heads/ignite-1.3.3-p1
Commit: 51dcd518e51883ca043492a86928cf3488db4bd7
Parents: 834b347
Author: sboikov
Authored: Tue Aug 11 11:30:02 2015 +0300
Committer: sboikov
Committed: Tue Aug 11 11:39:54 2015 +0300
--
.../processors/cache/GridCacheMapEntry.java | 4 +-
...cheDhtLocalPartitionAfterRemoveSelfTest.java | 112 +++
.../testsuites/IgniteCacheTestSuite2.java | 1 +
3 files changed, 116 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51dcd518/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 4680994..a078bed 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
@@ -1232,7 +1232,9 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx {
if (writeThrough)
cctx.store().remove(tx, keyValue(false));
-if (!cctx.deferredDelete()) {
+if (cctx.deferredDelete() && !detached() && !isInternal())
+cctx.onDeferredDelete(this, newVer);
+else {
boolean marked = false;
synchronized (this) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51dcd518/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
new file mode 100644
index 000..a930d35
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
@@ -0,0 +1,112 @@
+/*
+ * 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 org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.cache.distributed.dht.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+
+/**
+ * Test for remove operation.
+ */
+public class CacheDhtLocalPartitionAfterRemoveSelfTest extends
GridCommonAbstractTest {
+/** Grid count. */
+private static final int GRID_CNT = 3;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration ccfg = new CacheConfiguration();
+
+ccfg.setAtomicityMode(TRANSACTIONAL);
+ccfg.setNearConfiguration(null);
+
+cfg.setCacheConfiguration(ccfg);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
+@Override protected void beforeTestsStarted() throws Exception {
+startGrids(GRID_CNT);
+}
+
+/** {@inheritDoc} */
+@Override protected void afterTestsStopped() throws Exception {
+stopAllGrids();
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testMemoryUsa
[16/50] incubator-ignite git commit: ignite-1189: fixing deadlock
ignite-1189: fixing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d528bec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d528bec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d528bec
Branch: refs/heads/ignite-1108
Commit: 4d528becc1cd3db9d4d2d6db2053895043aa3918
Parents: 132562b
Author: Denis Magda
Authored: Tue Aug 4 13:04:35 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 13:04:35 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 29 +---
1 file changed, 19 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d528bec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index cd6e28d..470efdd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1176,6 +1176,12 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
catch (Exception e) {
U.error(log, "Unexpected exception during cache update", e);
+
+res.addFailedKeys(keys, e);
+
+completionCb.apply(req, res);
+
+return;
}
if (remap) {
@@ -2167,19 +2173,22 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
// Enqueue entries while holding locks.
Collection skip = null;
-for (GridCacheMapEntry entry : locked) {
-if (entry != null && entry.deleted()) {
-if (skip == null)
-skip = new HashSet<>(locked.size(), 1.0f);
+try {
+for (GridCacheMapEntry entry : locked) {
+if (entry != null && entry.deleted()) {
+if (skip == null)
+skip = new HashSet<>(locked.size(), 1.0f);
-skip.add(entry.key());
+skip.add(entry.key());
+}
}
}
-
-// Release locks.
-for (GridCacheMapEntry entry : locked) {
-if (entry != null)
-UNSAFE.monitorExit(entry);
+finally {
+// Release locks.
+for (GridCacheMapEntry entry : locked) {
+if (entry != null)
+UNSAFE.monitorExit(entry);
+}
}
// Try evict partitions.
[21/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38810b63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38810b63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38810b63 Branch: refs/heads/ignite-1108 Commit: 38810b639fbcf6f5a07302f02c48226f4156de9d Parents: e1f0152 52c1dfa Author: S.Vladykin Authored: Tue Aug 4 17:52:08 2015 +0300 Committer: S.Vladykin Committed: Tue Aug 4 17:52:08 2015 +0300 -- .../yardstick/config/benchmark-query.properties | 3 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/IgniteBenchmarkArguments.java | 11 ++ .../cache/IgniteJdbcSqlQueryBenchmark.java | 134 +++ 4 files changed, 147 insertions(+), 3 deletions(-) --
[03/50] incubator-ignite git commit: IGNITE-1185 Fix javadoc. (cherry picked from commit 3c19212)
IGNITE-1185 Fix javadoc.
(cherry picked from commit 3c19212)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b0dd9320
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b0dd9320
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b0dd9320
Branch: refs/heads/ignite-1108
Commit: b0dd9320f26af01a67f27842bf501049bac43665
Parents: c66a877
Author: sevdokimov
Authored: Mon Aug 3 14:11:58 2015 +0300
Committer: sevdokimov
Committed: Mon Aug 3 14:15:33 2015 +0300
--
.../src/main/java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b0dd9320/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index ee07743..3366256 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3321,7 +3321,7 @@ public abstract class IgniteUtils {
/**
* @param path Resource path.
- * @return Resource URL inside jar. Or {@code null}.
+ * @return Resource URL inside classpath or {@code null}.
*/
@Nullable private static URL resolveInClasspath(String path) {
ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
[09/50] incubator-ignite git commit: minor
minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0a6f559
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0a6f559
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0a6f559
Branch: refs/heads/ignite-1108
Commit: d0a6f5590445dea45c3d850733e4b7397879edf8
Parents: 3c19212
Author: Yakov Zhdanov
Authored: Mon Aug 3 15:59:28 2015 +0300
Committer: Yakov Zhdanov
Committed: Mon Aug 3 15:59:28 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0a6f559/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 f5ccaec..3040621 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
@@ -1764,7 +1764,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
GridCacheIoManager ioMgr = new GridCacheIoManager();
CacheJtaManagerAdapter jta = JTA.createOptional();
-
+
return new GridCacheSharedContext(
kernalCtx,
tm,
[10/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1157' into ignite-1.3.3
Merge remote-tracking branch 'remotes/origin/ignite-1157' into ignite-1.3.3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d747d2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d747d2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d747d2a Branch: refs/heads/ignite-1108 Commit: 7d747d2aca6bdee21ca1c300b17d9cad709f38a2 Parents: 015d9cd a1543cf Author: sevdokimov Authored: Mon Aug 3 16:21:04 2015 +0300 Committer: sevdokimov Committed: Mon Aug 3 16:21:04 2015 +0300 -- .../ignite/internal/util/GridLogThrottle.java | 63 +++- .../ignite/spi/discovery/tcp/ClientImpl.java| 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 5 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 + 4 files changed, 70 insertions(+), 18 deletions(-) --
[22/50] incubator-ignite git commit: master - query restart tests fix
master - query restart tests fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/90adeae9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/90adeae9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/90adeae9
Branch: refs/heads/ignite-1108
Commit: 90adeae9dd57f0be5f244d5167853a0b48dc
Parents: 38810b6
Author: S.Vladykin
Authored: Tue Aug 4 20:30:00 2015 +0300
Committer: S.Vladykin
Committed: Tue Aug 4 20:30:00 2015 +0300
--
.../h2/twostep/GridReduceQueryExecutor.java | 34 ++--
1 file changed, 31 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/90adeae9/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index cde3288..ac269db 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@ -150,8 +150,7 @@ public class GridReduceQueryExecutor {
for (QueryRun r : runs.values()) {
for (GridMergeTable tbl : r.tbls) {
if (tbl.getScanIndex(null).hasSource(nodeId)) {
-// Will attempt to retry. If reduce query was
started it will fail on next page fetching.
-retry(r, h2.readyTopologyVersion(), nodeId);
+handleNodeLeft(r, nodeId);
break;
}
@@ -162,6 +161,15 @@ public class GridReduceQueryExecutor {
}
/**
+ * @param r Query run.
+ * @param nodeId Left node ID.
+ */
+private void handleNodeLeft(QueryRun r, UUID nodeId) {
+// Will attempt to retry. If reduce query was started it will fail on
next page fetching.
+retry(r, h2.readyTopologyVersion(), nodeId);
+}
+
+/**
* @param nodeId Node ID.
* @param msg Message.
*/
@@ -515,7 +523,7 @@ public class GridReduceQueryExecutor {
if (send(nodes,
new GridQueryRequest(qryReqId, r.pageSize, space, mapQrys,
topVer, extraSpaces, null), partsMap)) {
-U.await(r.latch);
+awaitAllReplies(r, nodes);
Object state = r.state.get();
@@ -595,6 +603,26 @@ public class GridReduceQueryExecutor {
}
/**
+ * @param r Query run.
+ * @param nodes Nodes to check periodically if they alive.
+ * @throws IgniteInterruptedCheckedException If interrupted.
+ */
+private void awaitAllReplies(QueryRun r, Collection nodes)
+throws IgniteInterruptedCheckedException {
+while (!U.await(r.latch, 500, TimeUnit.MILLISECONDS)) {
+for (ClusterNode node : nodes) {
+if (!ctx.discovery().alive(node)) {
+handleNodeLeft(r, node.id());
+
+assert r.latch.getCount() == 0;
+
+return;
+}
+}
+}
+}
+
+/**
* Calculates data nodes for replicated caches on unstable topology.
*
* @param cctx Cache context for main space.
[07/50] incubator-ignite git commit: Merge branches 'ignite-1.3.3' and 'ignite-support804' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-support804
Merge branches 'ignite-1.3.3' and 'ignite-support804' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-support804 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/015d9cd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/015d9cd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/015d9cd5 Branch: refs/heads/ignite-1108 Commit: 015d9cd5397d9d24489cfe757df36192b83ebcfe Parents: 23377fe 12cbe22 Author: S.Vladykin Authored: Mon Aug 3 15:12:10 2015 +0300 Committer: S.Vladykin Committed: Mon Aug 3 15:12:10 2015 +0300 -- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 17 +--- .../processors/cache/GridCacheProcessor.java| 10 - .../processors/cache/GridCacheUtils.java| 1 - .../ignite/internal/util/IgniteUtils.java | 16 .../parser/dialect/OracleMetadataDialect.java | 4 +- .../src/test/java/config/ignite-test-config.xml | 43 .../ignite/internal/GridFactorySelfTest.java| 9 8 files changed, 80 insertions(+), 22 deletions(-) --
[30/50] incubator-ignite git commit: typo + msg format
typo + msg format
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/023ffe0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/023ffe0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/023ffe0e
Branch: refs/heads/ignite-1108
Commit: 023ffe0eee38663fe78dacd9b63d5f121226008b
Parents: 19310d3
Author: Yakov Zhdanov
Authored: Wed Aug 5 17:29:24 2015 +0300
Committer: Yakov Zhdanov
Committed: Wed Aug 5 17:29:24 2015 +0300
--
.../main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/023ffe0e/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java
--
diff --git
a/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java
b/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java
index 19f43e6..7ea490a 100644
---
a/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java
+++
b/modules/log4j2/src/main/java/org/apache/ignite/logger/log4j2/Log4J2Logger.java
@@ -237,7 +237,7 @@ public class Log4J2Logger implements IgniteLogger,
LoggerNodeIdAware {
}
}
catch (IllegalAccessException | NoSuchFieldException e) {
-error("Faild to get file name. Looks like the
implementation of log4j 2 was changed.", e);
+error("Failed to get file name (was the implementation
of log4j2 changed?).", e);
}
}
}
[11/50] incubator-ignite git commit: Fixed tests.
Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b056a739
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b056a739
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b056a739
Branch: refs/heads/ignite-1108
Commit: b056a739ebf001d3c63ebc8afa52dba520055221
Parents: d0a6f55
Author: nikolay_tikhonov
Authored: Mon Aug 3 18:26:26 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Aug 3 18:26:26 2015 +0300
--
.../integration/ClientAbstractMultiNodeSelfTest.java | 4 ++--
.../managers/communication/GridIoManager.java| 2 +-
.../internal/GridJobMasterLeaveAwareSelfTest.java| 10 ++
.../internal/IgniteClientReconnectAbstractTest.java | 5 +++--
.../internal/IgniteClientReconnectCacheTest.java | 5 +++--
.../GridDeploymentMessageCountSelfTest.java | 5 +++--
.../cache/CacheStopAndDestroySelfTest.java | 8
.../cache/GridCacheAtomicMessageCountSelfTest.java | 6 --
.../GridCacheReplicatedSynchronousCommitTest.java| 5 +++--
.../cache/IgniteCacheAbstractStopBusySelfTest.java | 6 --
.../cache/IgniteCacheNearLockValueSelfTest.java | 6 --
...IgniteDynamicCacheStartNoExchangeTimeoutTest.java | 4 ++--
.../cache/IgniteTxReentryAbstractSelfTest.java | 5 +++--
.../IgniteCacheClientNodeChangingTopologyTest.java | 6 --
.../IgniteCacheClientNodePartitionsExchangeTest.java | 4 ++--
...niteTxOriginatingNodeFailureAbstractSelfTest.java | 6 +++---
...misticOriginatingNodeFailureAbstractSelfTest.java | 6 +++---
.../dht/GridCacheDhtPreloadMessageCountTest.java | 5 +++--
...eCachePrimaryNodeFailureRecoveryAbstractTest.java | 6 --
...dCacheAtomicInvalidPartitionHandlingSelfTest.java | 5 +++--
.../near/IgniteCacheNearTxRollbackTest.java | 6 --
.../GridCacheReplicatedInvalidateSelfTest.java | 6 --
.../apache/ignite/util/TestTcpCommunicationSpi.java | 6 --
.../CacheScanPartitionQueryFallbackSelfTest.java | 15 +--
24 files changed, 85 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b056a739/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index cf1b735..66f266a 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -456,11 +456,11 @@ public abstract class ClientAbstractMultiNodeSelfTest
extends GridCommonAbstract
@SuppressWarnings("unchecked")
private static class TestCommunicationSpi extends TcpCommunicationSpi {
/** {@inheritDoc} */
-@Override public void sendMessage(ClusterNode node, Message msg)
+@Override public void sendMessage(ClusterNode node, Message msg,
IgniteInClosure ackClosure)
throws IgniteSpiException {
checkSyncFlags((GridIoMessage)msg);
-super.sendMessage(node, msg);
+super.sendMessage(node, msg, ackClosure);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b056a739/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 53ccdfe..85e8421 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1039,7 +1039,7 @@ public class GridIoManager extends
GridManagerAdapter
* How to use it:
*
- * Replace {@link #send(ClusterNode, Object, int, Message, byte,
boolean, long, boolean)}
+ * Replace {@link #send(ClusterNode, Object, int, Message, byte,
boolean, long, boolean, IgniteInClosure)}
* with this method.
* Start all grids for your test, then set {@link
#TURBO_DEBUG_MODE} to {@code true}.
* Perform test operations on the topology. No network will be
there.
http://git-wip-us.apache.org/repos/asf
[19/50] incubator-ignite git commit: Added benchmarks for jdbc.
Added benchmarks for jdbc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52c1dfa3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52c1dfa3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52c1dfa3
Branch: refs/heads/ignite-1108
Commit: 52c1dfa32d86183c07c82bb3c34a03316d6fd7b5
Parents: b056a73
Author: nikolay_tikhonov
Authored: Tue Aug 4 17:51:05 2015 +0300
Committer: nikolay_tikhonov
Committed: Tue Aug 4 17:51:05 2015 +0300
--
.../yardstick/config/benchmark-query.properties | 3 +-
modules/yardstick/config/ignite-base-config.xml | 2 -
.../yardstick/IgniteBenchmarkArguments.java | 11 ++
.../cache/IgniteJdbcSqlQueryBenchmark.java | 134 +++
4 files changed, 147 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52c1dfa3/modules/yardstick/config/benchmark-query.properties
--
diff --git a/modules/yardstick/config/benchmark-query.properties
b/modules/yardstick/config/benchmark-query.properties
index d6a8b9e..1a75926 100644
--- a/modules/yardstick/config/benchmark-query.properties
+++ b/modules/yardstick/config/benchmark-query.properties
@@ -63,5 +63,6 @@ CONFIGS="\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1
-w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinBenchmark -sn
IgniteNode -ds sql-query-join-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1
-w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn
IgniteNode -ds sql-query-join-offheap-1-backup,\
-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1
-w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn
IgniteNode -ds sql-query-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1
-w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn
IgniteNode -ds sql-query-put-offheap-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1
-w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn
IgniteNode -ds sql-query-put-offheap-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1
-w 60 -d 300 -jdbc jdbc:ignite://127.0.0.1/query -t 64 -sm PRIMARY_SYNC -dn
IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-1-backup\
"
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52c1dfa3/modules/yardstick/config/ignite-base-config.xml
--
diff --git a/modules/yardstick/config/ignite-base-config.xml
b/modules/yardstick/config/ignite-base-config.xml
index b2c976a..c77cc9a 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -180,8 +180,6 @@
-
-
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52c1dfa3/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
index 1562b26..5eb7060 100644
---
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java
@@ -106,6 +106,17 @@ public class IgniteBenchmarkArguments {
@Parameter(names = {"-col", "--collocated"}, description = "Collocated")
private boolean collocated;
+/** */
+@Parameter(names = {"-jdbc", "--jdbcUrl"}, description = "JDBC url")
+private String jdbcUrl;
+
+/**
+ * @return JDBC url.
+ */
+public String jdbcUrl() {
+return jdbcUrl;
+}
+
/**
* @return Transaction concurrency.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52c1dfa3/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteJdbcSqlQueryBenchmark.java
--
diff --git
a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteJdbcSqlQueryBenchmark.java
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteJdbcSqlQueryBenchmark.java
new file mode 100644
index 000..0ded2bd
--- /dev/null
+++
b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteJdbcSqlQueryBenchmark.
[50/50] incubator-ignite git commit: IGNITE-1108 Fixed review notes.
IGNITE-1108 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/69cee3a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/69cee3a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/69cee3a1
Branch: refs/heads/ignite-1108
Commit: 69cee3a17f2b6b4f340f4c07fe81f729e65ef508
Parents: 45299a0
Author: nikolay_tikhonov
Authored: Tue Aug 11 11:45:17 2015 +0300
Committer: nikolay_tikhonov
Committed: Tue Aug 11 11:45:17 2015 +0300
--
.../apache/ignite/internal/IgniteKernal.java| 9 +-
.../plugin/IgnitePluginProcessor.java | 90 +---
2 files changed, 82 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69cee3a1/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index bf47f63..289c8a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -790,13 +790,6 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
startProcessor(new GridServiceProcessor(ctx));
startProcessor(new DataStructuresProcessor(ctx));
-// Start plugins.
-for (PluginProvider provider : ctx.plugins().allProviders()) {
-ctx.add(new GridPluginComponent(provider));
-
-
provider.start(ctx.plugins().pluginContextForProvider(provider));
-}
-
gw.writeLock();
try {
@@ -1815,6 +1808,8 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
}
}
+ctx.plugins().onAfterStopNotify(cancel);
+
// Stops lifecycle aware components.
U.stopLifecycleAware(log, lifecycleAwares(cfg));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69cee3a1/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index aa9778f..0abbf1e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -31,12 +31,15 @@ import java.lang.reflect.*;
import java.util.*;
/**
- *
+ * Plugin processor.
*/
public class IgnitePluginProcessor extends GridProcessorAdapter {
/** */
private final Map plugins = new LinkedHashMap<>();
+/** Started plugins. */
+private List startedPlugins = new LinkedList<>();
+
/** */
private final Map pluginCtxMap = new
IdentityHashMap<>();
@@ -132,29 +135,96 @@ public class IgnitePluginProcessor extends
GridProcessorAdapter {
/** {@inheritDoc} */
@Override public void start() throws IgniteCheckedException {
-for (Map.Entry e :
pluginCtxMap.entrySet())
-e.getKey().onBeforeStart(e.getValue());
+// Before start.
+for (PluginProvider provider : plugins.values())
+provider.onBeforeStart(pluginCtxMap.get(provider));
+
+// Start plugins.
+for (PluginProvider provider : plugins.values())
+startPlugin(provider, pluginCtxMap.get(provider));
ackPluginsInfo();
}
+/**
+ * @param plugin Plugin.
+ * @param pluginCtx Plugin context.
+ * @throws IgniteCheckedException If start plugin failed.
+ */
+private void startPlugin(PluginProvider plugin, PluginContext pluginCtx)
throws IgniteCheckedException {
+try {
+plugin.start(pluginCtx);
+
+startedPlugins.add(plugin);
+
+if (log.isDebugEnabled())
+log.debug("Plugin started: " + plugin);
+}
+catch (IgniteCheckedException e) {
+throw new IgniteCheckedException("Failed to start plugin: " +
plugin, e);
+}
+}
+
+/** {@inheritDoc} */
+@Override public void onKernalStart() throws IgniteCheckedException {
+for (PluginProvider provider : startedPlugins)
+provider.onAfterStart();
+}
+
/** {@inheritDoc} */
@Override public void stop(boolean cancel) throws IgniteCheckedException {
-boolean er
[04/50] incubator-ignite git commit: IGNITE-1172 Fixed review notes.
IGNITE-1172 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ace82ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ace82ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ace82ac
Branch: refs/heads/ignite-1108
Commit: 3ace82ac5ea85da5cd0883eb4da794f0609a8218
Parents: 4ba8b6f
Author: nikolay_tikhonov
Authored: Mon Aug 3 14:22:08 2015 +0300
Committer: nikolay_tikhonov
Committed: Mon Aug 3 14:22:08 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheProcessor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ace82ac/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 a83fd4c..8e2b20e 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
@@ -497,8 +497,8 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cleanup(cfg, cfg.getAffinityMapper(), false);
cleanup(cfg, cctx.store().configuredStore(), false);
-if (!CU.isUtilityCache(cctx.cache().name()) &&
!CU.isSystemCache(cctx.cache().name()))
-unregisterMbean(cctx.cache().mxBean(),
U.maskName(cctx.cache().name()) + "_" + ctx.gridName(), false);
+if (!CU.isUtilityCache(cfg.getName()) &&
!CU.isSystemCache(cfg.getName()))
+unregisterMbean(cctx.cache().mxBean(), cfg.getName(), false);
NearCacheConfiguration nearCfg = cfg.getNearConfiguration();
@@ -1360,7 +1360,7 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
}
if (!CU.isUtilityCache(cache.name()) &&
!CU.isSystemCache(cache.name()))
-registerMbean(cache.mxBean(), U.maskName(cache.name()) + "_" +
ctx.gridName(), false);
+registerMbean(cache.mxBean(), cache.name(), false);
return ret;
}
[15/50] incubator-ignite git commit: ignite-1189: 4 reproducing deadlock
ignite-1189: 4 reproducing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/132562b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/132562b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/132562b4
Branch: refs/heads/ignite-1108
Commit: 132562b431bc3250abe56ec48725c5ebe6083964
Parents: 28c9977
Author: Denis Magda
Authored: Tue Aug 4 12:26:00 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 12:26:00 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 8 ++--
.../IgniteCacheAtomicNodeRestartTest.java | 45
2 files changed, 48 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/132562b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 4d73fb2..cd6e28d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1152,11 +1152,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
e.printStackTrace();
}
-catch (Exception e) {
-U.error(log, "FUCK ERROR", e);
-
-throw e;
-}
finally {
if (locked != null)
unlockEntries(locked, req.topologyVersion());
@@ -1179,6 +1174,9 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
remap = true;
}
+catch (Exception e) {
+U.error(log, "Unexpected exception during cache update", e);
+}
if (remap) {
assert dhtFut == null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/132562b4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index 70e6c4c..caee4d0 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -36,7 +36,52 @@ public class IgniteCacheAtomicNodeRestartTest extends
GridCachePartitionedNodeRe
super.testRestartWithPutTenNodesTwoBackups();
}
+public void testRestartWithPutTenNodesTwoBackups2() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups3() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups4() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups5() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups6() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups7() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups8() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups9() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups10() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups11() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups12() throws Throwable {
+super.testRestartWithPutTenNodesTwoBackups();
+}
+public void testRestartWithPutTenNodesTwoBackups13() throws Throwable {
+super.testRestartWithPutTenNodesTwoB
[08/50] incubator-ignite git commit: IGNITE-1157 Fix problems found on review.
IGNITE-1157 Fix problems found on review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a1543cfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a1543cfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a1543cfe
Branch: refs/heads/ignite-1108
Commit: a1543cfe4ce435adcc08e3680d19da8b63a3d945
Parents: 45aa598
Author: sevdokimov
Authored: Mon Aug 3 15:22:27 2015 +0300
Committer: sevdokimov
Committed: Mon Aug 3 15:22:27 2015 +0300
--
.../ignite/internal/util/GridLogThrottle.java | 36 ++--
1 file changed, 26 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1543cfe/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
index f37cfea..607b17b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
@@ -18,9 +18,9 @@
package org.apache.ignite.internal.util;
import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.lang.*;
import org.jetbrains.annotations.*;
import org.jsr166.*;
@@ -42,7 +42,7 @@ public class GridLogThrottle {
private static int throttleTimeout = DFLT_THROTTLE_TIMEOUT;
/** Errors. */
-private static final ConcurrentMap,
String, Boolean>, Long> errors =
+private static final ConcurrentMap, String>, Long> errors =
new ConcurrentHashMap8<>();
/**
@@ -95,6 +95,7 @@ public class GridLogThrottle {
* @param log Logger.
* @param e Error (optional).
* @param msg Message.
+ * @param quite Print warning anyway.
*/
public static void warn(@Nullable IgniteLogger log, @Nullable Throwable e,
String msg, boolean quite) {
assert !F.isEmpty(msg);
@@ -121,11 +122,22 @@ public class GridLogThrottle {
*
* @param log Logger.
* @param msg Message.
+ * @param quite Print info anyway.
*/
-public static void info(@Nullable IgniteLogger log, String msg) {
+public static void info(@Nullable IgniteLogger log, String msg, boolean
quite) {
assert !F.isEmpty(msg);
-log(log, null, msg, null, LogLevel.INFO, false);
+log(log, null, msg, null, LogLevel.INFO, quite);
+}
+
+/**
+ * Logs info if needed.
+ *
+ * @param log Logger.
+ * @param msg Message.
+ */
+public static void info(@Nullable IgniteLogger log, String msg) {
+info(log, msg, false);
}
/**
@@ -149,9 +161,9 @@ public class GridLogThrottle {
LogLevel level, boolean quiet) {
assert !F.isEmpty(longMsg);
-GridTuple3, String, Boolean> tup =
-e != null ? F., String,
Boolean>t(e.getClass(), e.getMessage(), quiet) :
-F., String, Boolean>t(null,
longMsg, quiet);
+IgniteBiTuple, String> tup =
+e != null ? F., String>t(e.getClass(),
e.getMessage()) :
+F., String>t(null, longMsg);
while (true) {
Long loggedTs = errors.get(tup);
@@ -177,7 +189,7 @@ public class GridLogThrottle {
* @param newStamp New timestamp.
* @return {@code True} if throttle value was replaced.
*/
-private static boolean replace(GridTuple3,
String, Boolean> t, @Nullable Long oldStamp,
+private static boolean replace(IgniteBiTuple,
String> t, @Nullable Long oldStamp,
Long newStamp) {
assert newStamp != null;
@@ -222,8 +234,12 @@ public class GridLogThrottle {
/** Info level. */
INFO {
@Override public void doLog(IgniteLogger log, String longMsg,
String shortMsg, Throwable e, boolean quiet) {
-if (log.isInfoEnabled())
-log.info(longMsg);
+if (quiet)
+U.quietAndInfo(log, longMsg);
+else {
+if (log.isInfoEnabled())
+log.info(longMsg);
+}
}
};
[26/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c087be21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c087be21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c087be21 Branch: refs/heads/ignite-1108 Commit: c087be21760dd8ab34a0b2a43f7f10f7a5203e41 Parents: b683b8f 01c3e09 Author: S.Vladykin Authored: Wed Aug 5 00:27:37 2015 +0300 Committer: S.Vladykin Committed: Wed Aug 5 00:27:37 2015 +0300 -- .../internal/processors/cache/GridCacheSwapPreloadSelfTest.java| 2 ++ 1 file changed, 2 insertions(+) --
[02/50] incubator-ignite git commit: IGNITE-1185 Locate configuration in class path: Add tests. (cherry picked from commit 79f27f4)
IGNITE-1185 Locate configuration in class path: Add tests.
(cherry picked from commit 79f27f4)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c66a877a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c66a877a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c66a877a
Branch: refs/heads/ignite-1108
Commit: c66a877ad5cacfca310341e7301d7e2e96d6c6dc
Parents: 754da7a
Author: sevdokimov
Authored: Mon Aug 3 13:46:40 2015 +0300
Committer: sevdokimov
Committed: Mon Aug 3 14:15:26 2015 +0300
--
.../src/test/java/config/ignite-test-config.xml | 43
.../ignite/internal/GridFactorySelfTest.java| 9
2 files changed, 52 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c66a877a/modules/spring/src/test/java/config/ignite-test-config.xml
--
diff --git a/modules/spring/src/test/java/config/ignite-test-config.xml
b/modules/spring/src/test/java/config/ignite-test-config.xml
new file mode 100644
index 000..145d124
--- /dev/null
+++ b/modules/spring/src/test/java/config/ignite-test-config.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans.xsd";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c66a877a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
--
diff --git
a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index ecc7fb7..fb8cbfe 100644
---
a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++
b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -824,6 +824,15 @@ public class GridFactorySelfTest extends
GridCommonAbstractTest {
}
/**
+ * @throws Exception If failed.
+ */
+public void testConfigInClassPath() throws Exception {
+try (Ignite ignite = Ignition.start("config/ignite-test-config.xml")) {
+assert "config-in-classpath".equals(ignite.name());
+}
+}
+
+/**
* Test task.
*/
private static class TestTask extends ComputeTaskSplitAdapter {
[20/50] incubator-ignite git commit: master - test fix
master - test fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1f01529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1f01529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1f01529
Branch: refs/heads/ignite-1108
Commit: e1f01529fa9d19641cb276551375cd8bd739da6d
Parents: b056a73
Author: S.Vladykin
Authored: Tue Aug 4 17:51:40 2015 +0300
Committer: S.Vladykin
Committed: Tue Aug 4 17:51:40 2015 +0300
--
...idCacheReduceQueryMultithreadedSelfTest.java | 21 +++-
1 file changed, 20 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1f01529/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
index c3290a6..f890dee 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
@@ -21,6 +21,9 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import java.util.*;
import java.util.concurrent.*;
@@ -39,6 +42,9 @@ public class GridCacheReduceQueryMultithreadedSelfTest
extends GridCacheAbstract
/** */
private static final int TEST_TIMEOUT = 2 * 60 * 1000;
+/** */
+private static final TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
+
/** {@inheritDoc} */
@Override protected int gridCount() {
return GRID_CNT;
@@ -50,8 +56,21 @@ public class GridCacheReduceQueryMultithreadedSelfTest
extends GridCacheAbstract
}
/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+disco.setIpFinder(ipFinder);
+
+cfg.setDiscoverySpi(disco);
+
+return cfg;
+}
+
+/** {@inheritDoc} */
@Override protected CacheConfiguration cacheConfiguration(String gridName)
throws Exception {
-CacheConfiguration cfg = super.cacheConfiguration(gridName);
+CacheConfiguration cfg = super.cacheConfiguration(gridName);
cfg.setCacheMode(PARTITIONED);
cfg.setBackups(1);
[05/50] incubator-ignite git commit: ignite-1189: trying to reproduce failures
ignite-1189: trying to reproduce failures
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6b237e11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6b237e11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6b237e11
Branch: refs/heads/ignite-1108
Commit: 6b237e119caad68474cc785c0373da8ce31011d8
Parents: ac6d75d
Author: Denis Magda
Authored: Mon Aug 3 14:45:40 2015 +0300
Committer: Denis Magda
Committed: Mon Aug 3 14:45:40 2015 +0300
--
.../org/apache/ignite/internal/IgnitionEx.java | 21 +---
.../IgniteCacheAtomicNodeRestartTest.java | 4
2 files changed, 9 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b237e11/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index d355085..5cbe377 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -261,11 +261,8 @@ public class IgnitionEx {
public static boolean stop(@Nullable String name, boolean cancel) {
IgniteNamedInstance grid = name != null ? grids.get(name) : dfltGrid;
-if (grid != null) {
-IgniteState state = grid.state();
-
-if (state == STARTED)
-grid.stop(cancel);
+if (grid != null && grid.state() == STARTED) {
+grid.stop(cancel);
boolean fireEvt;
@@ -280,18 +277,10 @@ public class IgnitionEx {
}
}
-if (state == STARTED) {
-if (fireEvt)
-notifyStateChange(grid.getName(), grid.state());
-
-return true;
-}
-else {
-U.warn(null, "Ignoring stopping grid instance (has not been in
STARTED state): [grid=" + name +
-", state=" + state + ']');
+if (fireEvt)
+notifyStateChange(grid.getName(), grid.state());
-return false;
-}
+return true;
}
// We don't have log at this point...
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6b237e11/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
index 1c4e616..fa8898f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java
@@ -30,4 +30,8 @@ public class IgniteCacheAtomicNodeRestartTest extends
GridCachePartitionedNodeRe
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
+
+@Override public void testRestartWithPutTenNodesTwoBackups() throws
Throwable {
+
+}
}
[06/50] incubator-ignite git commit: Merge branch 'ignite-1172' into ignite-1.3.3
Merge branch 'ignite-1172' into ignite-1.3.3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/12cbe229 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12cbe229 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12cbe229 Branch: refs/heads/ignite-1108 Commit: 12cbe2294c9f19dfa6225c98797c9d9f3ff015b3 Parents: b0dd932 3ace82a Author: nikolay_tikhonov Authored: Mon Aug 3 14:49:08 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Aug 3 14:49:08 2015 +0300 -- .../internal/processors/cache/GridCacheProcessor.java | 10 -- .../ignite/internal/processors/cache/GridCacheUtils.java | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) --
[13/50] incubator-ignite git commit: ignite-1189: 2 reproducing deadlock
ignite-1189: 2 reproducing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3ce3c8b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ce3c8b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ce3c8b7
Branch: refs/heads/ignite-1108
Commit: 3ce3c8b71064ff4d8abd78cd95f4678cb7a74811
Parents: efa7e99
Author: Denis Magda
Authored: Tue Aug 4 10:33:57 2015 +0300
Committer: Denis Magda
Committed: Tue Aug 4 10:33:57 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 40 +++-
1 file changed, 5 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ce3c8b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 18911fd..d6163c2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -85,8 +85,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
/** */
private GridNearAtomicCache near;
-private ThreadLocal> lockedEntries = new
ThreadLocal<>();
-
/**
* Empty constructor required by {@link Externalizable}.
*/
@@ -992,20 +990,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
final GridNearAtomicUpdateRequest req,
final CI2
completionCb
) {
-boolean printKeys = false;
-
-if (lockedEntries.get() != null) {
-for (GridDhtCacheEntry entry : lockedEntries.get())
-U.error(log, "Locked entry [entry=" + entry + ']');
-
-printKeys = true;
-}
-
-if (printKeys) {
-for (KeyCacheObject obj : req.keys())
-U.error(log, "Key requested: " + obj);
-}
-
IgniteInternalFuture forceFut = preldr.request(req.keys(),
req.topologyVersion());
if (forceFut.isDone())
@@ -1048,26 +1032,10 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
IgniteCacheExpiryPolicy expiry = null;
try {
-boolean printKeys = false;
-
-if (lockedEntries.get() != null) {
-for (GridDhtCacheEntry entry : lockedEntries.get())
-U.error(log, "Locked entry (2) [entry=" + entry + ']');
-
-printKeys = true;
-}
-
-if (printKeys) {
-for (KeyCacheObject obj : keys)
-U.error(log, "Key requested: " + obj);
-}
-
// If batch store update is enabled, we need to lock all entries.
// First, need to acquire locks on cache entries, then check
filter.
List locked = lockEntries(keys,
req.topologyVersion());
-lockedEntries.set(locked);
-
Collection>
deleted = null;
try {
@@ -1184,11 +1152,13 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
e.printStackTrace();
}
+catch (Exception e) {
+if (X.hasCause(e, InterruptedException.class))
+U.error(log, "FUCK Interrupted", e);
+}
finally {
-if (locked != null) {
-lockedEntries.set(null);
+if (locked != null)
unlockEntries(locked, req.topologyVersion());
-}
// Enqueue if necessary after locks release.
if (deleted != null) {
[01/50] incubator-ignite git commit: IGNITE-1185 Locate configuration in class path. (cherry picked from commit 518b623)
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1108 74e6ac64b -> 69cee3a17
IGNITE-1185 Locate configuration in class path.
(cherry picked from commit 518b623)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/754da7a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/754da7a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/754da7a1
Branch: refs/heads/ignite-1108
Commit: 754da7a19b8d645c6497b2cdfee320cb922990fc
Parents: 41c76a7
Author: sevdokimov
Authored: Mon Aug 3 12:48:35 2015 +0300
Committer: sevdokimov
Committed: Mon Aug 3 14:15:19 2015 +0300
--
.../org/apache/ignite/internal/IgnitionEx.java | 17 +
.../apache/ignite/internal/util/IgniteUtils.java | 16
2 files changed, 17 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/754da7a1/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 73de99a..3790703 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -583,22 +583,7 @@ public class IgnitionEx {
public static IgniteBiTuple, ? extends
GridSpringResourceContext>
loadConfigurations(String springCfgPath) throws IgniteCheckedException {
A.notNull(springCfgPath, "springCfgPath");
-
-URL url;
-
-try {
-url = new URL(springCfgPath);
-}
-catch (MalformedURLException e) {
-url = U.resolveIgniteUrl(springCfgPath);
-
-if (url == null)
-throw new IgniteCheckedException("Spring XML configuration
path is invalid: " + springCfgPath +
-". Note that this path should be either absolute or a
relative local file system path, " +
-"relative to META-INF in classpath or valid URL to
IGNITE_HOME.", e);
-}
-
-return loadConfigurations(url);
+return loadConfigurations(IgniteUtils.resolveSpringUrl(springCfgPath));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/754da7a1/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 6bd361f..ee07743 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -3308,6 +3308,9 @@ public abstract class IgniteUtils {
url = U.resolveIgniteUrl(springCfgPath);
if (url == null)
+url = resolveInClasspath(springCfgPath);
+
+if (url == null)
throw new IgniteCheckedException("Spring XML configuration
path is invalid: " + springCfgPath +
". Note that this path should be either absolute or a
relative local file system path, " +
"relative to META-INF in classpath or valid URL to
IGNITE_HOME.", e);
@@ -3317,6 +3320,19 @@ public abstract class IgniteUtils {
}
/**
+ * @param path Resource path.
+ * @return Resource URL inside jar. Or {@code null}.
+ */
+@Nullable private static URL resolveInClasspath(String path) {
+ClassLoader clsLdr = Thread.currentThread().getContextClassLoader();
+
+if (clsLdr == null)
+return null;
+
+return clsLdr.getResource(path.replaceAll("", "/"));
+}
+
+/**
* Gets URL representing the path passed in. First the check is made if
path is absolute.
* If not, then the check is made if path is relative to {@code META-INF}
folder in classpath.
* If not, then the check is made if path is relative to ${IGNITE_HOME}.
[23/50] incubator-ignite git commit: master - query restart tests fix2
master - query restart tests fix2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/246b94a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/246b94a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/246b94a8
Branch: refs/heads/ignite-1108
Commit: 246b94a8bdc9901935db1865a0607a9fe48f5b23
Parents: 90adeae
Author: S.Vladykin
Authored: Tue Aug 4 21:05:13 2015 +0300
Committer: S.Vladykin
Committed: Tue Aug 4 21:05:13 2015 +0300
--
.../query/h2/twostep/GridMergeIndex.java| 7 +++
.../h2/twostep/GridMergeIndexUnsorted.java | 23 +++--
.../query/h2/twostep/GridMergeTable.java| 51
.../h2/twostep/GridReduceQueryExecutor.java | 28 +--
4 files changed, 45 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/246b94a8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
index 2b2996d..71b207d 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndex.java
@@ -68,6 +68,13 @@ public abstract class GridMergeIndex extends BaseIndex {
}
/**
+ * @return Return source nodes for this merge index.
+ */
+public Set sources() {
+return remainingRows.keySet();
+}
+
+/**
* @param nodeId Node ID.
* @return {@code true} If this index needs data from the given source
node.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/246b94a8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
index e0a07ec..276d25b 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeIndexUnsorted.java
@@ -64,11 +64,24 @@ public class GridMergeIndexUnsorted extends GridMergeIndex {
while (!iter.hasNext()) {
GridResultPage page;
-try {
-page = queue.take();
-}
-catch (InterruptedException e) {
-throw new CacheException("Query execution was
interrupted.", e);
+for (;;) {
+try {
+page = queue.poll(500, TimeUnit.MILLISECONDS);
+}
+catch (InterruptedException e) {
+throw new CacheException("Query execution was
interrupted.", e);
+}
+
+if (page != null)
+break;
+
+UUID nodeId =
((GridMergeTable)table).checkSourceNodesAlive();
+
+if (nodeId != null) {
+fail(nodeId);
+
+assert !queue.isEmpty();
+}
}
if (page.isLast())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/246b94a8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
index c9cdff2..fd9eec3 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMergeTable.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.query.h2.twostep;
-import org.h2.api.*;
+import org.apache.ignite.internal.*;
import org.h2.command.ddl.*;
import org.h2.engine.*;
[48/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19fb305d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19fb305d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19fb305d Branch: refs/heads/ignite-1108 Commit: 19fb305d5ceff430911d8dc25685686f6446ea21 Parents: fbda19d 0798e6f Author: Anton Vinogradov Authored: Mon Aug 10 16:12:53 2015 +0300 Committer: Anton Vinogradov Committed: Mon Aug 10 16:12:53 2015 +0300 -- .../cache/GridCachePartitionExchangeManager.java| 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) --
[45/50] incubator-ignite git commit: # Fixed potential NPE in GridCachePartitionExchangeManager.dumpDebugInfo
# Fixed potential NPE in GridCachePartitionExchangeManager.dumpDebugInfo
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd770a54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd770a54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd770a54
Branch: refs/heads/ignite-1108
Commit: bd770a54a554c8c22f36ea00f8c735218c29b330
Parents: d9acbd1
Author: sboikov
Authored: Mon Aug 10 16:08:10 2015 +0300
Committer: sboikov
Committed: Mon Aug 10 16:08:10 2015 +0300
--
.../cache/GridCachePartitionExchangeManager.java| 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd770a54/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 c26f5c3..cf49197 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
@@ -962,15 +962,19 @@ public class GridCachePartitionExchangeManager
extends GridCacheSharedMana
for (GridDhtPartitionsExchangeFuture fut : pendingExchangeFuts)
U.warn(log, ">>> " + fut);
-U.warn(log, "Last 10 exchange futures (total: " + exchFuts.size() +
"):");
+ExchangeFutureSet exchFuts = this.exchFuts;
-int cnt = 0;
+if (exchFuts != null) {
+U.warn(log, "Last 10 exchange futures (total: " + exchFuts.size()
+ "):");
-for (GridDhtPartitionsExchangeFuture fut : exchFuts) {
-U.warn(log, ">>> " + fut);
+int cnt = 0;
+
+for (GridDhtPartitionsExchangeFuture fut : exchFuts) {
+U.warn(log, ">>> " + fut);
-if (++cnt == 10)
-break;
+if (++cnt == 10)
+break;
+}
}
dumpPendingObjects();
[34/50] incubator-ignite git commit: master ignite-1207
master ignite-1207 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/33e174bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/33e174bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/33e174bb Branch: refs/heads/ignite-1108 Commit: 33e174bb9a8c9d79c66962449cf0d5403b921aed Parents: 2173b0e Author: Anton Vinogradov Authored: Thu Aug 6 13:03:44 2015 +0300 Committer: Anton Vinogradov Committed: Thu Aug 6 13:03:44 2015 +0300 -- assembly/release-hadoop.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33e174bb/assembly/release-hadoop.xml -- diff --git a/assembly/release-hadoop.xml b/assembly/release-hadoop.xml index 7b94144..3f61ec9 100644 --- a/assembly/release-hadoop.xml +++ b/assembly/release-hadoop.xml @@ -58,6 +58,11 @@ modules/hadoop/config/hive-site.ignite.xml /config/hadoop + + +modules/hadoop/docs/HADOOP_README.txt +/ +
