You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/02/17 15:11:35 UTC
[1/3] ignite git commit: ignite-db-x fix failover recovery,
print part state for rebalance test
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 dd82b891b -> e667a12db
ignite-db-x fix failover recovery, print part state for rebalance test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4861067
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4861067
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4861067
Branch: refs/heads/ignite-3477
Commit: e4861067ef1fa7c37a2c29b979e73e78674abf9c
Parents: 5bde9b1
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Fri Feb 17 14:18:12 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Fri Feb 17 14:18:12 2017 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/util/IgniteUtils.java | 5 +----
.../processors/cache/CacheRebalancingSelfTest.java | 13 ++++++++++---
...CachePartitionedBackupNodeFailureRecoveryTest.java | 12 +++++-------
.../rebalancing/GridCacheRebalancingSyncSelfTest.java | 14 ++++++++++----
4 files changed, 26 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4861067/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 389d058..f2ea60d 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
@@ -7586,10 +7586,7 @@ public abstract class IgniteUtils {
return fut.get();
}
catch (ExecutionException e) {
- //todo only for investigation
- e.printStackTrace();
-
- throw new IgniteCheckedException(e.getCause());
+ throw new IgniteCheckedException(e.getCause());
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4861067/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
index 8d1f67a..af53eb1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheRebalancingSelfTest.java
@@ -40,14 +40,22 @@ public class CacheRebalancingSelfTest extends GridCommonAbstractTest {
return cfg;
}
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ stopAllGrids();
+ }
+
/**
* @throws Exception If failed.
*/
public void testRebalanceFuture() throws Exception {
- IgniteEx ignite0 = startGrid(0);
+ IgniteEx ig0 = startGrid(0);
+
startGrid(1);
- IgniteCache<Object, Object> cache = ignite0.cache(null);
+ IgniteCache<Object, Object> cache = ig0.cache(null);
IgniteFuture fut1 = cache.rebalance();
@@ -71,5 +79,4 @@ public class CacheRebalancingSelfTest extends GridCommonAbstractTest {
return ((IgniteFutureImpl)future).internalFuture();
}
-
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4861067/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
index 34006bb..3879cc2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java
@@ -157,17 +157,15 @@ public class IgniteCachePartitionedBackupNodeFailureRecoveryTest extends IgniteC
try {
boolean res = waitForCondition(new PA() {
@Override public boolean apply() {
- return cache3.localPeek(finalKey) != null;
+ Integer actl = cache3.localPeek(finalKey);
+
+ Integer exp = cntr.get();
+
+ return exp.equals(actl);
}
}, 1000);
assertTrue(res);
-
- Integer backUpVal = cache3.localPeek(finalKey);
-
- Integer exp = cntr.get();
-
- assertEquals(exp, backUpVal);
}
finally {
lock.unlock();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4861067/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
index 05c8079..82cbf0c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java
@@ -460,10 +460,16 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest {
List<GridDhtLocalPartition> locs = top.localPartitions();
for (GridDhtLocalPartition loc : locs) {
- assertTrue("Wrong local partition state part=" + loc.id() +
- ", should be OWNING [state=" + loc.state() + "], node="
- + g0.name() + " cache=" + c.getName(),
- loc.state() == GridDhtPartitionState.OWNING);
+ GridDhtPartitionState actl = loc.state();
+
+ boolean res = GridDhtPartitionState.OWNING.equals(actl);
+
+ if (!res)
+ printPartitionState(c);
+
+ assertTrue("Wrong local partition state part=" +
+ loc.id() + ", should be OWNING [state=" + loc.state() +
+ "], node=" + g0.name() + " cache=" + c.getName(), res);
Collection<ClusterNode> affNodes =
g0.affinity(cfg.getName()).mapPartitionToPrimaryAndBackups(loc.id());
[2/3] ignite git commit: ignite-db-x fix java doc.
Posted by ag...@apache.org.
ignite-db-x fix java doc.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/425ae4c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/425ae4c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/425ae4c4
Branch: refs/heads/ignite-3477
Commit: 425ae4c4df9d621a8b82fc9f0b8a479d597e5c0d
Parents: e486106
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Fri Feb 17 14:23:32 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Fri Feb 17 14:23:32 2017 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/cache/PartitionLossPolicy.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/425ae4c4/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java
index 585e8df..1391e70 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/PartitionLossPolicy.java
@@ -17,14 +17,15 @@
package org.apache.ignite.cache;
-import org.apache.ignite.IgniteCache;
+import java.util.Collection;
+import org.apache.ignite.Ignite;
/**
* Partition loss policy. Defines how cache will behave in a case when one or more partitions are lost
* because of a node(s) failure.
* <p>
* All <code>*_SAFE</code> policies prevent a user from interaction with partial data in lost partitions until
- * {@link IgniteCache#resetLostPartitions()} method is called. <code>*_ALL</code> policies allow working with
+ * {@link Ignite#resetLostPartitions(Collection)} method is called. <code>*_ALL</code> policies allow working with
* partial data in lost partitions.
* <p>
* <code>READ_ONLY_*</code> and <code>READ_WRITE_*</code> policies do not automatically change partition state
[3/3] ignite git commit: Merge branch 'ignite-3477' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-db-x
Posted by ag...@apache.org.
Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-db-x
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e667a12d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e667a12d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e667a12d
Branch: refs/heads/ignite-3477
Commit: e667a12dbc72c567daad4b696a12c465cbd43cfe
Parents: 425ae4c dd82b89
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Feb 17 18:10:16 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Feb 17 18:10:16 2017 +0300
----------------------------------------------------------------------
.../benchmarks/jmh/tree/BPlusTreeBenchmark.java | 13 +-
.../apache/ignite/IgniteSystemProperties.java | 7 +
.../org/apache/ignite/cache/QueryIndex.java | 21 ++
.../configuration/CacheConfiguration.java | 35 ++-
.../apache/ignite/internal/IgniteKernal.java | 2 +
.../apache/ignite/internal/pagemem/Page.java | 2 +-
.../ignite/internal/pagemem/PageIdUtils.java | 2 +-
.../internal/pagemem/wal/record/WALRecord.java | 5 +-
.../pagemem/wal/record/delta/InsertRecord.java | 25 +-
.../delta/MetaPageInitRootInlineRecord.java | 62 +++++
.../record/delta/MetaPageInitRootRecord.java | 3 +-
.../wal/record/delta/NewRootInitRecord.java | 26 +-
.../pagemem/wal/record/delta/ReplaceRecord.java | 23 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 10 +-
.../IgniteCacheDatabaseSharedManager.java | 9 +
.../cache/database/MetadataStorage.java | 15 +-
.../cache/database/freelist/FreeList.java | 6 +
.../cache/database/freelist/FreeListImpl.java | 43 +++
.../cache/database/freelist/PagesList.java | 258 ++++++++++-------
.../cache/database/tree/BPlusTree.java | 99 +++++--
.../cache/database/tree/io/BPlusIO.java | 22 +-
.../cache/database/tree/io/BPlusInnerIO.java | 44 +--
.../cache/database/tree/io/BPlusLeafIO.java | 9 +-
.../cache/database/tree/io/BPlusMetaIO.java | 45 ++-
.../cache/database/tree/io/DataPageIO.java | 4 +-
.../cache/database/tree/io/DataPagePayload.java | 2 +-
.../cache/database/tree/io/PageIO.java | 64 +++++
.../cluster/IgniteChangeGlobalStateSupport.java | 2 +
.../query/GridQueryIndexDescriptor.java | 7 +
.../processors/query/GridQueryProcessor.java | 47 +++-
.../processors/database/BPlusTreeSelfTest.java | 2 +-
.../processors/query/h2/IgniteH2Indexing.java | 23 +-
.../processors/query/h2/database/H2Tree.java | 57 +++-
.../query/h2/database/H2TreeIndex.java | 235 +++++++++++++++-
.../query/h2/database/InlineIndexHelper.java | 279 +++++++++++++++++++
.../query/h2/database/io/H2ExtrasInnerIO.java | 144 ++++++++++
.../query/h2/database/io/H2ExtrasLeafIO.java | 140 ++++++++++
.../processors/query/h2/opt/GridH2Row.java | 2 +-
.../processors/query/h2/opt/GridH2Table.java | 3 +-
.../h2/GridIndexingSpiAbstractSelfTest.java | 5 +
.../query/h2/database/H2TreeIndexTest.java | 59 ++++
.../h2/database/InlineIndexHelperTest.java | 46 +++
42 files changed, 1664 insertions(+), 243 deletions(-)
----------------------------------------------------------------------