ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: 1093
Date Thu, 29 Oct 2015 07:44:57 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1093-3 2b23a3db8 -> e2f2ee4af


1093


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e2f2ee4a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e2f2ee4a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e2f2ee4a

Branch: refs/heads/ignite-1093-3
Commit: e2f2ee4af018d607060bc11de1d287cef61788d0
Parents: 2b23a3d
Author: Anton Vinogradov <av@apache.org>
Authored: Thu Oct 29 10:44:48 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Thu Oct 29 10:44:48 2015 +0300

----------------------------------------------------------------------
 .../dht/GridCacheTxNodeFailureSelfTest.java     | 154 +++++++++----------
 1 file changed, 76 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e2f2ee4a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index fc7b49f..fe0b84e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -98,13 +98,6 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest
{
     }
 
     /**
-     *
-     */
-    @Override protected void afterTest() throws Exception {
-        stopAllGrids();
-    }
-
-    /**
      * @throws Exception If failed.
      */
     public void testPrimaryNodeFailureBackupCommitPessimistic() throws Exception {
@@ -198,59 +191,89 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest
{
         boolean backup,
         final boolean commit
     ) throws Exception {
-        startGrids(gridCount());
-        awaitPartitionMapExchange();
+        try {
+            startGrids(gridCount());
+            awaitPartitionMapExchange();
 
-        for (int i = 0; i < gridCount(); i++)
-            info("Grid " + i + ": " + ignite(i).cluster().localNode().id());
+            for (int i = 0; i < gridCount(); i++)
+                info("Grid " + i + ": " + ignite(i).cluster().localNode().id());
 
-        final Ignite ignite = ignite(0);
+            final Ignite ignite = ignite(0);
 
-        final IgniteCache<Object, Object> cache = ignite.cache(null).withNoRetries();
+            final IgniteCache<Object, Object> cache = ignite.cache(null).withNoRetries();
 
-        final int key = generateKey(ignite, backup);
+            final int key = generateKey(ignite, backup);
 
-        IgniteEx backupNode = (IgniteEx)backupNode(key, null);
+            IgniteEx backupNode = (IgniteEx)backupNode(key, null);
 
-        assertNotNull(backupNode);
+            assertNotNull(backupNode);
 
-        final CountDownLatch commitLatch = new CountDownLatch(1);
+            final CountDownLatch commitLatch = new CountDownLatch(1);
 
-        if (!commit)
-            communication(1).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareRequest.class));
-        else {
-            if (!backup) {
-                communication(2).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareResponse.class));
-                communication(3).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareResponse.class));
+            if (!commit)
+                communication(1).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareRequest.class));
+            else {
+                if (!backup) {
+                    communication(2).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareResponse.class));
+                    communication(3).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareResponse.class));
+                }
+                else
+                    communication(0).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareResponse.class));
             }
-            else
-                communication(0).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareResponse.class));
-        }
 
-        IgniteInternalFuture<Object> fut = GridTestUtils.runAsync(new Callable<Object>()
{
-            @Override public Object call() throws Exception {
-                if (conc != null) {
-                    try (Transaction tx = ignite.transactions().txStart(conc, REPEATABLE_READ))
{
-                        cache.put(key, key);
+            IgniteInternalFuture<Object> fut = GridTestUtils.runAsync(new Callable<Object>()
{
+                @Override public Object call() throws Exception {
+                    if (conc != null) {
+                        try (Transaction tx = ignite.transactions().txStart(conc, REPEATABLE_READ))
{
+                            cache.put(key, key);
+
+                            Transaction asyncTx = (Transaction)tx.withAsync();
+
+                            asyncTx.commit();
+
+                            commitLatch.countDown();
+
+                            try {
+                                IgniteFuture<Object> fut = asyncTx.future();
+
+                                fut.get();
+
+                                if (!commit) {
+                                    error("Transaction has been committed");
+
+                                    fail("Transaction has been committed: " + tx);
+                                }
+                            }
+                            catch (TransactionRollbackException e) {
+                                if (commit) {
+                                    error(e.getMessage(), e);
+
+                                    fail("Failed to commit: " + e);
+                                }
+                                else
+                                    assertTrue(X.hasCause(e, TransactionRollbackException.class));
+                            }
+                        }
+                    }
+                    else {
+                        IgniteCache<Object, Object> cache0 = cache.withAsync();
 
-                        Transaction asyncTx = (Transaction)tx.withAsync();
+                        cache0.put(key, key);
 
-                        asyncTx.commit();
+                        Thread.sleep(1000);
 
                         commitLatch.countDown();
 
                         try {
-                            IgniteFuture<Object> fut = asyncTx.future();
-
-                            fut.get();
+                            cache0.future().get();
 
                             if (!commit) {
                                 error("Transaction has been committed");
 
-                                fail("Transaction has been committed: " + tx);
+                                fail("Transaction has been committed.");
                             }
                         }
-                        catch (TransactionRollbackException e) {
+                        catch (CacheException e) {
                             if (commit) {
                                 error(e.getMessage(), e);
 
@@ -260,53 +283,28 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest
{
                                 assertTrue(X.hasCause(e, TransactionRollbackException.class));
                         }
                     }
-                }
-                else {
-                    IgniteCache<Object, Object> cache0 = cache.withAsync();
-
-                    cache0.put(key, key);
-
-                    Thread.sleep(1000);
-
-                    commitLatch.countDown();
-
-                    try {
-                        cache0.future().get();
-
-                        if (!commit) {
-                            error("Transaction has been committed");
-
-                            fail("Transaction has been committed.");
-                        }
-                    }
-                    catch (CacheException e) {
-                        if (commit) {
-                            error(e.getMessage(), e);
 
-                            fail("Failed to commit: " + e);
-                        }
-                        else
-                            assertTrue(X.hasCause(e, TransactionRollbackException.class));
-                    }
+                    return null;
                 }
+            });
 
-                return null;
-            }
-        });
-
-        commitLatch.await();
+            commitLatch.await();
 
-        stopGrid(1);
+            stopGrid(1);
 
-        // Check that thread successfully finished.
-        fut.get();
+            // Check that thread successfully finished.
+            fut.get();
 
-        // Check there are no hanging transactions.
-        assertEquals(0, ((IgniteEx)ignite(0)).context().cache().context().tm().idMapSize());
-        assertEquals(0, ((IgniteEx)ignite(2)).context().cache().context().tm().idMapSize());
-        assertEquals(0, ((IgniteEx)ignite(3)).context().cache().context().tm().idMapSize());
+            // Check there are no hanging transactions.
+            assertEquals(0, ((IgniteEx)ignite(0)).context().cache().context().tm().idMapSize());
+            assertEquals(0, ((IgniteEx)ignite(2)).context().cache().context().tm().idMapSize());
+            assertEquals(0, ((IgniteEx)ignite(3)).context().cache().context().tm().idMapSize());
 
-        dataCheck((IgniteKernal)ignite(0), (IgniteKernal)backupNode, key, commit);
+            dataCheck((IgniteKernal)ignite(0), (IgniteKernal)backupNode, key, commit);
+        }
+        finally {
+            stopAllGrids();
+        }
     }
 
     /**


Mime
View raw message