ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] ignite git commit: 1093
Date Tue, 08 Sep 2015 16:19:21 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1093-2 3a6bc565c -> ce23c05c7


1093


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

Branch: refs/heads/ignite-1093-2
Commit: 53ba0df420d51d24fdaddcb062d0edc9921cded6
Parents: 3a6bc56
Author: Anton Vinogradov <av@apache.org>
Authored: Tue Sep 8 10:35:57 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Tue Sep 8 10:35:57 2015 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionDemander.java | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/53ba0df4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 7a0a94c..32595f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -249,7 +249,7 @@ public class GridDhtPartitionDemander {
                 return;
             }
 
-            final SyncFuture cSF = fut;
+            final SyncFuture curFut = fut;
 
             IgniteThread thread = new IgniteThread(cctx.gridName(), "demand-thread-" + cctx.cache().name(),
new Runnable() {
                 @Override public void run() {
@@ -258,22 +258,22 @@ public class GridDhtPartitionDemander {
                             log.debug("Waiting for marshaller cache preload [cacheName="
+ cctx.name() + ']');
 
                         try {
-                            IgniteInternalFuture fut;
+                            IgniteInternalFuture mFut;
                             do {
-                                fut = cctx.kernalContext().cache().marshallerCache().preloader().syncFuture();
+                                mFut = cctx.kernalContext().cache().marshallerCache().preloader().syncFuture();
                             }
-                            while (!((SyncFuture)fut).isInited() || ((SyncFuture)fut).topologyVersion().topologyVersion()
< cSF.topologyVersion().topologyVersion());
+                            while (!((SyncFuture)mFut).isInited() || ((SyncFuture)mFut).topologyVersion().topologyVersion()
< curFut.topologyVersion().topologyVersion());
 
-                            if (((SyncFuture)fut).topologyVersion().topologyVersion() >
cSF.topologyVersion().topologyVersion()) {
-                                cSF.onCancel();
+                            if (((SyncFuture)mFut).topologyVersion().topologyVersion() >
curFut.topologyVersion().topologyVersion()) {
+                                curFut.onCancel();
 
                                 return;
                             }
 
                             if (!topologyChanged(topVer))
-                                fut.get();
+                                mFut.get();
                             else {
-                                cSF.onCancel();
+                                curFut.onCancel();
 
                                 return;
                             }
@@ -282,13 +282,13 @@ public class GridDhtPartitionDemander {
                             if (log.isDebugEnabled()) {
                                 log.debug("Failed to wait for marshaller cache preload future
(grid is stopping): " +
                                     "[cacheName=" + cctx.name() + ']');
-                                cSF.onCancel();
+                                curFut.onCancel();
 
                                 return;
                             }
                         }
                         catch (IgniteCheckedException e) {
-                            cSF.onCancel();
+                            curFut.onCancel();
 
                             throw new Error("Ordered preload future should never fail: "
+ e.getMessage(), e);
                         }
@@ -297,18 +297,18 @@ public class GridDhtPartitionDemander {
                     int rebalanceOrder = cctx.config().getRebalanceOrder();
 
                     if (rebalanceOrder > 0) {
-                        IgniteInternalFuture<?> fut = cctx.kernalContext().cache().orderedPreloadFuture(rebalanceOrder);
+                        IgniteInternalFuture<?> oFut = cctx.kernalContext().cache().orderedPreloadFuture(rebalanceOrder);
 
                         try {
-                            if (fut != null) {
+                            if (oFut != null) {
                                 if (log.isDebugEnabled())
                                     log.debug("Waiting for dependant caches rebalance [cacheName="
+ cctx.name() +
                                         ", rebalanceOrder=" + rebalanceOrder + ']');
 
                                 if (!topologyChanged(topVer))
-                                    fut.get();
+                                    oFut.get();
                                 else {
-                                    cSF.onCancel();
+                                    curFut.onCancel();
 
                                     return;
                                 }
@@ -318,19 +318,19 @@ public class GridDhtPartitionDemander {
                             if (log.isDebugEnabled()) {
                                 log.debug("Failed to wait for ordered rebalance future (grid
is stopping): " +
                                     "[cacheName=" + cctx.name() + ", rebalanceOrder=" + rebalanceOrder
+ ']');
-                                cSF.onCancel();
+                                curFut.onCancel();
 
                                 return;
                             }
                         }
                         catch (IgniteCheckedException e) {
-                            cSF.onCancel();
+                            curFut.onCancel();
 
                             throw new Error("Ordered rebalance future should never fail:
" + e.getMessage(), e);
                         }
                     }
 
-                    requestPartitions(cSF);
+                    requestPartitions(curFut);
                 }
             });
 


Mime
View raw message