ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [25/53] [abbrv] ignite git commit: IGNITE-2310 Lock cache partition for affinityRun/affinityCall execution - fix reservable
Date Fri, 19 Aug 2016 11:48:42 GMT
IGNITE-2310 Lock cache partition for affinityRun/affinityCall execution -  fix reservable


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

Branch: refs/heads/ignite-3299
Commit: 8bf0a48cf21c5b75feb62481ddfca102b4a84fd9
Parents: 47da199
Author: tledkov-gridgain <tledkov@gridgain.com>
Authored: Wed Aug 10 12:07:21 2016 +0300
Committer: tledkov-gridgain <tledkov@gridgain.com>
Committed: Wed Aug 10 12:07:21 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridReservable.java        | 5 +----
 .../apache/ignite/internal/processors/job/GridJobProcessor.java | 4 ++--
 .../ignite/internal/processors/query/GridQueryProcessor.java    | 4 ++--
 .../IgniteCacheLockPartitionOnAffinityRunAbstractTest.java      | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8bf0a48c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
index 068c68d..51f22bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridReservable.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.dht;
 
-import org.apache.ignite.IgniteCheckedException;
-
 /**
  * Reservations support.
  */
@@ -27,9 +25,8 @@ public interface GridReservable {
      * Reserves.
      *
      * @return {@code true} If reserved successfully.
-     * @throws IgniteCheckedException If failed.
      */
-    public boolean reserve() throws IgniteCheckedException;
+    public boolean reserve();
 
     /**
      * Releases.

http://git-wip-us.apache.org/repos/asf/ignite/blob/8bf0a48c/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 6a162d3..8db0936 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -1518,7 +1518,7 @@ public class GridJobProcessor extends GridProcessorAdapter {
         }
 
         /** {@inheritDoc} */
-        @Override public boolean reserve() throws IgniteCheckedException {
+        @Override public boolean reserve() {
             boolean reserved = false;
 
             try {
@@ -1568,7 +1568,7 @@ public class GridJobProcessor extends GridProcessorAdapter {
                     }
                     finally {
                         if (checkPartMapping && !cctx.affinity().primary(partId,
topVer).id().equals(ctx.localNodeId()))
-                            throw new IgniteCheckedException("Failed partition reservation.
" +
+                            throw new IgniteException("Failed partition reservation. " +
                                 "Partition is not primary on the node. [partition=" + partId
+ ", cacheName=" + cctx.name() +
                                 ", nodeId=" + ctx.localNodeId() + ", topology=" + topVer
+ ']');
                     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/8bf0a48c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index d73b6ca..7ed4a2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -808,7 +808,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
                             sqlQry,
                             F.asList(params),
                             typeDesc,
-                            idx.backupFilter(null, requestTopVer.get(), null));
+                            idx.backupFilter(requestTopVer.get(), null));
 
                         sendQueryExecutedEvent(
                             sqlQry,
@@ -894,7 +894,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
                     Object[] args = qry.getArgs();
 
                     final GridQueryFieldsResult res = idx.queryLocalSqlFields(space, sql,
F.asList(args),
-                        idx.backupFilter(null, requestTopVer.get(), null), qry.isEnforceJoinOrder());
+                        idx.backupFilter(requestTopVer.get(), null), qry.isEnforceJoinOrder());
 
                     sendQueryExecutedEvent(sql, args);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/8bf0a48c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
index 11dc6c5..4c99421 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunAbstractTest.java
@@ -32,7 +32,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
 
 /**
- * Base class of for the tests to validate https://issues.apache.org/jira/browse/IGNITE-2310
+ * Base class of the tests to validate https://issues.apache.org/jira/browse/IGNITE-2310
  */
 public class IgniteCacheLockPartitionOnAffinityRunAbstractTest extends GridCacheAbstractSelfTest
{
     /** Count of affinity run threads. */


Mime
View raw message