ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1.5 debug
Date Tue, 29 Dec 2015 07:23:04 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1537 463e34592 -> 9449ca208


ignite-1.5 debug


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

Branch: refs/heads/ignite-1537
Commit: 9449ca20877c4e835d3133623d8520a0bb6bc62a
Parents: 463e345
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Dec 29 10:14:35 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Dec 29 10:14:35 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/IgniteKernal.java   | 8 +++++++-
 .../processors/cache/transactions/IgniteTxAdapter.java       | 3 ++-
 .../rest/handlers/cache/GridCacheCommandHandler.java         | 2 ++
 .../processors/cache/IgniteDynamicCacheStartSelfTest.java    | 7 ++++++-
 .../IgniteTcpCommunicationRecoveryAckClosureSelfTest.java    | 3 +--
 5 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9449ca20/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 750c883..3def718 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
@@ -2434,7 +2434,12 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
         guard();
 
         try {
-            ctx.cache().dynamicStartCache(cacheCfg, cacheCfg.getName(), null, true, true,
true).get();
+            ctx.cache().dynamicStartCache(cacheCfg,
+                cacheCfg.getName(),
+                null,
+                true,
+                true,
+                true).get();
 
             return ctx.cache().publicJCache(cacheCfg.getName());
         }
@@ -2630,6 +2635,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
 
     /**
      * @param cache Cache.
+     * @throws IgniteCheckedException If cache without near cache was already started.
      */
     private void checkNearCacheStarted(IgniteCacheProxy<?, ?> cache) throws IgniteCheckedException
{
         if (!cache.context().isNear())

http://git-wip-us.apache.org/repos/asf/ignite/blob/9449ca20/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 66434d0..41b0f76 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@ -800,7 +800,8 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter
     }
 
     /**
-     *
+     * Changes transaction state from COMMITTING to MARKED_ROLLBACK.
+     * Must be called only from thread committing transaction.
      */
     protected final void errorWhenCommitting() {
         synchronized (this) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/9449ca20/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
index 1c7415f..a89913f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
@@ -357,6 +357,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter
{
 
             switch (cmd) {
                 case DESTROY_CACHE: {
+                    // Do not check thread tx here since there can be active system cache
txs.
                     fut = ((IgniteKernal)ctx.grid()).destroyCacheAsync(cacheName, false).chain(
                         new CX1<IgniteInternalFuture<?>, GridRestResponse>()
{
                             @Override public GridRestResponse applyx(IgniteInternalFuture<?>
f)
@@ -369,6 +370,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter
{
                 }
 
                 case GET_OR_CREATE_CACHE: {
+                    // Do not check thread tx here since there can be active system cache
txs.
                     fut = ((IgniteKernal)ctx.grid()).getOrCreateCacheAsync(cacheName, false).chain(
                         new CX1<IgniteInternalFuture<?>, GridRestResponse>()
{
                             @Override public GridRestResponse applyx(IgniteInternalFuture<?>
f)

http://git-wip-us.apache.org/repos/asf/ignite/blob/9449ca20/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
index 04add6b..c9cd750 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
@@ -223,7 +223,12 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest
{
 
                 IgniteEx kernal = grid(ThreadLocalRandom.current().nextInt(nodeCount()));
 
-                futs.add(kernal.context().cache().dynamicStartCache(ccfg, ccfg.getName(),
null, true, true, true));
+                futs.add(kernal.context().cache().dynamicStartCache(ccfg,
+                    ccfg.getName(),
+                    null,
+                    true,
+                    true,
+                    true));
 
                 return null;
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/9449ca20/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java
index cbfafc9..b7c0deb 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/IgniteTcpCommunicationRecoveryAckClosureSelfTest.java
@@ -348,8 +348,7 @@ public class IgniteTcpCommunicationRecoveryAckClosureSelfTest<T extends
Communic
         assertEquals(expMsgs, lsnr.rcvCnt.get());
 
         GridTestUtils.waitForCondition(new GridAbsPredicate() {
-            @Override
-            public boolean apply() {
+            @Override public boolean apply() {
                 return expMsgs == ackMsgs.get();
             }
         }, 5000);


Mime
View raw message