Repository: ignite Updated Branches: refs/heads/ignite-1272 ece9b5ad8 -> 889ae6704
ignite-1272: fixing hangings and failures Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/889ae670 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/889ae670 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/889ae670 Branch: refs/heads/ignite-1272 Commit: 889ae670499c53ae3e78ef0f4544cf88f3f56ef3 Parents: ece9b5a Author: Denis Magda <[email protected]> Authored: Thu Oct 8 13:29:24 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Thu Oct 8 13:29:24 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridCacheTxRecoveryRequest.java | 2 +- .../cache/distributed/GridDistributedTxRemoteAdapter.java | 4 ++-- .../processors/cache/transactions/IgniteInternalTx.java | 4 ++-- .../processors/cache/transactions/IgniteTxAdapter.java | 4 ++-- .../processors/cache/transactions/IgniteTxLocalAdapter.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/889ae670/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java index 6efb27c..844e4f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java @@ -80,7 +80,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { this.miniId = miniId; this.txNum = txNum; this.nearTxCheck = nearTxCheck; - this.depEnabled = tx.activeCachesDeploymentEnabled(); + this.depEnabled = false; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/889ae670/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index aa16a5f..0834e88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -193,8 +193,8 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter } /** {@inheritDoc} */ - @Nullable @Override public Boolean activeCachesDeploymentEnabled() { - return null; + @Override public boolean activeCachesDeploymentEnabled() { + return false; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/889ae670/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java index 95e7f99..20fb8c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java @@ -281,9 +281,9 @@ public interface IgniteInternalTx extends AutoCloseable, GridTimeoutObject { /** * @return {@code true} or {@code false} if the deployment is enabled or disabled for all active caches involved - * in this transaction. Returns {@code null} if there are no any active caches in the transaction yet. + * in this transaction. */ - @Nullable public Boolean activeCachesDeploymentEnabled(); + public boolean activeCachesDeploymentEnabled(); /** * Attempts to set topology version and returns the current value. http://git-wip-us.apache.org/repos/asf/ignite/blob/889ae670/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 2139696..7d7e3e8 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 @@ -1757,8 +1757,8 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Nullable @Override public Boolean activeCachesDeploymentEnabled() { - return null; + @Override public boolean activeCachesDeploymentEnabled() { + return false; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/889ae670/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 24eefa2..f22e753 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -165,7 +165,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter protected GridCacheReturn implicitRes; /** Flag indicating whether deployment is enabled for caches from this transaction or not. */ - private Boolean depEnabled; + private boolean depEnabled; /** * Empty constructor required for {@link Externalizable}. @@ -279,7 +279,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter } /** {@inheritDoc} */ - @Nullable @Override public Boolean activeCachesDeploymentEnabled() { + @Override public boolean activeCachesDeploymentEnabled() { return depEnabled; } @@ -3243,7 +3243,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter else activeCacheIds.add(cacheId); - if (depEnabled == null) + if (activeCacheIds.size() == 1) depEnabled = cacheCtx.deploymentEnabled(); } }
