You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2015/10/08 13:46:51 UTC
[4/4] ignite git commit: ignite-1272: GridDhtTxPrepareResponse didn't
have deployment related info
ignite-1272: GridDhtTxPrepareResponse didn't have deployment related info
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc13beb2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc13beb2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc13beb2
Branch: refs/heads/ignite-1272
Commit: bc13beb2735aab1d8763d53630c071dde42ce7d2
Parents: 709088a
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Oct 8 14:46:15 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Oct 8 14:46:15 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheIoManager.java | 7 +++++--
.../cache/distributed/dht/GridDhtTxPrepareResponse.java | 5 ++++-
.../processors/cache/transactions/IgniteTxHandler.java | 3 ++-
3 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc13beb2/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 90fd160..0cac67a 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
@@ -555,9 +555,12 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
else {
GridCacheContext ctx = cctx.cacheContext(msg.cacheId());
- if (ctx == null)
+ if (ctx == null) {
+ U.error(log, "Deployment related info is missing in message: [msg=" + msg + ']');
+
throw new IgniteCheckedException("Deployment related info is missing in message: [msg=" +
- msg +']');
+ msg + ']');
+ }
depEnabled0 = ctx.deploymentEnabled();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc13beb2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
index b0a2475..e6f92c9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
@@ -102,8 +102,10 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
* @param futId Future ID.
* @param miniId Mini future ID.
* @param err Error.
+ * @param depEnabled Deployment enabled.
*/
- public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId, Throwable err) {
+ public GridDhtTxPrepareResponse(GridCacheVersion xid, IgniteUuid futId, IgniteUuid miniId, Throwable err,
+ boolean depEnabled) {
super(xid, err);
assert futId != null;
@@ -111,6 +113,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse {
this.futId = futId;
this.miniId = miniId;
+ this.depEnabled = depEnabled;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc13beb2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 950bf01..d5485f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -835,7 +835,8 @@ public class IgniteTxHandler {
if (nearTx != null)
nearTx.rollback();
- res = new GridDhtTxPrepareResponse(req.version(), req.futureId(), req.miniId(), e);
+ res = new GridDhtTxPrepareResponse(req.version(), req.futureId(), req.miniId(), e, req.deployInfo()
+ != null);
}
try {