You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/02 15:08:09 UTC
[08/26] ignite git commit: start cache
start cache
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfad8434
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfad8434
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfad8434
Branch: refs/heads/ignite-5075
Commit: dfad84346a84d4d8eb470b14325e9e753d976147
Parents: 82f3a2f
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 27 18:26:02 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 27 18:26:02 2017 +0300
----------------------------------------------------------------------
.../affinity/AffinityTopologyVersion.java | 4 +++-
.../cache/CacheAffinitySharedManager.java | 2 --
.../CacheClientReconnectDiscoveryData.java | 9 ++++++++
.../internal/processors/cache/CacheData.java | 2 +-
.../cache/CacheJoinNodeDiscoveryData.java | 2 +-
.../cache/CacheNodeCommonDiscoveryData.java | 7 ++++++-
.../cache/DynamicCacheChangeBatch.java | 2 --
.../cache/DynamicCacheChangeRequest.java | 22 +++++---------------
.../processors/cache/ExchangeActions.java | 3 ++-
.../processors/cache/GridCacheContext.java | 3 ++-
.../processors/cache/GridCacheIoManager.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 3 ---
12 files changed, 30 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
index 4011d9b..0a6d965 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/AffinityTopologyVersion.java
@@ -23,7 +23,6 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.nio.ByteBuffer;
-import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
@@ -74,6 +73,9 @@ public class AffinityTopologyVersion implements Comparable<AffinityTopologyVersi
this.minorTopVer = minorTopVer;
}
+ /**
+ * @return Topology version with incremented minor version.
+ */
public AffinityTopologyVersion nextMinorVersion() {
assert topVer > 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 60eeef0..e599231 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -356,8 +356,6 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
assert old == null : old;
}
- boolean clientOnly = true;
-
// Affinity did not change for existing caches.
forAllCaches(crd && lateAffAssign, new IgniteInClosureX<GridAffinityAssignmentCache>() {
@Override public void applyx(GridAffinityAssignmentCache aff) throws IgniteCheckedException {
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java
index 34657b4..b791e35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheClientReconnectDiscoveryData.java
@@ -30,14 +30,23 @@ public class CacheClientReconnectDiscoveryData implements Serializable {
/** */
private final Map<String, CacheInfo> clientCaches;
+ /**
+ * @param clientCaches Information about caches started on re-joining client node.
+ */
public CacheClientReconnectDiscoveryData(Map<String, CacheInfo> clientCaches) {
this.clientCaches = clientCaches;
}
+ /**
+ * @return Information about caches started on re-joining client node.
+ */
Map<String, CacheInfo> clientCaches() {
return clientCaches;
}
+ /**
+ *
+ */
static class CacheInfo implements Serializable {
/** */
private final CacheConfiguration ccfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheData.java
index 4579c27..39c6e90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheData.java
@@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteUuid;
/**
- *
+ * Cache information sent in discovery data to joining node.
*/
public class CacheData implements Serializable {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java
index 0624217..e04e739 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheJoinNodeDiscoveryData.java
@@ -23,7 +23,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.lang.IgniteUuid;
/**
- *
+ * Information about configured caches sent from joining node.
*/
class CacheJoinNodeDiscoveryData implements Serializable {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheNodeCommonDiscoveryData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheNodeCommonDiscoveryData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheNodeCommonDiscoveryData.java
index 10df452..a2a7b30 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheNodeCommonDiscoveryData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheNodeCommonDiscoveryData.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.UUID;
/**
- *
+ * Cache information sent in discovery data to joining node.
*/
class CacheNodeCommonDiscoveryData implements Serializable {
/** */
@@ -34,6 +34,11 @@ class CacheNodeCommonDiscoveryData implements Serializable {
/** */
private final Map<String, Map<UUID, Boolean>> clientNodesMap;
+ /**
+ * @param caches
+ * @param templates
+ * @param clientNodesMap
+ */
CacheNodeCommonDiscoveryData(Map<String, CacheData> caches,
Map<String, CacheData> templates,
Map<String, Map<UUID, Boolean>> clientNodesMap) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
index f69246e..56639b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java
@@ -18,8 +18,6 @@
package org.apache.ignite.internal.processors.cache;
import java.util.Collection;
-import java.util.Map;
-import java.util.UUID;
import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index 642ec04..ee316ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -89,16 +89,18 @@ public class DynamicCacheChangeRequest implements Serializable {
/** Dynamic schema. */
private QuerySchema schema;
- /** */
- private transient AffinityTopologyVersion cacheFutTopVer;
-
/**
* Constructor creates cache stop request.
*
+ * @param reqId Unique request ID.
* @param cacheName Cache stop name.
* @param initiatingNodeId Initiating node ID.
*/
public DynamicCacheChangeRequest(UUID reqId, String cacheName, UUID initiatingNodeId) {
+ assert reqId != null;
+ assert cacheName != null;
+ assert initiatingNodeId != null;
+
this.reqId = reqId;
this.cacheName = cacheName;
this.initiatingNodeId = initiatingNodeId;
@@ -171,20 +173,6 @@ public class DynamicCacheChangeRequest implements Serializable {
}
/**
- * @param cacheFutTopVer Ready topology version when dynamic cache future should be completed.
- */
- public void cacheFutureTopologyVersion(AffinityTopologyVersion cacheFutTopVer) {
- this.cacheFutTopVer = cacheFutTopVer;
- }
-
- /**
- * @return Ready topology version when dynamic cache future should be completed.
- */
- @Nullable public AffinityTopologyVersion cacheFutureTopologyVersion() {
- return cacheFutTopVer;
- }
-
- /**
* @param template {@code True} if this is request for adding template configuration.
*/
public void template(boolean template) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
index a7b62ca..3d14f23 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeActions.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.internal.util.typedef.F;
import java.util.ArrayList;
@@ -211,8 +210,10 @@ public class ExchangeActions {
*
*/
static class ActionData {
+ /** */
private DynamicCacheChangeRequest req;
+ /** */
private DynamicCacheDescriptor desc;
public ActionData(DynamicCacheChangeRequest req, DynamicCacheDescriptor desc) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 67f25b5..1f6391b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -234,9 +234,10 @@ public class GridCacheContext<K, V> implements Externalizable {
/** */
private CountDownLatch startLatch = new CountDownLatch(1);
- /** Start topology version. */
+ /** Topology version when cache was started on local node. */
private AffinityTopologyVersion startTopVer;
+ /** Global cache start topology version. */
private AffinityTopologyVersion cacheStartTopVer;
/** Dynamic cache deployment ID. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/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 b9c066b..a80213d 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
@@ -150,7 +150,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
DynamicCacheDescriptor cacheDesc = cctx.cache().cacheDescriptor(cacheMsg.cacheId());
- // TODO: should be specified on request since cache desc can be removed,
+ // TODO: should be specified in request since cache desc can be removed,
if (cacheDesc != null)
startTopVer = cacheDesc.startTopologyVersion();
http://git-wip-us.apache.org/repos/asf/ignite/blob/dfad8434/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index a68d174..d486d3a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -199,9 +199,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/** Count down latch for caches. */
private final CountDownLatch cacheStartedLatch = new CountDownLatch(1);
- /** */
- //private Map<UUID, DynamicCacheChangeBatch> clientReconnectReqs;
-
/** Internal cache names. */
private final Set<String> internalCaches;