You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by GitBox <gi...@apache.org> on 2019/01/08 12:47:44 UTC
[GitHub] aealeksandrov closed pull request #5782: Ignite 2.7.1 p2
aealeksandrov closed pull request #5782: Ignite 2.7.1 p2
URL: https://github.com/apache/ignite/pull/5782
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/examples/sql/world.sql b/examples/sql/world.sql
index a34ee71fbf5d..829fba12abea 100644
--- a/examples/sql/world.sql
+++ b/examples/sql/world.sql
@@ -2,30 +2,30 @@ DROP TABLE IF EXISTS Country;
CREATE TABLE Country (
Code CHAR(3) PRIMARY KEY,
- Name CHAR(52),
- Continent CHAR(50),
- Region CHAR(26),
+ Name VARCHAR,
+ Continent VARCHAR,
+ Region VARCHAR,
SurfaceArea DECIMAL(10,2),
- IndepYear SMALLINT(6),
- Population INT(11),
+ IndepYear SMALLINT,
+ Population INT,
LifeExpectancy DECIMAL(3,1),
GNP DECIMAL(10,2),
GNPOld DECIMAL(10,2),
- LocalName CHAR(45),
- GovernmentForm CHAR(45),
- HeadOfState CHAR(60),
- Capital INT(11),
+ LocalName VARCHAR,
+ GovernmentForm VARCHAR,
+ HeadOfState VARCHAR,
+ Capital INT,
Code2 CHAR(2)
) WITH "template=partitioned, backups=1, CACHE_NAME=Country, VALUE_TYPE=demo.model.Country";
DROP TABLE IF EXISTS City;
CREATE TABLE City (
- ID INT(11),
- Name CHAR(35),
+ ID INT,
+ Name VARCHAR,
CountryCode CHAR(3),
- District CHAR(20),
- Population INT(11),
+ District VARCHAR,
+ Population INT,
PRIMARY KEY (ID, CountryCode)
) WITH "template=partitioned, backups=1, affinityKey=CountryCode, CACHE_NAME=City, KEY_TYPE=demo.model.CityKey, VALUE_TYPE=demo.model.City";
@@ -35,7 +35,7 @@ DROP TABLE IF EXISTS CountryLanguage;
CREATE TABLE CountryLanguage (
CountryCode CHAR(3),
- Language CHAR(30),
+ Language VARCHAR,
IsOfficial CHAR(2),
Percentage DECIMAL(4,1),
PRIMARY KEY (CountryCode, Language)
diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml
index 1ea984c6c544..06e0e505cd2a 100644
--- a/modules/benchmarks/pom.xml
+++ b/modules/benchmarks/pom.xml
@@ -62,6 +62,16 @@
<version>${jmh.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -131,4 +141,4 @@
</plugins>
</pluginManagement>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/algo/BenchmarkCRC.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/algo/BenchmarkCRC.java
new file mode 100644
index 000000000000..5c922fead0c8
--- /dev/null
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/algo/BenchmarkCRC.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.benchmarks.jmh.algo;
+
+import org.apache.ignite.internal.processors.cache.persistence.wal.crc.FastCrc;
+import org.apache.ignite.internal.processors.cache.persistence.wal.crc.PureJavaCrc32;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.nio.ByteBuffer;
+import java.util.Random;
+
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static org.openjdk.jmh.annotations.Mode.AverageTime;
+import static org.openjdk.jmh.annotations.Scope.Thread;
+
+/**
+ *
+ */
+@State(Thread)
+@OutputTimeUnit(NANOSECONDS)
+@BenchmarkMode(AverageTime)
+@Fork(value = 1, jvmArgsAppend = {"-XX:+UnlockDiagnosticVMOptions"})
+@Warmup(iterations = 5)
+@Measurement(iterations = 5)
+public class BenchmarkCRC {
+ /** */
+ static final int SIZE = 1024;
+
+ /** */
+ static final int BUF_LEN = 4096;
+
+ /** */
+ @State(Thread)
+ public static class Context {
+ /** */
+ final int[] results = new int[SIZE];
+
+ /** */
+ final ByteBuffer bb = ByteBuffer.allocate(BUF_LEN);
+
+ /** */
+ @Setup
+ public void setup() {
+ new Random().ints(BUF_LEN, Byte.MIN_VALUE, Byte.MAX_VALUE).forEach(k -> bb.put((byte) k));
+ }
+ }
+
+ /** */
+ @Benchmark
+ public int[] pureJavaCrc32(Context context) {
+ for (int i = 0; i < SIZE; i++) {
+ context.bb.rewind();
+
+ context.results[i] = PureJavaCrc32.calcCrc32(context.bb, BUF_LEN);
+ }
+
+ return context.results;
+ }
+
+ /** */
+ @Benchmark
+ public int[] crc32(Context context) {
+ for (int i = 0; i < SIZE; i++) {
+ context.bb.rewind();
+
+ context.results[i] = FastCrc.calcCrc(context.bb, BUF_LEN);
+ }
+
+ return context.results;
+ }
+}
+
+
diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
new file mode 100644
index 000000000000..f3bbcb96d6cb
--- /dev/null
+++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
@@ -0,0 +1,185 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.benchmarks.jmh.misc;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import org.apache.ignite.internal.benchmarks.jmh.JmhAbstractBenchmark;
+import org.apache.ignite.internal.benchmarks.jmh.runner.JmhIdeBenchmarkRunner;
+import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
+import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState;
+import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
+import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionsStateValidator;
+import org.apache.ignite.internal.util.typedef.T2;
+import org.jetbrains.annotations.Nullable;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.IntStream;
+
+import static org.openjdk.jmh.annotations.Scope.Thread;
+
+/** */
+@State(Scope.Benchmark)
+public class GridDhtPartitionsStateValidatorBenchmark extends JmhAbstractBenchmark {
+ /** */
+ @State(Thread)
+ public static class Context {
+ /** */
+ private final UUID localNodeId = UUID.randomUUID();
+
+ /** */
+ private GridCacheSharedContext cctxMock;
+
+ /** */
+ private GridDhtPartitionTopology topologyMock;
+
+ /** */
+ private GridDhtPartitionsStateValidator validator;
+
+ /** */
+ private Map<UUID, GridDhtPartitionsSingleMessage> messages = new HashMap<>();
+
+ /** */
+ private UUID ignoreNode = UUID.randomUUID();
+
+ /** */
+ private static final int NODES = 3;
+
+ /** */
+ private static final int PARTS = 100;
+
+ /**
+ * @return Partition mock with specified {@code id}, {@code updateCounter} and {@code size}.
+ */
+ private GridDhtLocalPartition partitionMock(int id, long updateCounter, long size) {
+ GridDhtLocalPartition partitionMock = Mockito.mock(GridDhtLocalPartition.class);
+ Mockito.when(partitionMock.id()).thenReturn(id);
+ Mockito.when(partitionMock.updateCounter()).thenReturn(updateCounter);
+ Mockito.when(partitionMock.fullSize()).thenReturn(size);
+ Mockito.when(partitionMock.state()).thenReturn(GridDhtPartitionState.OWNING);
+ return partitionMock;
+ }
+
+ /**
+ * @param countersMap Update counters map.
+ * @param sizesMap Sizes map.
+ * @return Message with specified {@code countersMap} and {@code sizeMap}.
+ */
+ private GridDhtPartitionsSingleMessage from(@Nullable Map<Integer, T2<Long, Long>> countersMap, @Nullable Map<Integer, Long> sizesMap) {
+ GridDhtPartitionsSingleMessage msg = new GridDhtPartitionsSingleMessage();
+ if (countersMap != null)
+ msg.addPartitionUpdateCounters(0, countersMap);
+ if (sizesMap != null)
+ msg.addPartitionSizes(0, sizesMap);
+ return msg;
+ }
+
+ /** */
+ @Setup
+ public void setup() {
+ // Prepare mocks.
+ cctxMock = Mockito.mock(GridCacheSharedContext.class);
+ Mockito.when(cctxMock.localNodeId()).thenReturn(localNodeId);
+
+ topologyMock = Mockito.mock(GridDhtPartitionTopology.class);
+ Mockito.when(topologyMock.partitionState(Matchers.any(), Matchers.anyInt())).thenReturn(GridDhtPartitionState.OWNING);
+ Mockito.when(topologyMock.groupId()).thenReturn(0);
+
+ Mockito.when(topologyMock.partitions()).thenReturn(PARTS);
+
+ List<GridDhtLocalPartition> localPartitions = Lists.newArrayList();
+
+ Map<Integer, T2<Long, Long>> updateCountersMap = new HashMap<>();
+
+ Map<Integer, Long> cacheSizesMap = new HashMap<>();
+
+ IntStream.range(0, PARTS).forEach(k -> { localPartitions.add(partitionMock(k, k + 1, k + 1));
+ long us = k > 20 && k <= 30 ? 0 :k + 2L;
+ updateCountersMap.put(k, new T2<>(k + 2L, us));
+ cacheSizesMap.put(k, us); });
+
+ Mockito.when(topologyMock.localPartitions()).thenReturn(localPartitions);
+ Mockito.when(topologyMock.currentLocalPartitions()).thenReturn(localPartitions);
+
+ // Form single messages map.
+ Map<UUID, GridDhtPartitionsSingleMessage> messages = new HashMap<>();
+
+ for (int n = 0; n < NODES; ++n) {
+ UUID remoteNode = UUID.randomUUID();
+
+ messages.put(remoteNode, from(updateCountersMap, cacheSizesMap));
+ }
+
+ messages.put(ignoreNode, from(updateCountersMap, cacheSizesMap));
+
+ validator = new GridDhtPartitionsStateValidator(cctxMock);
+ }
+ }
+
+ /** */
+ @Benchmark
+ public void testValidatePartitionsUpdateCounters(Context context) {
+ context.validator.validatePartitionsUpdateCounters(context.topologyMock,
+ context.messages, Sets.newHashSet(context.ignoreNode));
+ }
+
+ /** */
+ @Benchmark
+ public void testValidatePartitionsSizes(Context context) {
+ context.validator.validatePartitionsSizes(context.topologyMock, context
+ .messages, Sets.newHashSet(context.ignoreNode));
+ }
+
+ /**
+ * Run benchmarks.
+ *
+ * @param args Arguments.
+ * @throws Exception If failed.
+ */
+ public static void main(String[] args) throws Exception {
+ run(1);
+ }
+
+ /**
+ * Run benchmark.
+ *
+ * @param threads Amount of threads.
+ * @throws Exception If failed.
+ */
+ private static void run(int threads) throws Exception {
+ JmhIdeBenchmarkRunner.create()
+ .forks(1)
+ .threads(threads)
+ .warmupIterations(5)
+ .measurementIterations(10)
+ .benchmarks(GridDhtPartitionsStateValidatorBenchmark.class.getSimpleName())
+ .jvmArguments("-XX:+UseG1GC", "-Xms4g", "-Xmx4g")
+ .run();
+ }
+}
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
index 46aaa6ba387b..ee6e9f101c75 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
@@ -308,6 +308,9 @@ public void testClosure() throws Exception {
}
/**
+ * Events for class tasks that was started from external clients should contain
+ * client subject id instead of the node where it was started. This test checks it.
+ *
* @throws Exception If failed.
*/
public void testClient() throws Exception {
@@ -328,7 +331,7 @@ public void testClient() throws Exception {
assert evt != null;
assertEquals(EVT_TASK_STARTED, evt.type());
- assertEquals(nodeId, evt.subjectId());
+ assertEquals(client.id(), evt.subjectId());
assert it.hasNext();
@@ -337,7 +340,7 @@ public void testClient() throws Exception {
assert evt != null;
assertEquals(EVT_TASK_REDUCED, evt.type());
- assertEquals(nodeId, evt.subjectId());
+ assertEquals(client.id(), evt.subjectId());
assert it.hasNext();
@@ -346,7 +349,7 @@ public void testClient() throws Exception {
assert evt != null;
assertEquals(EVT_TASK_FINISHED, evt.type());
- assertEquals(nodeId, evt.subjectId());
+ assertEquals(client.id(), evt.subjectId());
assert !it.hasNext();
}
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index 657fda4a8017..158cd59740be 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -53,6 +53,7 @@
import org.apache.ignite.internal.processors.rest.ClientMemcachedProtocolSelfTest;
import org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithCredsSelfTest;
import org.apache.ignite.internal.processors.rest.JettyRestProcessorAuthenticationWithTokenSelfTest;
+import org.apache.ignite.internal.processors.rest.JettyRestProcessorBaselineSelfTest;
import org.apache.ignite.internal.processors.rest.JettyRestProcessorGetAllAsArrayTest;
import org.apache.ignite.internal.processors.rest.JettyRestProcessorSignedSelfTest;
import org.apache.ignite.internal.processors.rest.JettyRestProcessorUnsignedSelfTest;
@@ -97,6 +98,7 @@ public static TestSuite suite() {
suite.addTestSuite(JettyRestProcessorAuthenticationWithCredsSelfTest.class);
suite.addTestSuite(JettyRestProcessorAuthenticationWithTokenSelfTest.class);
suite.addTestSuite(JettyRestProcessorGetAllAsArrayTest.class);
+ suite.addTestSuite(JettyRestProcessorBaselineSelfTest.class);
// Test TCP rest processor with original memcache client.
suite.addTestSuite(ClientMemcachedProtocolSelfTest.class);
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorBaselineSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorBaselineSelfTest.java
new file mode 100644
index 000000000000..8f4548f8bce0
--- /dev/null
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorBaselineSelfTest.java
@@ -0,0 +1,213 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.rest;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import org.apache.ignite.cluster.BaselineNode;
+import org.apache.ignite.configuration.DataRegionConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.processors.rest.handlers.cluster.GridBaselineCommandResponse;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
+
+import static org.apache.ignite.configuration.WALMode.NONE;
+import static org.apache.ignite.internal.processors.rest.GridRestResponse.STATUS_SUCCESS;
+
+/**
+ * Test REST with enabled authentication.
+ */
+public class JettyRestProcessorBaselineSelfTest extends JettyRestProcessorCommonSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+
+ super.beforeTestsStarted();
+
+ // We need to activate cluster.
+ grid(0).cluster().active(true);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ grid(0).cluster().setBaselineTopology(grid(0).cluster().topologyVersion());
+ }
+
+ /** {@inheritDoc} */
+ @Override protected String signature() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ DataStorageConfiguration dsCfg = new DataStorageConfiguration()
+ .setDefaultDataRegionConfiguration(new DataRegionConfiguration()
+ .setMaxSize(100 * 1024 * 1024)
+ .setPersistenceEnabled(true))
+ .setWalMode(NONE);
+
+ cfg.setDataStorageConfiguration(dsCfg);
+
+ return cfg;
+ }
+
+ /**
+ * @param nodes Collection of grid nodes.
+ * @return Collection of node consistent IDs for given collection of grid nodes.
+ */
+ private static Collection<String> nodeConsistentIds(@Nullable Collection<? extends BaselineNode> nodes) {
+ if (nodes == null || nodes.isEmpty())
+ return Collections.emptyList();
+
+ return F.viewReadOnly(nodes, n -> String.valueOf(n.consistentId()));
+ }
+
+ /**
+ * @param content Content to check.
+ * @param baselineSz Expected baseline size.
+ * @param srvsSz Expected server nodes count.
+ */
+ private void assertBaseline(String content, int baselineSz, int srvsSz) throws IOException {
+ assertNotNull(content);
+ assertFalse(content.isEmpty());
+
+ JsonNode node = JSON_MAPPER.readTree(content);
+
+ assertEquals(STATUS_SUCCESS, node.get("successStatus").asInt());
+ assertTrue(node.get("error").isNull());
+
+ assertNotSame(securityEnabled(), node.get("sessionToken").isNull());
+
+ JsonNode res = node.get("response");
+
+ assertFalse(res.isNull());
+
+ GridBaselineCommandResponse baseline = JSON_MAPPER.treeToValue(res, GridBaselineCommandResponse.class);
+
+ assertTrue(baseline.isActive());
+ assertEquals(grid(0).cluster().topologyVersion(), baseline.getTopologyVersion());
+ assertEquals(baselineSz, baseline.getBaseline().size());
+ assertEqualsCollections(nodeConsistentIds(grid(0).cluster().currentBaselineTopology()), baseline.getBaseline());
+ assertEquals(srvsSz, baseline.getServers().size());
+ assertEqualsCollections(nodeConsistentIds(grid(0).cluster().nodes()), baseline.getServers());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testBaseline() throws Exception {
+ int sz = gridCount();
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz);
+
+ // Stop one node. It will stay in baseline.
+ stopGrid(sz - 1);
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz - 1);
+
+ // Start one node. Server node will be added, but baseline will not change.
+ startGrid(sz - 1);
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testBaselineSet() throws Exception {
+ int sz = gridCount();
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz);
+
+ startGrid(sz);
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz + 1);
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_SET, "topVer",
+ String.valueOf(grid(0).cluster().topologyVersion())), sz + 1, sz + 1);
+
+ stopGrid(sz);
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz + 1, sz);
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_SET, "topVer",
+ String.valueOf(grid(0).cluster().topologyVersion())), sz, sz);
+
+ startGrid(sz);
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz + 1);
+
+ ArrayList<String> params = new ArrayList<>();
+ int i = 1;
+
+ for (BaselineNode n : grid(0).cluster().nodes()) {
+ params.add("consistentId" + i++);
+ params.add(String.valueOf(n.consistentId()));
+ }
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_SET, params.toArray(new String[0])),
+ sz + 1, sz + 1);
+
+ stopGrid(sz);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testBaselineAdd() throws Exception {
+ int sz = gridCount();
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz);
+
+ startGrid(sz);
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz + 1);
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_ADD, "consistentId1",
+ grid(sz).localNode().consistentId().toString()), sz + 1, sz + 1);
+
+ stopGrid(sz);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testBaselineRemove() throws Exception {
+ int sz = gridCount();
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz);
+
+ startGrid(sz);
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz, sz + 1);
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_SET, "topVer",
+ String.valueOf(grid(0).cluster().topologyVersion())), sz + 1, sz + 1);
+
+ String consistentId = grid(sz).localNode().consistentId().toString();
+
+ stopGrid(sz);
+ assertBaseline(content(null, GridRestCommand.BASELINE_CURRENT_STATE), sz + 1, sz);
+
+ assertBaseline(content(null, GridRestCommand.BASELINE_REMOVE, "consistentId1",
+ consistentId), sz, sz);
+ }
+}
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
index 2e98d689deaa..747b13e9d356 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcDriverTestSuite.java
@@ -66,6 +66,7 @@
import org.apache.ignite.jdbc.thin.JdbcThinLocalQueriesSelfTest;
import org.apache.ignite.jdbc.thin.JdbcThinMergeStatementSelfTest;
import org.apache.ignite.jdbc.thin.JdbcThinMergeStatementSkipReducerOnUpdateSelfTest;
+import org.apache.ignite.jdbc.thin.JdbcThinMetadataPrimaryKeysSelfTest;
import org.apache.ignite.jdbc.thin.JdbcThinMetadataSelfTest;
import org.apache.ignite.jdbc.thin.JdbcThinMissingLongArrayResultsTest;
import org.apache.ignite.jdbc.thin.JdbcThinNoDefaultSchemaTest;
@@ -166,6 +167,7 @@ public static TestSuite suite() throws Exception {
suite.addTest(new TestSuite(JdbcThinSchemaCaseTest.class));
suite.addTest(new TestSuite(JdbcThinEmptyCacheSelfTest.class));
suite.addTest(new TestSuite(JdbcThinMetadataSelfTest.class));
+ suite.addTest(new TestSuite(JdbcThinMetadataPrimaryKeysSelfTest.class));
suite.addTest(new TestSuite(JdbcThinErrorsSelfTest.class));
suite.addTest(new TestSuite(JdbcThinInsertStatementSelfTest.class));
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataPrimaryKeysSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataPrimaryKeysSelfTest.java
new file mode 100644
index 000000000000..5733b72fef2a
--- /dev/null
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataPrimaryKeysSelfTest.java
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.jdbc.thin;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * Verifies that primary keys in the metadata are valid.
+ */
+public class JdbcThinMetadataPrimaryKeysSelfTest extends GridCommonAbstractTest {
+ /** Url. */
+ private static final String URL = "jdbc:ignite:thin://127.0.0.1";
+
+ /** COLUMN_NAME column index in the metadata table. */
+ private static final int COL_NAME_IDX = 4;
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ startGrid(1);
+ }
+
+ /**
+ * Execute update sql operation using new connection.
+ *
+ * @param sql update SQL query.
+ * @return update count.
+ * @throws SQLException on error.
+ */
+ private int executeUpdate(String sql) throws SQLException {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+ return stmt.executeUpdate();
+ }
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ executeUpdate("DROP TABLE IF EXISTS TEST;");
+ }
+
+ /**
+ * Checks for PK that contains single unwrapped field.
+ */
+ public void testSingleUnwrappedKey() throws Exception {
+ executeUpdate("CREATE TABLE TEST (ID LONG PRIMARY KEY, NAME VARCHAR);");
+
+ checkPKFields("TEST", "ID");
+ }
+
+ /**
+ * Checks for PK that contains single field. Key is forcibly wrapped.
+ */
+ public void testSingleWrappedKey() throws Exception {
+ executeUpdate("CREATE TABLE TEST (" +
+ "ID LONG PRIMARY KEY, " +
+ "NAME VARCHAR) " +
+ "WITH \"wrap_key=true\";");
+
+ checkPKFields("TEST", "ID");
+ }
+
+ /**
+ * Checks for composite (so implicitly wrapped) primary key.
+ */
+ public void testCompositeKey() throws Exception {
+ executeUpdate("CREATE TABLE TEST (" +
+ "ID LONG, " +
+ "SEC_ID LONG, " +
+ "NAME VARCHAR, " +
+ "PRIMARY KEY (ID, SEC_ID));");
+
+ checkPKFields("TEST", "ID", "SEC_ID");
+ }
+
+ /**
+ * Checks for composite (so implicitly wrapped) primary key. Additionally, affinity key is used.
+ */
+ public void testCompositeKeyWithAK() throws Exception {
+ final String tpl = "CREATE TABLE TEST (" +
+ "ID LONG, " +
+ "SEC_ID LONG, " +
+ "NAME VARCHAR, " +
+ "PRIMARY KEY (ID, SEC_ID)) " +
+ "WITH \"affinity_key=%s\";";
+
+ executeUpdate(String.format(tpl, "ID"));
+
+ checkPKFields("TEST", "ID", "SEC_ID");
+
+ executeUpdate("DROP TABLE TEST;");
+
+ executeUpdate(String.format(tpl, "SEC_ID"));
+
+ checkPKFields("TEST", "ID", "SEC_ID");
+ }
+
+ /**
+ * Checks that field names in the metadata matches specified expected fields.
+ *
+ * @param tabName part of the sql query after CREATE TABLE TESTER.
+ * @param expPKFields Expected primary key fields.
+ */
+ private void checkPKFields(String tabName, String... expPKFields) throws Exception {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ DatabaseMetaData md = conn.getMetaData();
+
+ ResultSet rs = md.getPrimaryKeys(conn.getCatalog(), "", tabName);
+
+ List<String> colNames = new ArrayList<>();
+
+ while (rs.next())
+ colNames.add(rs.getString(COL_NAME_IDX));
+
+ assertEquals("Field names in the primary key are not correct",
+ Arrays.asList(expPKFields), colNames);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+
+ super.afterTestsStopped();
+ }
+}
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index 59382f185470..35832b79d5c8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -555,7 +555,7 @@ public void testGetAllPrimaryKeys() throws Exception {
"PUBLIC.TEST.PK_PUBLIC_TEST.ID",
"PUBLIC.TEST.PK_PUBLIC_TEST.NAME",
"PUBLIC.Quoted.PK_PUBLIC_Quoted.Id",
- "PUBLIC.TEST_DECIMAL_COLUMN.ID._KEY"));
+ "PUBLIC.TEST_DECIMAL_COLUMN.ID.ID"));
Set<String> actualPks = new HashSet<>(expectedPks.size());
diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
index 7492e51977b1..ca2dcdc2b98f 100644
--- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
+++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java
@@ -43,7 +43,7 @@
import org.apache.ignite.internal.GridDirectMap;
import org.apache.ignite.internal.GridDirectTransient;
import org.apache.ignite.internal.IgniteCodeGeneratingFail;
-import org.apache.ignite.internal.processors.cache.mvcc.msg.MvccRecoveryFinishedMessage;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -116,6 +116,7 @@
TYPES.put(BitSet.class, MessageCollectionItemType.BIT_SET);
TYPES.put(UUID.class, MessageCollectionItemType.UUID);
TYPES.put(IgniteUuid.class, MessageCollectionItemType.IGNITE_UUID);
+ TYPES.put(AffinityTopologyVersion.class, MessageCollectionItemType.AFFINITY_TOPOLOGY_VERSION);
}
/**
@@ -169,9 +170,7 @@ public static void main(String[] args) throws Exception {
// gen.generateAll(true);
- gen.generateAndWrite(MvccRecoveryFinishedMessage.class);
-
-// gen.generateAndWrite(GridNearAtomicUpdateRequest.class);
+// gen.generateAndWrite(GridCacheMessage.class);
// gen.generateAndWrite(GridMessageCollection.class);
// gen.generateAndWrite(DataStreamerEntry.class);
@@ -663,6 +662,8 @@ else if (type == UUID.class)
returnFalseIfFailed(write, "writer.writeUuid", field, getExpr);
else if (type == IgniteUuid.class)
returnFalseIfFailed(write, "writer.writeIgniteUuid", field, getExpr);
+ else if (type == AffinityTopologyVersion.class)
+ returnFalseIfFailed(write, "writer.writeAffinityTopologyVersion", field, getExpr);
else if (type.isEnum()) {
String arg = getExpr + " != null ? (byte)" + getExpr + ".ordinal() : -1";
@@ -745,6 +746,8 @@ else if (type == UUID.class)
returnFalseIfReadFailed(name, "reader.readUuid", setExpr, field);
else if (type == IgniteUuid.class)
returnFalseIfReadFailed(name, "reader.readIgniteUuid", setExpr, field);
+ else if (type == AffinityTopologyVersion.class)
+ returnFalseIfReadFailed(name, "reader.readAffinityTopologyVersion", setExpr, field);
else if (type.isEnum()) {
String loc = name + "Ord";
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 8479420910f1..70ee0d56f596 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -1516,7 +1516,7 @@
/**
* Gets a collection of lost partition IDs.
*
- * @return Lost paritions.
+ * @return Lost partitions.
*/
public Collection<Integer> lostPartitions();
@@ -1531,4 +1531,51 @@
* Clear cluster statistics for this cache.
*/
public void clearStatistics();
+
+ /**
+ * Efficiently preloads cache primary partition into page memory.
+ * <p>
+ * This is useful for fast iteration over cache partition data if persistence is enabled and the data is "cold".
+ * <p>
+ * Preload will reduce available amount of page memory for subsequent operations and may lead to earlier page
+ * replacement.
+ * <p>
+ * This method is irrelevant for in-memory caches. Calling this method on an in-memory cache will result in
+ * exception.
+ *
+ * @param partition Partition.
+ */
+ public void preloadPartition(int partition);
+
+ /**
+ * Efficiently preloads cache partition into page memory.
+ * <p>
+ * This is useful for fast iteration over cache partition data if persistence is enabled and the data is "cold".
+ * <p>
+ * Preload will reduce available amount of page memory for subsequent operations and may lead to earlier page
+ * replacement.
+ * <p>
+ * This method is irrelevant for in-memory caches. Calling this method on an in-memory cache will result in
+ * exception.
+ *
+ * @param partition Partition.
+ * @return A future representing pending completion of the partition preloading.
+ */
+ public IgniteFuture<Void> preloadPartitionAsync(int partition);
+
+ /**
+ * Efficiently preloads cache partition into page memory if it exists on the local node.
+ * <p>
+ * This is useful for fast iteration over cache partition data if persistence is enabled and the data is "cold".
+ * <p>
+ * Preload will reduce available amount of page memory for subsequent operations and may lead to earlier page
+ * replacement.
+ * <p>
+ * This method is irrelevant for in-memory caches. Calling this method on an in-memory cache will result in
+ * exception.
+ *
+ * @param partition Partition.
+ * @return {@code True} if partition was preloaded, {@code false} if it doesn't belong to local node.
+ */
+ public boolean localPreloadPartition(int partition);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 52d6a363851f..943583bcf1d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -899,6 +899,11 @@
*/
public static final String IGNITE_THRESHOLD_WAL_ARCHIVE_SIZE_PERCENTAGE = "IGNITE_THRESHOLD_WAL_ARCHIVE_SIZE_PERCENTAGE";
+ /**
+ * Count of WAL compressor worker threads. Default value is 4.
+ */
+ public static final String IGNITE_WAL_COMPRESSOR_WORKER_THREAD_CNT = "IGNITE_WAL_COMPRESSOR_WORKER_THREAD_CNT";
+
/**
* Whenever read load balancing is enabled, that means 'get' requests will be distributed between primary and backup
* nodes if it is possible and {@link CacheConfiguration#readFromBackup} is {@code true}.
@@ -997,6 +1002,17 @@
*/
public static final String IGNITE_REUSE_MEMORY_ON_DEACTIVATE = "IGNITE_REUSE_MEMORY_ON_DEACTIVATE";
+ /**
+ * Timeout for waiting schema update if schema was not found for last accepted version.
+ */
+ public static final String IGNITE_WAIT_SCHEMA_UPDATE = "IGNITE_WAIT_SCHEMA_UPDATE";
+
+ /**
+ * System property to override {@link CacheConfiguration#rebalanceThrottle} configuration property for all caches.
+ * {@code 0} by default, which means that override is disabled.
+ */
+ public static final String IGNITE_REBALANCE_THROTTLE_OVERRIDE = "IGNITE_REBALANCE_THROTTLE_OVERRIDE";
+
/**
* Maximum inactivity period for system worker in milliseconds. When this value is exceeded, worker is considered
* blocked with consequent critical failure handler invocation.
@@ -1008,6 +1024,20 @@
*/
public static final String IGNITE_CHECKPOINT_READ_LOCK_TIMEOUT = "IGNITE_CHECKPOINT_READ_LOCK_TIMEOUT";
+ /**
+ * Enables start caches in parallel.
+ *
+ * Default is {@code true}.
+ */
+ public static final String IGNITE_ALLOW_START_CACHES_IN_PARALLEL = "IGNITE_ALLOW_START_CACHES_IN_PARALLEL";
+
+ /**
+ * Allows to log additional information about all restored partitions after binary and logical recovery phases.
+ *
+ * Default is {@code true}.
+ */
+ public static final String IGNITE_RECOVERY_VERBOSE_LOGGING = "IGNITE_RECOVERY_VERBOSE_LOGGING";
+
/**
* Enforces singleton.
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
index e4d6d0ad3683..0d1444b7eac5 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java
@@ -213,7 +213,16 @@ public ContinuousQuery() {
return (ContinuousQuery<K, V>)super.setPageSize(pageSize);
}
- /** {@inheritDoc} */
+ /**
+ * Sets whether this query should be executed on local node only.
+ *
+ * Note: backup event queues are not kept for local continuous queries. It may lead to loss of notifications in case
+ * of node failures. Use {@link ContinuousQuery#setRemoteFilterFactory(Factory)} to register cache event listeners
+ * on all cache nodes, if delivery guarantee is required.
+ *
+ * @param loc Local flag.
+ * @return {@code this} for chaining.
+ */
@Override public ContinuousQuery<K, V> setLocal(boolean loc) {
return (ContinuousQuery<K, V>)super.setLocal(loc);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
index 485e5671e642..97017d638dd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java
@@ -244,6 +244,16 @@
*/
public static final int EVT_TASK_REDUCED = 25;
+ /**
+ * Built-in event type: Visor or Web Console management task started.
+ * <p>
+ * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for
+ * internal Ignite events and should not be used by user-defined events.
+ *
+ * @see TaskEvent
+ */
+ public static final int EVT_MANAGEMENT_TASK_STARTED = 26;
+
/**
* Built-in event type: non-task class deployed.
* <p>
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
index aaa69eaff719..ac3a87336fc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
@@ -201,4 +201,4 @@ public boolean system() {
@Override public String toString() {
return S.toString(GridJobCancelRequest.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
index 4357d1da07dc..ebfeb0153ffd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java
@@ -664,7 +664,7 @@ public AffinityTopologyVersion getTopVer() {
writer.incrementState();
case 24:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -885,7 +885,7 @@ public AffinityTopologyVersion getTopVer() {
reader.incrementState();
case 24:
- topVer = reader.readMessage("topVer");
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
index 312435e92275..f052edf07d44 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
@@ -282,7 +282,7 @@ public AffinityTopologyVersion getRetryTopologyVersion() {
writer.incrementState();
case 6:
- if (!writer.writeMessage("retry", retry))
+ if (!writer.writeAffinityTopologyVersion("retry", retry))
return false;
writer.incrementState();
@@ -355,7 +355,7 @@ public AffinityTopologyVersion getRetryTopologyVersion() {
reader.incrementState();
case 6:
- retry = reader.readMessage("retry");
+ retry = reader.readAffinityTopologyVersion("retry");
if (!reader.isLastRead())
return false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
index 8a11cef33aa2..d743a355f8d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
@@ -161,4 +161,4 @@ public Object topic() {
@Override public String toString() {
return S.toString(GridJobSiblingsRequest.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
index 3911446d2b86..dc59ab5f3057 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
@@ -141,4 +141,4 @@ public void unmarshalSiblings(Marshaller marsh) throws IgniteCheckedException {
@Override public String toString() {
return S.toString(GridJobSiblingsResponse.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 970b8e7150ac..a43312cc8ac6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -698,4 +698,9 @@
* @return Default uncaught exception handler used by thread pools.
*/
public Thread.UncaughtExceptionHandler uncaughtExceptionHandler();
+
+ /**
+ * @return {@code True} if node is in recovery mode (before join to topology).
+ */
+ public boolean recoveryMode();
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index f23e65042c0d..08090f2bff1f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -415,6 +415,9 @@
/** Failure processor. */
private FailureProcessor failureProc;
+ /** Recovery mode flag. Flag is set to {@code false} when discovery manager started. */
+ private boolean recoveryMode = true;
+
/**
* No-arg constructor is required by externalization.
*/
@@ -1180,6 +1183,18 @@ void disconnected(boolean disconnected) {
return hnd;
}
+ /** {@inheritDoc} */
+ @Override public boolean recoveryMode() {
+ return recoveryMode;
+ }
+
+ /**
+ * @param recoveryMode Recovery mode.
+ */
+ public void recoveryMode(boolean recoveryMode) {
+ this.recoveryMode = recoveryMode;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridKernalContextImpl.class, this);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
index 273d0a777a46..71c318b537dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
@@ -124,4 +124,4 @@ public IgniteUuid sessionId() {
@Override public String toString() {
return S.toString(GridTaskCancelRequest.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
index dbac893189e3..576392e097fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
@@ -189,4 +189,4 @@ public IgniteUuid getJobId() {
@Override public String toString() {
return S.toString(GridTaskSessionRequest.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index c6ec9be1e184..b20023864ef0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1046,6 +1046,10 @@ public void start(
fillNodeAttributes(clusterProc.updateNotifierEnabled());
ctx.cache().context().database().notifyMetaStorageSubscribersOnReadyForRead();
+
+ ctx.cache().context().database().startMemoryRestore(ctx);
+
+ ctx.recoveryMode(false);
}
catch (Throwable e) {
U.error(
@@ -2581,19 +2585,25 @@ private void ackSpis() {
*
*/
private void ackRebalanceConfiguration() throws IgniteCheckedException {
- if (cfg.getSystemThreadPoolSize() <= cfg.getRebalanceThreadPoolSize())
- throw new IgniteCheckedException("Rebalance thread pool size exceed or equals System thread pool size. " +
- "Change IgniteConfiguration.rebalanceThreadPoolSize property before next start.");
-
- if (cfg.getRebalanceThreadPoolSize() < 1)
- throw new IgniteCheckedException("Rebalance thread pool size minimal allowed value is 1. " +
- "Change IgniteConfiguration.rebalanceThreadPoolSize property before next start.");
-
- for (CacheConfiguration ccfg : cfg.getCacheConfiguration()) {
- if (ccfg.getRebalanceBatchesPrefetchCount() < 1)
- throw new IgniteCheckedException("Rebalance batches prefetch count minimal allowed value is 1. " +
- "Change CacheConfiguration.rebalanceBatchesPrefetchCount property before next start. " +
- "[cache=" + ccfg.getName() + "]");
+ if (cfg.isClientMode()) {
+ if (cfg.getRebalanceThreadPoolSize() != IgniteConfiguration.DFLT_REBALANCE_THREAD_POOL_SIZE)
+ U.warn(log, "Setting the rebalance pool size has no effect on the client mode");
+ }
+ else {
+ if (cfg.getSystemThreadPoolSize() <= cfg.getRebalanceThreadPoolSize())
+ throw new IgniteCheckedException("Rebalance thread pool size exceed or equals System thread pool size. " +
+ "Change IgniteConfiguration.rebalanceThreadPoolSize property before next start.");
+
+ if (cfg.getRebalanceThreadPoolSize() < 1)
+ throw new IgniteCheckedException("Rebalance thread pool size minimal allowed value is 1. " +
+ "Change IgniteConfiguration.rebalanceThreadPoolSize property before next start.");
+
+ for (CacheConfiguration ccfg : cfg.getCacheConfiguration()) {
+ if (ccfg.getRebalanceBatchesPrefetchCount() < 1)
+ throw new IgniteCheckedException("Rebalance batches prefetch count minimal allowed value is 1. " +
+ "Change CacheConfiguration.rebalanceBatchesPrefetchCount property before next start. " +
+ "[cache=" + ccfg.getName() + "]");
+ }
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
index 87c4f3e18d8f..7d138a30e6d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java
@@ -26,6 +26,7 @@
import java.util.Map;
import java.util.UUID;
import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.internal.UnregisteredBinaryTypeException;
import org.apache.ignite.internal.UnregisteredClassException;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.F;
@@ -156,7 +157,7 @@ public void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectExce
write0(obj, writer);
}
catch (Exception ex) {
- if (ex instanceof UnregisteredClassException)
+ if (ex instanceof UnregisteredClassException || ex instanceof UnregisteredBinaryTypeException)
throw ex;
if (S.INCLUDE_SENSITIVE && !F.isEmpty(name))
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
index 38934f07d6ae..601141c30641 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java
@@ -2028,7 +2028,6 @@ public BinarySchema getOrCreateSchema() {
for (BinarySchema existingSchema : existingSchemas)
existingSchemaIds.add(existingSchema.schemaId());
-
throw new BinaryObjectException("Cannot find schema for object with compact footer" +
" [typeName=" + type.typeName() +
", typeId=" + typeId +
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
index 91f29b22cfd8..f22fc4c05212 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java
@@ -17,6 +17,8 @@
package org.apache.ignite.internal.binary;
+import java.util.ArrayList;
+import java.util.List;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
@@ -98,75 +100,95 @@ else if (schemaId == schemaId4)
* @param schemaId Schema ID.
* @param schema Schema.
*/
- public void addSchema(int schemaId, BinarySchema schema) {
- synchronized (this) {
- if (inline) {
- // Check if this is already known schema.
- if (schemaId == schemaId1 || schemaId == schemaId2 || schemaId == schemaId3 || schemaId == schemaId4)
- return;
+ public synchronized void addSchema(int schemaId, BinarySchema schema) {
+ if (inline) {
+ // Check if this is already known schema.
+ if (schemaId == schemaId1 || schemaId == schemaId2 || schemaId == schemaId3 || schemaId == schemaId4)
+ return;
- // Try positioning new schema in inline mode.
- if (schemaId1 == EMPTY) {
- schemaId1 = schemaId;
+ // Try positioning new schema in inline mode.
+ if (schemaId1 == EMPTY) {
+ schemaId1 = schemaId;
- schema1 = schema;
+ schema1 = schema;
- inline = true; // Forcing HB edge just in case.
+ inline = true; // Forcing HB edge just in case.
- return;
- }
+ return;
+ }
- if (schemaId2 == EMPTY) {
- schemaId2 = schemaId;
+ if (schemaId2 == EMPTY) {
+ schemaId2 = schemaId;
- schema2 = schema;
+ schema2 = schema;
- inline = true; // Forcing HB edge just in case.
+ inline = true; // Forcing HB edge just in case.
- return;
- }
+ return;
+ }
- if (schemaId3 == EMPTY) {
- schemaId3 = schemaId;
+ if (schemaId3 == EMPTY) {
+ schemaId3 = schemaId;
- schema3 = schema;
+ schema3 = schema;
- inline = true; // Forcing HB edge just in case.
+ inline = true; // Forcing HB edge just in case.
- return;
- }
+ return;
+ }
- if (schemaId4 == EMPTY) {
- schemaId4 = schemaId;
+ if (schemaId4 == EMPTY) {
+ schemaId4 = schemaId;
- schema4 = schema;
+ schema4 = schema;
- inline = true; // Forcing HB edge just in case.
+ inline = true; // Forcing HB edge just in case.
- return;
- }
+ return;
+ }
- // No luck, switching to hash map mode.
- HashMap<Integer, BinarySchema> newSchemas = new HashMap<>();
+ // No luck, switching to hash map mode.
+ HashMap<Integer, BinarySchema> newSchemas = new HashMap<>();
- newSchemas.put(schemaId1, schema1);
- newSchemas.put(schemaId2, schema2);
- newSchemas.put(schemaId3, schema3);
- newSchemas.put(schemaId4, schema4);
+ newSchemas.put(schemaId1, schema1);
+ newSchemas.put(schemaId2, schema2);
+ newSchemas.put(schemaId3, schema3);
+ newSchemas.put(schemaId4, schema4);
- newSchemas.put(schemaId, schema);
+ newSchemas.put(schemaId, schema);
- schemas = newSchemas;
+ schemas = newSchemas;
- inline = false;
- }
- else {
- HashMap<Integer, BinarySchema> newSchemas = new HashMap<>(schemas);
+ inline = false;
+ }
+ else {
+ HashMap<Integer, BinarySchema> newSchemas = new HashMap<>(schemas);
- newSchemas.put(schemaId, schema);
+ newSchemas.put(schemaId, schema);
- schemas = newSchemas;
- }
+ schemas = newSchemas;
}
}
+
+ /**
+ * @return List of known schemas.
+ */
+ public synchronized List<BinarySchema> schemas() {
+ List<BinarySchema> res = new ArrayList<>();
+
+ if (inline) {
+ if (schemaId1 != EMPTY)
+ res.add(schema1);
+ if (schemaId2 != EMPTY)
+ res.add(schema2);
+ if (schemaId3 != EMPTY)
+ res.add(schema3);
+ if (schemaId4 != EMPTY)
+ res.add(schema4);
+ }
+ else
+ res.addAll(schemas.values());
+
+ return res;
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 553d8e5b79bd..77dce5602ec4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -958,10 +958,30 @@ else if (fieldOffsetSize == OFFSET_2)
* @throws BinaryObjectException If merge failed due to metadata conflict.
*/
public static BinaryMetadata mergeMetadata(@Nullable BinaryMetadata oldMeta, BinaryMetadata newMeta) {
+ return mergeMetadata(oldMeta, newMeta, null);
+ }
+
+ /**
+ * Merge old and new metas.
+ *
+ * @param oldMeta Old meta.
+ * @param newMeta New meta.
+ * @param changedSchemas Set for holding changed schemas.
+ * @return New meta if old meta was null, old meta if no changes detected, merged meta otherwise.
+ * @throws BinaryObjectException If merge failed due to metadata conflict.
+ */
+ public static BinaryMetadata mergeMetadata(@Nullable BinaryMetadata oldMeta, BinaryMetadata newMeta,
+ @Nullable Set<Integer> changedSchemas) {
assert newMeta != null;
- if (oldMeta == null)
+ if (oldMeta == null) {
+ if (changedSchemas != null) {
+ for (BinarySchema schema : newMeta.schemas())
+ changedSchemas.add(schema.schemaId());
+ }
+
return newMeta;
+ }
else {
assert oldMeta.typeId() == newMeta.typeId();
@@ -1036,8 +1056,12 @@ public static BinaryMetadata mergeMetadata(@Nullable BinaryMetadata oldMeta, Bin
Collection<BinarySchema> mergedSchemas = new HashSet<>(oldMeta.schemas());
for (BinarySchema newSchema : newMeta.schemas()) {
- if (mergedSchemas.add(newSchema))
+ if (mergedSchemas.add(newSchema)) {
changed = true;
+
+ if (changedSchemas != null)
+ changedSchemas.add(newSchema.schemaId());
+ }
}
// Return either old meta if no changes detected, or new merged meta.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java
index 5b8a0dcd6c00..6367eef51610 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/Arguments.java
@@ -71,10 +71,10 @@
*/
private String walArgs;
- /** Ping timeout for grid client. See {@link GridClientConfiguration#pingTimeout}.*/
+ /** Ping timeout for grid client. See {@link GridClientConfiguration#pingTimeout}. */
private long pingTimeout;
- /** Ping interval for grid client. See {@link GridClientConfiguration#pingInterval}.*/
+ /** Ping interval for grid client. See {@link GridClientConfiguration#pingInterval}. */
private long pingInterval;
/**
@@ -94,8 +94,8 @@
* @param autoConfirmation Auto confirmation flag.
*/
public Arguments(Command cmd, String host, String port, String user, String pwd, String baselineAct,
- String baselineArgs, VisorTxTaskArg txArg, CacheArguments cacheArgs, String walAct, String walArgs,
- Long pingTimeout, Long pingInterval, boolean autoConfirmation) {
+ String baselineArgs, VisorTxTaskArg txArg, CacheArguments cacheArgs, String walAct, String walArgs,
+ Long pingTimeout, Long pingInterval, boolean autoConfirmation) {
this.cmd = cmd;
this.host = host;
this.port = port;
@@ -136,17 +136,31 @@ public String port() {
/**
* @return user name
*/
- public String user() {
+ public String getUserName() {
return user;
}
+ /**
+ * @param user New user name.
+ */
+ public void setUserName(String user) {
+ this.user = user;
+ }
+
/**
* @return password
*/
- public String password() {
+ public String getPassword() {
return pwd;
}
+ /**
+ * @param pwd New password.
+ */
+ public void setPassword(String pwd) {
+ this.pwd = pwd;
+ }
+
/**
* @return baseline action
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index c484018e0e56..167a806f777e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -17,18 +17,20 @@
package org.apache.ignite.internal.commandline;
+import java.io.Console;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.Set;
import java.util.UUID;
-import java.util.logging.Logger;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import java.util.stream.Collectors;
@@ -65,6 +67,7 @@
import org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorTaskArgument;
import org.apache.ignite.internal.visor.baseline.VisorBaselineNode;
@@ -72,11 +75,20 @@
import org.apache.ignite.internal.visor.baseline.VisorBaselineTask;
import org.apache.ignite.internal.visor.baseline.VisorBaselineTaskArg;
import org.apache.ignite.internal.visor.baseline.VisorBaselineTaskResult;
+import org.apache.ignite.internal.visor.cache.VisorCacheAffinityConfiguration;
+import org.apache.ignite.internal.visor.cache.VisorCacheConfiguration;
+import org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorTask;
+import org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorTaskArg;
+import org.apache.ignite.internal.visor.cache.VisorCacheEvictionConfiguration;
+import org.apache.ignite.internal.visor.cache.VisorCacheNearConfiguration;
+import org.apache.ignite.internal.visor.cache.VisorCacheRebalanceConfiguration;
+import org.apache.ignite.internal.visor.cache.VisorCacheStoreConfiguration;
import org.apache.ignite.internal.visor.misc.VisorClusterNode;
import org.apache.ignite.internal.visor.misc.VisorWalTask;
import org.apache.ignite.internal.visor.misc.VisorWalTaskArg;
import org.apache.ignite.internal.visor.misc.VisorWalTaskOperation;
import org.apache.ignite.internal.visor.misc.VisorWalTaskResult;
+import org.apache.ignite.internal.visor.query.VisorQueryConfiguration;
import org.apache.ignite.internal.visor.tx.VisorTxInfo;
import org.apache.ignite.internal.visor.tx.VisorTxOperation;
import org.apache.ignite.internal.visor.tx.VisorTxProjection;
@@ -84,6 +96,7 @@
import org.apache.ignite.internal.visor.tx.VisorTxTask;
import org.apache.ignite.internal.visor.tx.VisorTxTaskArg;
import org.apache.ignite.internal.visor.tx.VisorTxTaskResult;
+import org.apache.ignite.internal.visor.verify.IndexIntegrityCheckIssue;
import org.apache.ignite.internal.visor.verify.IndexValidationIssue;
import org.apache.ignite.internal.visor.verify.ValidateIndexesPartitionResult;
import org.apache.ignite.internal.visor.verify.VisorContentionTask;
@@ -98,12 +111,14 @@
import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskArg;
import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskResult;
+import org.apache.ignite.internal.visor.verify.VisorViewCacheCmd;
import org.apache.ignite.internal.visor.verify.VisorViewCacheTask;
import org.apache.ignite.internal.visor.verify.VisorViewCacheTaskArg;
import org.apache.ignite.internal.visor.verify.VisorViewCacheTaskResult;
import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.plugin.security.SecurityCredentials;
import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider;
+import org.apache.ignite.plugin.security.SecurityCredentialsProvider;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_ENABLE_EXPERIMENTAL_COMMAND;
import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR;
@@ -115,11 +130,21 @@
import static org.apache.ignite.internal.commandline.Command.STATE;
import static org.apache.ignite.internal.commandline.Command.TX;
import static org.apache.ignite.internal.commandline.Command.WAL;
+import static org.apache.ignite.internal.commandline.OutputFormat.MULTI_LINE;
+import static org.apache.ignite.internal.commandline.OutputFormat.SINGLE_LINE;
+import static org.apache.ignite.internal.commandline.cache.CacheCommand.CONTENTION;
+import static org.apache.ignite.internal.commandline.cache.CacheCommand.DISTRIBUTION;
+import static org.apache.ignite.internal.commandline.cache.CacheCommand.HELP;
+import static org.apache.ignite.internal.commandline.cache.CacheCommand.IDLE_VERIFY;
+import static org.apache.ignite.internal.commandline.cache.CacheCommand.LIST;
+import static org.apache.ignite.internal.commandline.cache.CacheCommand.RESET_LOST_PARTITIONS;
+import static org.apache.ignite.internal.commandline.cache.CacheCommand.VALIDATE_INDEXES;
import static org.apache.ignite.internal.visor.baseline.VisorBaselineOperation.ADD;
import static org.apache.ignite.internal.visor.baseline.VisorBaselineOperation.COLLECT;
import static org.apache.ignite.internal.visor.baseline.VisorBaselineOperation.REMOVE;
import static org.apache.ignite.internal.visor.baseline.VisorBaselineOperation.SET;
import static org.apache.ignite.internal.visor.baseline.VisorBaselineOperation.VERSION;
+import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.CACHES;
import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.GROUPS;
import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.SEQ;
@@ -127,9 +152,6 @@
* Class that execute several commands passed via command line.
*/
public class CommandHandler {
- /** Logger. */
- private static final Logger log = Logger.getLogger(CommandHandler.class.getName());
-
/** */
static final String DFLT_HOST = "127.0.0.1";
@@ -279,6 +301,27 @@
/** */
private static final String TX_KILL = "kill";
+ /** */
+ private static final String OUTPUT_FORMAT = "--output-format";
+
+ /** */
+ private static final String CONFIG = "--config";
+
+ /** Utility name. */
+ private static final String UTILITY_NAME = "control.sh";
+
+ /** Common options. */
+ private static final String COMMON_OPTIONS = String.join(" ", op(CMD_HOST, "HOST_OR_IP"), op(CMD_PORT, "PORT"), op(CMD_USER, "USER"), op(CMD_PASSWORD, "PASSWORD"), op(CMD_PING_INTERVAL, "PING_INTERVAL"), op(CMD_PING_TIMEOUT, "PING_TIMEOUT"));
+
+ /** Utility name with common options. */
+ private static final String UTILITY_NAME_WITH_COMMON_OPTIONS = String.join(" ", UTILITY_NAME, COMMON_OPTIONS);
+
+ /** Indent for help output. */
+ private static final String INDENT = " ";
+
+ /** */
+ private static final String NULL = "null";
+
/** */
private Iterator<String> argsIt;
@@ -303,6 +346,54 @@ private void log(String s) {
System.out.println(s);
}
+ /**
+ * Adds indent to begin of input string.
+ *
+ * @param s Input string.
+ * @return Indented string.
+ */
+ private static String i(String s) {
+ return i(s, 1);
+ }
+
+ /**
+ * Adds specified indents to begin of input string.
+ *
+ * @param s Input string.
+ * @param indentCnt Number of indents.
+ * @return Indented string.
+ */
+ private static String i(String s, int indentCnt) {
+ assert indentCnt >= 0;
+
+ switch (indentCnt) {
+ case 0:
+ return s;
+
+ case 1:
+ return INDENT + s;
+
+ default:
+ SB sb = new SB(s.length() + indentCnt * INDENT.length());
+
+ for (int i = 0; i < indentCnt; i++)
+ sb.a(INDENT);
+
+ return sb.a(s).toString();
+ }
+
+ }
+
+ /**
+ * Format and output specified string to console.
+ *
+ * @param format A format string as described in Format string syntax.
+ * @param args Arguments referenced by the format specifiers in the format string.
+ */
+ private void log(String format, Object... args) {
+ System.out.printf(format, args);
+ }
+
/**
* Provides a prompt, then reads a single line of text from the console.
*
@@ -319,7 +410,7 @@ private String readLine(String prompt) {
* Output empty line.
*/
private void nl() {
- System.out.println("");
+ System.out.println();
}
/**
@@ -617,19 +708,21 @@ private void cache(GridClient client, CacheArguments cacheArgs) throws Throwable
*
*/
private void printCacheHelp() {
- log("--cache subcommand allows to do the following operations:");
-
- usage(" Show information about caches, groups or sequences that match a regex:", CACHE, " list regexPattern [groups|seq] [nodeId]");
- usage(" Show hot keys that are point of contention for multiple transactions:", CACHE, " contention minQueueSize [nodeId] [maxPrint]");
- usage(" Verify partition counters and hashes between primary and backups on idle cluster:", CACHE, " idle_verify [--dump] [--skipZeros] [cache1,...,cacheN]");
- usage(" Validate custom indexes on idle cluster:", CACHE, " validate_indexes [cache1,...,cacheN] [nodeId] [checkFirst|checkThrough]");
- usage(" Collect partition distribution information:", CACHE, " distribution nodeId|null [cacheName1,...,cacheNameN] [--user-attributes attributeName1[,...,attributeNameN]]");
- usage(" Reset lost partitions:", CACHE, " reset_lost_partitions cacheName1[,...,cacheNameN]");
-
- log(" If [nodeId] is not specified, contention and validate_indexes commands will be broadcasted to all server nodes.");
- log(" Another commands where [nodeId] is optional will run on a random server node.");
- log(" checkFirst numeric parameter for validate_indexes specifies number of first K keys to be validated.");
- log(" checkThrough numeric parameter for validate_indexes allows to check each Kth key.");
+ log(i("The '" + CACHE.text() + " subcommand' is used to get information about and perform actions with caches. The command has the following syntax:"));
+ nl();
+ log(i(UTILITY_NAME_WITH_COMMON_OPTIONS + " " + CACHE.text() + "[subcommand] <subcommand_parameters>"));
+ nl();
+ log(i("The subcommands that take [nodeId] as an argument ('" + LIST.text() + "', '" + CONTENTION.text() + "' and '" + VALIDATE_INDEXES.text() + "') will be executed on the given node or on all server nodes if the option is not specified. Other commands will run on a random server node."));
+ nl();
+ nl();
+ log(i("Subcommands:"));
+
+ usageCache(LIST, "regexPattern", "[groups|seq]", "[nodeId]", op(CONFIG), op(OUTPUT_FORMAT, MULTI_LINE.text()));
+ usageCache(CONTENTION, "minQueueSize", "[nodeId]", "[maxPrint]");
+ usageCache(IDLE_VERIFY, op(CMD_DUMP), op(CMD_SKIP_ZEROS), "[cache1,...,cacheN]");
+ usageCache(VALIDATE_INDEXES, "[cache1,...,cacheN]", "[nodeId]", op(or(VI_CHECK_FIRST + " N", VI_CHECK_THROUGH + " K")));
+ usageCache(DISTRIBUTION, or("nodeId", NULL), "[cacheName1,...,cacheNameN]", op(CMD_USER_ATTRIBUTES, "attName1,...,attrNameN"));
+ usageCache(RESET_LOST_PARTITIONS, "cacheName1,...,cacheNameN");
nl();
}
@@ -690,9 +783,20 @@ private void cacheValidateIndexes(GridClient client, CacheArguments cacheArgs) t
}
}
- boolean errors = false;
-
for (Map.Entry<UUID, VisorValidateIndexesJobResult> nodeEntry : taskRes.results().entrySet()) {
+ boolean errors = false;
+
+ log("validate_indexes result on node " + nodeEntry.getKey() + ":");
+
+ Collection<IndexIntegrityCheckIssue> integrityCheckFailures = nodeEntry.getValue().integrityCheckFailures();
+
+ if (!integrityCheckFailures.isEmpty()) {
+ errors = true;
+
+ for (IndexIntegrityCheckIssue is : integrityCheckFailures)
+ log("\t" + is.toString());
+ }
+
Map<PartitionKey, ValidateIndexesPartitionResult> partRes = nodeEntry.getValue().partitionResult();
for (Map.Entry<PartitionKey, ValidateIndexesPartitionResult> e : partRes.entrySet()) {
@@ -701,10 +805,10 @@ private void cacheValidateIndexes(GridClient client, CacheArguments cacheArgs) t
if (!res.issues().isEmpty()) {
errors = true;
- log(e.getKey().toString() + " " + e.getValue().toString());
+ log("\t" + e.getKey().toString() + " " + e.getValue().toString());
for (IndexValidationIssue is : res.issues())
- log(is.toString());
+ log("\t\t" + is.toString());
}
}
@@ -716,18 +820,18 @@ private void cacheValidateIndexes(GridClient client, CacheArguments cacheArgs) t
if (!res.issues().isEmpty()) {
errors = true;
- log("SQL Index " + e.getKey() + " " + e.getValue().toString());
+ log("\tSQL Index " + e.getKey() + " " + e.getValue().toString());
for (IndexValidationIssue is : res.issues())
- log(is.toString());
+ log("\t\t" + is.toString());
}
}
- }
- if (!errors)
- log("validate_indexes has finished, no issues found.");
- else
- log("validate_indexes has finished with errors (listed above).");
+ if (!errors)
+ log("no issues found.\n");
+ else
+ log("issues found (listed above).\n");
+ }
}
/**
@@ -740,8 +844,11 @@ private void cacheView(GridClient client, CacheArguments cacheArgs) throws GridC
VisorViewCacheTaskResult res = executeTaskByNameOnNode(
client, VisorViewCacheTask.class.getName(), taskArg, cacheArgs.nodeId());
- for (CacheInfo info : res.cacheInfos())
- info.print(cacheArgs.cacheCommand());
+ if (cacheArgs.fullConfig() && cacheArgs.cacheCommand() == CACHES)
+ cachesConfig(client, cacheArgs, res);
+ else
+ printCacheInfos(res.cacheInfos(), cacheArgs.cacheCommand());
+
}
/**
@@ -816,6 +923,101 @@ private void cacheDistribution(GridClient client, CacheArguments cacheArgs) thro
res.print(System.out);
}
+ /**
+ * @param client Client.
+ * @param cacheArgs Cache args.
+ * @param viewRes Cache view task result.
+ */
+ private void cachesConfig(GridClient client, CacheArguments cacheArgs,
+ VisorViewCacheTaskResult viewRes) throws GridClientException {
+ VisorCacheConfigurationCollectorTaskArg taskArg = new VisorCacheConfigurationCollectorTaskArg(cacheArgs.regex());
+
+ UUID nodeId = cacheArgs.nodeId() == null ? BROADCAST_UUID : cacheArgs.nodeId();
+
+ Map<String, VisorCacheConfiguration> res =
+ executeTaskByNameOnNode(client, VisorCacheConfigurationCollectorTask.class.getName(), taskArg, nodeId);
+
+ Map<String, Integer> cacheToMapped =
+ viewRes.cacheInfos().stream().collect(Collectors.toMap(x -> x.getCacheName(), x -> x.getMapped()));
+
+ printCachesConfig(res, cacheArgs.outputFormat(), cacheToMapped);
+
+ }
+
+ /**
+ * Prints caches info.
+ *
+ * @param infos Caches info.
+ * @param cmd Command.
+ */
+ private void printCacheInfos(Collection<CacheInfo> infos, VisorViewCacheCmd cmd) {
+ for (CacheInfo info : infos) {
+ Map<String, Object> map = info.toMap(cmd);
+
+ SB sb = new SB("[");
+
+ for (Map.Entry<String, Object> e : map.entrySet())
+ sb.a(e.getKey()).a("=").a(e.getValue()).a(", ");
+
+ sb.setLength(sb.length() - 2);
+
+ sb.a("]");
+
+ log(sb.toString());
+ }
+ }
+
+ /**
+ * Prints caches config.
+ *
+ * @param caches Caches config.
+ * @param outputFormat Output format.
+ * @param cacheToMapped Map cache name to mapped.
+ */
+ private void printCachesConfig(
+ Map<String, VisorCacheConfiguration> caches,
+ OutputFormat outputFormat,
+ Map<String, Integer> cacheToMapped
+ ) {
+
+ for (Map.Entry<String, VisorCacheConfiguration> entry : caches.entrySet()) {
+ String cacheName = entry.getKey();
+
+ switch (outputFormat) {
+ case MULTI_LINE:
+ Map<String, Object> params = mapToPairs(entry.getValue());
+
+ params.put("Mapped", cacheToMapped.get(cacheName));
+
+ log("[cache = '%s']%n", cacheName);
+
+ for (Map.Entry<String, Object> innerEntry : params.entrySet())
+ log("%s: %s%n", innerEntry.getKey(), innerEntry.getValue());
+
+ nl();
+
+ break;
+
+ default:
+ int mapped = cacheToMapped.get(cacheName);
+
+ log("%s: %s %s=%s%n", entry.getKey(), toString(entry.getValue()), "mapped", mapped);
+
+ break;
+ }
+ }
+ }
+
+ /**
+ * Invokes toString() method and cuts class name from result string.
+ *
+ * @param cfg Visor cache configuration for invocation.
+ * @return String representation without class name in begin of string.
+ */
+ private String toString(VisorCacheConfiguration cfg) {
+ return cfg.toString().substring(cfg.getClass().getSimpleName().length() + 1);
+ }
+
/**
* @param client Client.
* @param cacheArgs Cache args.
@@ -954,8 +1156,9 @@ private void baselinePrint0(VisorBaselineTaskResult res) {
log("Baseline nodes:");
for (VisorBaselineNode node : baseline.values()) {
- log(" ConsistentID=" + node.getConsistentId() + ", STATE=" +
- (srvs.containsKey(node.getConsistentId()) ? "ONLINE" : "OFFLINE"));
+ boolean online = srvs.containsKey(node.getConsistentId());
+
+ log(i("ConsistentID=" + node.getConsistentId() + ", STATE=" + (online ? "ONLINE" : "OFFLINE"), 2));
}
log(DELIM);
@@ -976,7 +1179,7 @@ private void baselinePrint0(VisorBaselineTaskResult res) {
log("Other nodes:");
for (VisorBaselineNode node : others)
- log(" ConsistentID=" + node.getConsistentId());
+ log(i("ConsistentID=" + node.getConsistentId(), 2));
log("Number of other nodes: " + others.size());
}
@@ -1209,10 +1412,10 @@ private void printUnusedWalSegments0(VisorWalTaskResult taskRes) {
VisorClusterNode node = nodesInfo.get(entry.getKey());
log("Node=" + node.getConsistentId());
- log(" addresses " + U.addressesAsString(node.getAddresses(), node.getHostNames()));
+ log(i("addresses " + U.addressesAsString(node.getAddresses(), node.getHostNames()), 2));
for (String fileName : entry.getValue())
- log(" " + fileName);
+ log(i(fileName));
nl();
}
@@ -1221,8 +1424,8 @@ private void printUnusedWalSegments0(VisorWalTaskResult taskRes) {
VisorClusterNode node = nodesInfo.get(entry.getKey());
log("Node=" + node.getConsistentId());
- log(" addresses " + U.addressesAsString(node.getAddresses(), node.getHostNames()));
- log(" failed with error: " + entry.getValue().getMessage());
+ log(i("addresses " + U.addressesAsString(node.getAddresses(), node.getHostNames())), 2);
+ log(i("failed with error: " + entry.getValue().getMessage()));
nl();
}
}
@@ -1244,7 +1447,7 @@ private void printDeleteWalSegments0(VisorWalTaskResult taskRes) {
VisorClusterNode node = nodesInfo.get(entry.getKey());
log("Node=" + node.getConsistentId());
- log(" addresses " + U.addressesAsString(node.getAddresses(), node.getHostNames()));
+ log(i("addresses " + U.addressesAsString(node.getAddresses(), node.getHostNames())), 2);
nl();
}
@@ -1252,8 +1455,8 @@ private void printDeleteWalSegments0(VisorWalTaskResult taskRes) {
VisorClusterNode node = nodesInfo.get(entry.getKey());
log("Node=" + node.getConsistentId());
- log(" addresses " + U.addressesAsString(node.getAddresses(), node.getHostNames()));
- log(" failed with error: " + entry.getValue().getMessage());
+ log(i("addresses " + U.addressesAsString(node.getAddresses(), node.getHostNames())), 2);
+ log(i("failed with error: " + entry.getValue().getMessage()));
nl();
}
}
@@ -1286,9 +1489,168 @@ private boolean isConnectionError(Throwable e) {
*/
private void usage(String desc, Command cmd, String... args) {
log(desc);
- log(" control.sh [--host HOST_OR_IP] [--port PORT] [--user USER] [--password PASSWORD] " +
- " [--ping-interval PING_INTERVAL] [--ping-timeout PING_TIMEOUT] " + cmd.text() + String.join("", args));
+ log(i(UTILITY_NAME_WITH_COMMON_OPTIONS + " " + cmd.text() + " " + String.join(" ", args), 2));
+ nl();
+ }
+
+ /**
+ * Print cache command usage with default indention.
+ *
+ * @param cmd Cache command.
+ * @param args Cache command arguments.
+ */
+ private void usageCache(CacheCommand cmd, String... args) {
+ usageCache(1, cmd, args);
+ }
+
+ /**
+ * Print cache command usage.
+ *
+ * @param indentsNum Number of indents.
+ * @param cmd Cache command.
+ * @param args Cache command arguments.
+ */
+ private void usageCache(int indentsNum, CacheCommand cmd, String... args) {
+ log(i(DELIM, indentsNum));
nl();
+ log(i(CACHE.text() + " " + cmd.text() + " " + String.join(" ", args), indentsNum++));
+ nl();
+ log(i(getCacheSubcommandDesc(cmd), indentsNum));
+ nl();
+
+ Map<String, String> paramsDesc = createCacheArgsDesc(cmd);
+
+ if (!paramsDesc.isEmpty()) {
+ log(i("Parameters:", indentsNum));
+
+ usageCacheParams(paramsDesc, indentsNum + 1);
+
+ nl();
+ }
+ }
+
+ /**
+ * Print cache command arguments usage.
+ *
+ * @param paramsDesc Cache command arguments description.
+ * @param indentsNum Number of indents.
+ */
+ private void usageCacheParams(Map<String, String> paramsDesc, int indentsNum) {
+ int maxParamLen = paramsDesc.keySet().stream().max(Comparator.comparingInt(String::length)).get().length();
+
+ for (Map.Entry<String, String> param : paramsDesc.entrySet())
+ log(i(extendToLen(param.getKey(), maxParamLen) + INDENT + "- " + param.getValue(), indentsNum));
+ }
+
+ /**
+ * Appends spaces to end of input string for extending to needed length.
+ *
+ * @param s Input string.
+ * @param targetLen Needed length.
+ * @return String with appended spaces on the end.
+ */
+ private String extendToLen(String s, int targetLen) {
+ assert targetLen >= 0;
+ assert s.length() <= targetLen;
+
+ if (s.length() == targetLen)
+ return s;
+
+ SB sb = new SB(targetLen);
+
+ sb.a(s);
+
+ for (int i = 0; i < targetLen - s.length(); i++)
+ sb.a(" ");
+
+ return sb.toString();
+ }
+
+ /**
+ * Gets cache command description by cache command.
+ *
+ * @param cmd Cache command.
+ * @return Cache command description.
+ */
+ private String getCacheSubcommandDesc(CacheCommand cmd) {
+ switch (cmd) {
+ case LIST:
+ return "Show information about caches, groups or sequences that match a regular expression. When executed without parameters, this subcommand prints the list of caches.";
+
+ case CONTENTION:
+ return "Show the keys that are point of contention for multiple transactions.";
+
+ case IDLE_VERIFY:
+ return "Verify counters and hash sums of primary and backup partitions for the specified caches on an idle cluster and print out the differences, if any.";
+
+ case VALIDATE_INDEXES:
+ return "Validate indexes on an idle cluster and print out the keys that are missing in the indexes.";
+
+ case DISTRIBUTION:
+ return "Prints the information about partition distribution.";
+
+ case RESET_LOST_PARTITIONS:
+ return "Reset the state of lost partitions for the specified caches.";
+
+ default:
+ throw new IllegalArgumentException("Unknown command: " + cmd);
+ }
+ }
+
+ /**
+ * Gets cache command arguments description by cache command.
+ *
+ * @param cmd Cache command.
+ * @return Cache command arguments description.
+ */
+ private Map<String, String> createCacheArgsDesc(CacheCommand cmd) {
+ Map<String, String> map = U.newLinkedHashMap(16);
+ switch (cmd) {
+ case LIST:
+ map.put(CONFIG, "print a all configuration parameters for each cache.");
+ map.put(OUTPUT_FORMAT + " " + MULTI_LINE.text(), "print configuration parameters per line. This option has effect only when used with " + CONFIG + " and without [groups|seq].");
+
+ break;
+ case VALIDATE_INDEXES:
+ map.put(VI_CHECK_FIRST + " N", "validate only the first N keys");
+ map.put(VI_CHECK_THROUGH + " K", "validate every Kth key");
+
+ break;
+ }
+ return map;
+ }
+
+ /**
+ * Join input parameters with space and wrap optional braces {@code []}.
+ *
+ * @param param First input parameter.
+ * @param params Other input parameter.
+ * @return Joined parameters wrapped optional braces.
+ */
+ private static String op(String param, String... params) {
+ if (params == null || params.length == 0)
+ return "[" + param + "]";
+
+ return "[" + param + " " + String.join(" ", params) + "]";
+ }
+
+ /**
+ * Concatenates input parameters to single string with OR delimiter {@code |}.
+ *
+ * @param param1 First parameter.
+ * @param params Remaining parameters.
+ * @return Concatenated string.
+ */
+ private static String or(String param1, String... params) {
+ if (params.length == 0)
+ return param1;
+
+ SB sb = new SB(param1);
+
+ for (String param : params)
+ sb.a("|").a(param);
+
+ return sb.toString();
}
/**
@@ -1495,12 +1857,6 @@ Arguments parseAndValidate(List<String> rawArgs) {
Command cmd = commands.get(0);
- boolean hasUsr = F.isEmpty(user);
- boolean hasPwd = F.isEmpty(pwd);
-
- if (hasUsr != hasPwd)
- throw new IllegalArgumentException("Both user and password should be specified");
-
return new Arguments(cmd, host, port, user, pwd, baselineAct, baselineArgs, txArgs, cacheArgs, walAct, walArgs,
pingTimeout, pingInterval, autoConfirmation);
}
@@ -1612,27 +1968,27 @@ else if (CMD_SKIP_ZEROS.equals(nextArg))
case DISTRIBUTION:
String nodeIdStr = nextArg("Node id expected or null");
- if (!"null".equals(nodeIdStr))
+ if (!NULL.equals(nodeIdStr))
cacheArgs.nodeId(UUID.fromString(nodeIdStr));
while (hasNextCacheArg()) {
String nextArg = nextArg("");
- if (CMD_USER_ATTRIBUTES.equals(nextArg)){
+ if (CMD_USER_ATTRIBUTES.equals(nextArg)) {
nextArg = nextArg("User attributes are expected to be separated by commas");
- Set<String> userAttributes = new HashSet();
+ Set<String> userAttrs = new HashSet<>();
- for (String userAttribute:nextArg.split(","))
- userAttributes.add(userAttribute.trim());
+ for (String userAttribute : nextArg.split(","))
+ userAttrs.add(userAttribute.trim());
- cacheArgs.setUserAttributes(userAttributes);
+ cacheArgs.setUserAttributes(userAttrs);
nextArg = (hasNextCacheArg()) ? nextArg("") : null;
}
- if (nextArg!=null)
+ if (nextArg != null)
parseCacheNames(nextArg, cacheArgs);
}
@@ -1643,20 +1999,36 @@ else if (CMD_SKIP_ZEROS.equals(nextArg))
break;
- default:
+ case LIST:
cacheArgs.regex(nextArg("Regex is expected"));
- if (hasNextCacheArg()) {
- String tmp = nextArg("");
+ VisorViewCacheCmd cacheCmd = CACHES;
+
+ OutputFormat outputFormat = SINGLE_LINE;
+
+ while (hasNextCacheArg()) {
+ String tmp = nextArg("").toLowerCase();
switch (tmp) {
case "groups":
- cacheArgs.cacheCommand(GROUPS);
+ cacheCmd = GROUPS;
break;
case "seq":
- cacheArgs.cacheCommand(SEQ);
+ cacheCmd = SEQ;
+
+ break;
+
+ case OUTPUT_FORMAT:
+ String tmp2 = nextArg("output format must be defined!").toLowerCase();
+
+ outputFormat = OutputFormat.fromConsoleName(tmp2);
+
+ break;
+
+ case CONFIG:
+ cacheArgs.fullConfig(true);
break;
@@ -1665,7 +2037,13 @@ else if (CMD_SKIP_ZEROS.equals(nextArg))
}
}
+ cacheArgs.cacheCommand(cacheCmd);
+ cacheArgs.outputFormat(outputFormat);
+
break;
+
+ default:
+ throw new IllegalArgumentException("Unknown --cache subcommand " + cmd);
}
if (hasNextCacheArg())
@@ -1860,6 +2238,107 @@ private boolean isCommandOrOption(String raw) {
return raw != null && raw.contains("--");
}
+ /**
+ * Maps VisorCacheConfiguration to key-value pairs.
+ *
+ * @param cfg Visor cache configuration.
+ * @return map of key-value pairs.
+ */
+ private Map<String, Object> mapToPairs(VisorCacheConfiguration cfg) {
+ Map<String, Object> params = new LinkedHashMap<>();
+
+ VisorCacheAffinityConfiguration affinityCfg = cfg.getAffinityConfiguration();
+ VisorCacheNearConfiguration nearCfg = cfg.getNearConfiguration();
+ VisorCacheRebalanceConfiguration rebalanceCfg = cfg.getRebalanceConfiguration();
+ VisorCacheEvictionConfiguration evictCfg = cfg.getEvictionConfiguration();
+ VisorCacheStoreConfiguration storeCfg = cfg.getStoreConfiguration();
+ VisorQueryConfiguration qryCfg = cfg.getQueryConfiguration();
+
+ params.put("Name", cfg.getName());
+ params.put("Group", cfg.getGroupName());
+ params.put("Dynamic Deployment ID", cfg.getDynamicDeploymentId());
+ params.put("System", cfg.isSystem());
+
+ params.put("Mode", cfg.getMode());
+ params.put("Atomicity Mode", cfg.getAtomicityMode());
+ params.put("Statistic Enabled", cfg.isStatisticsEnabled());
+ params.put("Management Enabled", cfg.isManagementEnabled());
+
+ params.put("On-heap cache enabled", cfg.isOnheapCacheEnabled());
+ params.put("Partition Loss Policy", cfg.getPartitionLossPolicy());
+ params.put("Query Parallelism", cfg.getQueryParallelism());
+ params.put("Copy On Read", cfg.isCopyOnRead());
+ params.put("Listener Configurations", cfg.getListenerConfigurations());
+ params.put("Load Previous Value", cfg.isLoadPreviousValue());
+ params.put("Memory Policy Name", cfg.getMemoryPolicyName());
+ params.put("Node Filter", cfg.getNodeFilter());
+ params.put("Read From Backup", cfg.isReadFromBackup());
+ params.put("Topology Validator", cfg.getTopologyValidator());
+
+ params.put("Time To Live Eager Flag", cfg.isEagerTtl());
+
+ params.put("Write Synchronization Mode", cfg.getWriteSynchronizationMode());
+ params.put("Invalidate", cfg.isInvalidate());
+
+ params.put("Affinity Function", affinityCfg.getFunction());
+ params.put("Affinity Backups", affinityCfg.getPartitionedBackups());
+ params.put("Affinity Partitions", affinityCfg.getPartitions());
+ params.put("Affinity Exclude Neighbors", affinityCfg.isExcludeNeighbors());
+ params.put("Affinity Mapper", affinityCfg.getMapper());
+
+ params.put("Rebalance Mode", rebalanceCfg.getMode());
+ params.put("Rebalance Batch Size", rebalanceCfg.getBatchSize());
+ params.put("Rebalance Timeout", rebalanceCfg.getTimeout());
+ params.put("Rebalance Delay", rebalanceCfg.getPartitionedDelay());
+ params.put("Time Between Rebalance Messages", rebalanceCfg.getThrottle());
+ params.put("Rebalance Batches Count", rebalanceCfg.getBatchesPrefetchCnt());
+ params.put("Rebalance Cache Order", rebalanceCfg.getRebalanceOrder());
+
+ params.put("Eviction Policy Enabled", (evictCfg.getPolicy() != null));
+ params.put("Eviction Policy Factory", evictCfg.getPolicy());
+ params.put("Eviction Policy Max Size", evictCfg.getPolicyMaxSize());
+ params.put("Eviction Filter", evictCfg.getFilter());
+
+ params.put("Near Cache Enabled", nearCfg.isNearEnabled());
+ params.put("Near Start Size", nearCfg.getNearStartSize());
+ params.put("Near Eviction Policy Factory", nearCfg.getNearEvictPolicy());
+ params.put("Near Eviction Policy Max Size", nearCfg.getNearEvictMaxSize());
+
+ params.put("Default Lock Timeout", cfg.getDefaultLockTimeout());
+ params.put("Query Entities", cfg.getQueryEntities());
+ params.put("Cache Interceptor", cfg.getInterceptor());
+
+ params.put("Store Enabled", storeCfg.isEnabled());
+ params.put("Store Class", storeCfg.getStore());
+ params.put("Store Factory Class", storeCfg.getStoreFactory());
+ params.put("Store Keep Binary", storeCfg.isStoreKeepBinary());
+ params.put("Store Read Through", storeCfg.isReadThrough());
+ params.put("Store Write Through", storeCfg.isWriteThrough());
+ params.put("Store Write Coalescing", storeCfg.getWriteBehindCoalescing());
+
+ params.put("Write-Behind Enabled", storeCfg.isWriteBehindEnabled());
+ params.put("Write-Behind Flush Size", storeCfg.getFlushSize());
+ params.put("Write-Behind Frequency", storeCfg.getFlushFrequency());
+ params.put("Write-Behind Flush Threads Count", storeCfg.getFlushThreadCount());
+ params.put("Write-Behind Batch Size", storeCfg.getBatchSize());
+
+ params.put("Concurrent Asynchronous Operations Number", cfg.getMaxConcurrentAsyncOperations());
+
+ params.put("Loader Factory Class Name", cfg.getLoaderFactory());
+ params.put("Writer Factory Class Name", cfg.getWriterFactory());
+ params.put("Expiry Policy Factory Class Name", cfg.getExpiryPolicyFactory());
+
+ params.put("Query Execution Time Threshold", qryCfg.getLongQueryWarningTimeout());
+ params.put("Query Escaped Names", qryCfg.isSqlEscapeAll());
+ params.put("Query SQL Schema", qryCfg.getSqlSchema());
+ params.put("Query SQL functions", qryCfg.getSqlFunctionClasses());
+ params.put("Query Indexed Types", qryCfg.getIndexedTypes());
+ params.put("Maximum payload size for offheap indexes", cfg.getSqlIndexMaxInlineSize());
+ params.put("Query Metrics History Size", cfg.getQueryDetailMetricsSize());
+
+ return params;
+ }
+
/**
* Parse and execute command.
*
@@ -1876,27 +2355,23 @@ public int execute(List<String> rawArgs) {
if (F.isEmpty(rawArgs) || (rawArgs.size() == 1 && CMD_HELP.equalsIgnoreCase(rawArgs.get(0)))) {
log("This utility can do the following commands:");
- usage(" Activate cluster:", ACTIVATE);
- usage(" Deactivate cluster:", DEACTIVATE, " [" + CMD_AUTO_CONFIRMATION + "]");
- usage(" Print current cluster state:", STATE);
- usage(" Print cluster baseline topology:", BASELINE);
- usage(" Add nodes into baseline topology:", BASELINE, " add consistentId1[,consistentId2,....,consistentIdN] [" + CMD_AUTO_CONFIRMATION + "]");
- usage(" Remove nodes from baseline topology:", BASELINE, " remove consistentId1[,consistentId2,....,consistentIdN] [" + CMD_AUTO_CONFIRMATION + "]");
- usage(" Set baseline topology:", BASELINE, " set consistentId1[,consistentId2,....,consistentIdN] [" + CMD_AUTO_CONFIRMATION + "]");
- usage(" Set baseline topology based on version:", BASELINE, " version topologyVersion [" + CMD_AUTO_CONFIRMATION + "]");
- usage(" List or kill transactions:", TX, " [xid XID] [minDuration SECONDS] " +
- "[minSize SIZE] [label PATTERN_REGEX] [servers|clients] " +
- "[nodes consistentId1[,consistentId2,....,consistentIdN] [limit NUMBER] [order DURATION|SIZE|", CMD_TX_ORDER_START_TIME, "] [kill] [" + CMD_AUTO_CONFIRMATION + "]");
+ usage(i("Activate cluster:"), ACTIVATE);
+ usage(i("Deactivate cluster:"), DEACTIVATE, op(CMD_AUTO_CONFIRMATION));
+ usage(i("Print current cluster state:"), STATE);
+ usage(i("Print cluster baseline topology:"), BASELINE);
+ usage(i("Add nodes into baseline topology:"), BASELINE, BASELINE_ADD, "consistentId1[,consistentId2,....,consistentIdN]", op(CMD_AUTO_CONFIRMATION));
+ usage(i("Remove nodes from baseline topology:"), BASELINE, BASELINE_REMOVE, "consistentId1[,consistentId2,....,consistentIdN]", op(CMD_AUTO_CONFIRMATION));
+ usage(i("Set baseline topology:"), BASELINE, BASELINE_SET, "consistentId1[,consistentId2,....,consistentIdN]", op(CMD_AUTO_CONFIRMATION));
+ usage(i("Set baseline topology based on version:"), BASELINE, BASELINE_SET_VERSION + " topologyVersion", op(CMD_AUTO_CONFIRMATION));
+ usage(i("List or kill transactions:"), TX, op(TX_XID, "XID"), op(TX_DURATION, "SECONDS"), op(TX_SIZE, "SIZE"), op(TX_LABEL, "PATTERN_REGEX"), op(or(TX_SERVERS, TX_CLIENTS)), op(TX_NODES, "consistentId1[,consistentId2,....,consistentIdN]"), op(TX_LIMIT, "NUMBER"), op(TX_ORDER, or("DURATION", "SIZE", CMD_TX_ORDER_START_TIME)), op(TX_KILL), op(CMD_AUTO_CONFIRMATION));
if (enableExperimental) {
- usage(" Print absolute paths of unused archived wal segments on each node:", WAL,
- " print [consistentId1,consistentId2,....,consistentIdN]");
- usage(" Delete unused archived wal segments on each node:", WAL,
- " delete [consistentId1,consistentId2,....,consistentIdN] [" + CMD_AUTO_CONFIRMATION + "]");
+ usage(i("Print absolute paths of unused archived wal segments on each node:"), WAL, WAL_PRINT, "[consistentId1,consistentId2,....,consistentIdN]");
+ usage(i("Delete unused archived wal segments on each node:"), WAL, WAL_DELETE, "[consistentId1,consistentId2,....,consistentIdN] ", op(CMD_AUTO_CONFIRMATION));
}
- log(" View caches information in a cluster. For more details type:");
- log(" control.sh --cache help");
+ log(i("View caches information in a cluster. For more details type:"));
+ log(i(String.join(" ", UTILITY_NAME, CACHE.text(), HELP.text()), 2));
nl();
log("By default commands affecting the cluster require interactive confirmation.");
@@ -1904,24 +2379,30 @@ public int execute(List<String> rawArgs) {
nl();
log("Default values:");
- log(" HOST_OR_IP=" + DFLT_HOST);
- log(" PORT=" + DFLT_PORT);
- log(" PING_INTERVAL=" + DFLT_PING_INTERVAL);
- log(" PING_TIMEOUT=" + DFLT_PING_TIMEOUT);
+ log(i("HOST_OR_IP=" + DFLT_HOST, 2));
+ log(i("PORT=" + DFLT_PORT, 2));
+ log(i("PING_INTERVAL=" + DFLT_PING_INTERVAL, 2));
+ log(i("PING_TIMEOUT=" + DFLT_PING_TIMEOUT, 2));
nl();
log("Exit codes:");
- log(" " + EXIT_CODE_OK + " - successful execution.");
- log(" " + EXIT_CODE_INVALID_ARGUMENTS + " - invalid arguments.");
- log(" " + EXIT_CODE_CONNECTION_FAILED + " - connection failed.");
- log(" " + ERR_AUTHENTICATION_FAILED + " - authentication failed.");
- log(" " + EXIT_CODE_UNEXPECTED_ERROR + " - unexpected error.");
+ log(i(EXIT_CODE_OK + " - successful execution.", 2));
+ log(i(EXIT_CODE_INVALID_ARGUMENTS + " - invalid arguments.", 2));
+ log(i(EXIT_CODE_CONNECTION_FAILED + " - connection failed.", 2));
+ log(i(ERR_AUTHENTICATION_FAILED + " - authentication failed.", 2));
+ log(i(EXIT_CODE_UNEXPECTED_ERROR + " - unexpected error.", 2));
return EXIT_CODE_OK;
}
Arguments args = parseAndValidate(rawArgs);
+ if (args.command() == CACHE && args.cacheArgs().command() == HELP) {
+ printCacheHelp();
+
+ return EXIT_CODE_OK;
+ }
+
if (!args.autoConfirmation() && !confirm(args)) {
log("Operation cancelled.");
@@ -1936,51 +2417,101 @@ public int execute(List<String> rawArgs) {
clientCfg.setServers(Collections.singletonList(args.host() + ":" + args.port()));
- if (!F.isEmpty(args.user())) {
- clientCfg.setSecurityCredentialsProvider(
- new SecurityCredentialsBasicProvider(new SecurityCredentials(args.user(), args.password())));
- }
+ boolean tryConnectAgain = true;
- try (GridClient client = GridClientFactory.start(clientCfg)) {
- switch (args.command()) {
- case ACTIVATE:
- activate(client);
+ int tryConnectMaxCount=3;
- break;
+ while (tryConnectAgain) {
+ tryConnectAgain = false;
- case DEACTIVATE:
- deactivate(client);
+ if (!F.isEmpty(args.getUserName())) {
+ SecurityCredentialsProvider securityCredential = clientCfg.getSecurityCredentialsProvider();
- break;
+ if (securityCredential == null) {
+ securityCredential = new SecurityCredentialsBasicProvider(
+ new SecurityCredentials(args.getUserName(), args.getPassword())
+ );
- case STATE:
- state(client);
+ clientCfg.setSecurityCredentialsProvider(securityCredential);
+ }
+ final SecurityCredentials credential = securityCredential.credentials();
+ credential.setLogin(args.getUserName());
+ credential.setPassword(args.getPassword());
+ }
- break;
+ try (GridClient client = GridClientFactory.start(clientCfg)) {
+ switch (args.command()) {
+ case ACTIVATE:
+ activate(client);
- case BASELINE:
- baseline(client, args.baselineAction(), args.baselineArguments());
+ break;
- break;
+ case DEACTIVATE:
+ deactivate(client);
- case TX:
- transactions(client, args.transactionArguments());
+ break;
- break;
+ case STATE:
+ state(client);
- case CACHE:
- cache(client, args.cacheArgs());
+ break;
- break;
+ case BASELINE:
+ baseline(client, args.baselineAction(), args.baselineArguments());
- case WAL:
- wal(client, args.walAction(), args.walArguments());
+ break;
- break;
+ case TX:
+ transactions(client, args.transactionArguments());
+
+ break;
+
+ case CACHE:
+ cache(client, args.cacheArgs());
+
+ break;
+
+ case WAL:
+ wal(client, args.walAction(), args.walArguments());
+
+ break;
+ }
}
- }
+ catch (Throwable e) {
+ if (tryConnectMaxCount > 0 && isAuthError(e)) {
+ System.out.println("Authentication error, try connection again.");
- return 0;
+ final Console console = System.console();
+
+ if (console != null) {
+ if (F.isEmpty(args.getUserName()))
+ args.setUserName(console.readLine("user: "));
+
+ args.setPassword(new String(console.readPassword("password: ")));
+ }
+ else {
+ Scanner scanner = new Scanner(System.in);
+
+ if (F.isEmpty(args.getUserName())){
+ System.out.println("user: ");
+
+ args.setUserName(scanner.next());
+ }
+
+ System.out.println("password: ");
+
+ args.setPassword(scanner.next());
+ }
+
+ tryConnectAgain = true;
+
+ tryConnectMaxCount--;
+ }
+ else
+ throw e;
+ }
+ }
+ return EXIT_CODE_OK;
}
catch (IllegalArgumentException e) {
return error(EXIT_CODE_INVALID_ARGUMENTS, "Check arguments.", e);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/OutputFormat.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/OutputFormat.java
new file mode 100644
index 000000000000..356cb4b2e88e
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/OutputFormat.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.internal.commandline;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ *
+ */
+public enum OutputFormat {
+ /** Single line. */
+ SINGLE_LINE("single-line"),
+
+ /** Multi line. */
+ MULTI_LINE("multi-line");
+
+ /** */
+ private final String text;
+
+ /** */
+ OutputFormat(String text) {
+ this.text = text;
+ }
+
+ /**
+ * @return Text.
+ */
+ public String text() {
+ return text;
+ }
+
+ /**
+ * Converts format name in console to enumerated value.
+ *
+ * @param text Format name in console.
+ * @return Enumerated value.
+ * @throws IllegalArgumentException If enumerated value not found.
+ */
+ public static OutputFormat fromConsoleName(@NotNull String text) {
+ for (OutputFormat format : values()) {
+ if (format.text.equals(text))
+ return format;
+ }
+
+ throw new IllegalArgumentException("Unknown output format " + text);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return text;
+ }
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java
index 97d234aeb879..f7146103a086 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/CacheArguments.java
@@ -18,6 +18,7 @@
import java.util.Set;
import java.util.UUID;
+import org.apache.ignite.internal.commandline.OutputFormat;
import org.apache.ignite.internal.visor.verify.VisorViewCacheCmd;
import org.jetbrains.annotations.Nullable;
@@ -64,6 +65,22 @@
/** Additional user attributes in result. Set of attribute names whose values will be searched in ClusterNode.attributes(). */
private Set<String> userAttributes;
+ /** Output format. */
+ private OutputFormat outputFormat;
+
+ /** Full config flag. */
+ private boolean fullConfig;
+
+ /**
+ * @return Full config flag.
+ */
+ public boolean fullConfig(){ return fullConfig; }
+
+ /**
+ * @param fullConfig New full config flag.
+ */
+ public void fullConfig(boolean fullConfig) { this.fullConfig = fullConfig; }
+
/**
* @return Command.
*/
@@ -245,4 +262,14 @@ public void skipZeros(boolean skipZeros) {
public void setUserAttributes(Set<String> userAttrs) {
userAttributes = userAttrs;
}
+
+ /**
+ * @return Output format.
+ */
+ public OutputFormat outputFormat() { return outputFormat; }
+
+ /**
+ * @param outputFormat New output format.
+ */
+ public void outputFormat(OutputFormat outputFormat) { this.outputFormat = outputFormat; }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTaskResult.java
index 71de3bbc0dd0..52c6eec308af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTaskResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTaskResult.java
@@ -294,10 +294,10 @@ public void setUserAttributes(Map<String, String> userAttrs) {
Row other = (Row)o;
- int res = grpId - other.grpId;
+ int res = Integer.compare(grpId, other.grpId);
if (res == 0) {
- res = partId - other.partId;
+ res = Integer.compare(partId, other.partId);
if (res == 0)
res = nodeId.compareTo(other.nodeId);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
index 47d787781682..b8208016aba5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java
@@ -27,6 +27,9 @@
import org.apache.ignite.internal.direct.stream.DirectByteBufferStream;
import org.apache.ignite.internal.direct.stream.v1.DirectByteBufferStreamImplV1;
import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2;
+import org.apache.ignite.internal.direct.stream.v3.DirectByteBufferStreamImplV3;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteOutClosure;
import org.apache.ignite.lang.IgniteUuid;
@@ -41,8 +44,13 @@
*/
public class DirectMessageReader implements MessageReader {
/** State. */
+ @GridToStringInclude
private final DirectMessageState<StateItem> state;
+ /** Protocol version. */
+ @GridToStringInclude
+ private final byte protoVer;
+
/** Whether last field was fully read. */
private boolean lastRead;
@@ -56,6 +64,8 @@ public DirectMessageReader(final MessageFactory msgFactory, final byte protoVer)
return new StateItem(msgFactory, protoVer);
}
});
+
+ this.protoVer = protoVer;
}
/** {@inheritDoc} */
@@ -304,6 +314,21 @@ public DirectMessageReader(final MessageFactory msgFactory, final byte protoVer)
return val;
}
+ /** {@inheritDoc} */
+ @Override public AffinityTopologyVersion readAffinityTopologyVersion(String name) {
+ if (protoVer >= 3) {
+ DirectByteBufferStream stream = state.item().stream;
+
+ AffinityTopologyVersion val = stream.readAffinityTopologyVersion();
+
+ lastRead = stream.lastFinished();
+
+ return val;
+ }
+
+ return readMessage(name);
+ }
+
/** {@inheritDoc} */
@Nullable @Override public <T extends Message> T readMessage(String name) {
DirectByteBufferStream stream = state.item().stream;
@@ -409,6 +434,11 @@ public StateItem(MessageFactory msgFactory, byte protoVer) {
break;
+ case 3:
+ stream = new DirectByteBufferStreamImplV3(msgFactory);
+
+ break;
+
default:
throw new IllegalStateException("Invalid protocol version: " + protoVer);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
index 51cea174e9a1..bb88ffc85166 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
@@ -27,6 +27,8 @@
import org.apache.ignite.internal.direct.stream.DirectByteBufferStream;
import org.apache.ignite.internal.direct.stream.v1.DirectByteBufferStreamImplV1;
import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2;
+import org.apache.ignite.internal.direct.stream.v3.DirectByteBufferStreamImplV3;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.lang.IgniteOutClosure;
@@ -44,6 +46,10 @@
@GridToStringInclude
private final DirectMessageState<StateItem> state;
+ /** Protocol version. */
+ @GridToStringInclude
+ private final byte protoVer;
+
/**
* @param protoVer Protocol version.
*/
@@ -53,6 +59,8 @@ public DirectMessageWriter(final byte protoVer) {
return new StateItem(protoVer);
}
});
+
+ this.protoVer = protoVer;
}
/** {@inheritDoc} */
@@ -272,6 +280,19 @@ public DirectMessageWriter(final byte protoVer) {
return stream.lastFinished();
}
+ /** {@inheritDoc} */
+ @Override public boolean writeAffinityTopologyVersion(String name, AffinityTopologyVersion val) {
+ if (protoVer >= 3) {
+ DirectByteBufferStream stream = state.item().stream;
+
+ stream.writeAffinityTopologyVersion(val);
+
+ return stream.lastFinished();
+ }
+
+ return writeMessage(name, val);
+ }
+
/** {@inheritDoc} */
@Override public boolean writeMessage(String name, @Nullable Message msg) {
DirectByteBufferStream stream = state.item().stream;
@@ -376,6 +397,11 @@ public StateItem(byte protoVer) {
break;
+ case 3:
+ stream = new DirectByteBufferStreamImplV3(null);
+
+ break;
+
default:
throw new IllegalStateException("Invalid protocol version: " + protoVer);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/DirectByteBufferStream.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/DirectByteBufferStream.java
index 204e6b034530..ae5502eb75f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/DirectByteBufferStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/DirectByteBufferStream.java
@@ -22,6 +22,7 @@
import java.util.Collection;
import java.util.Map;
import java.util.UUID;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
@@ -160,6 +161,11 @@
*/
public void writeIgniteUuid(IgniteUuid val);
+ /**
+ * @param val Value.
+ */
+ public void writeAffinityTopologyVersion(AffinityTopologyVersion val);
+
/**
* @param msg Message.
* @param writer Writer.
@@ -289,6 +295,11 @@
*/
public IgniteUuid readIgniteUuid();
+ /**
+ * @return Value.
+ */
+ public AffinityTopologyVersion readAffinityTopologyVersion();
+
/**
* @param reader Reader.
* @return Message.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
index c78c47914fdf..118e1f1d0cbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
@@ -27,6 +27,7 @@
import java.util.NoSuchElementException;
import java.util.UUID;
import org.apache.ignite.internal.direct.stream.DirectByteBufferStream;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -494,6 +495,11 @@ public DirectByteBufferStreamImplV1(MessageFactory msgFactory) {
writeByteArray(val != null ? U.igniteUuidToBytes(val) : null);
}
+ /** {@inheritDoc} */
+ @Override public void writeAffinityTopologyVersion(AffinityTopologyVersion val) {
+ throw new UnsupportedOperationException("Not implemented");
+ }
+
/** {@inheritDoc} */
@Override public void writeMessage(Message msg, MessageWriter writer) {
if (msg != null) {
@@ -811,6 +817,11 @@ public DirectByteBufferStreamImplV1(MessageFactory msgFactory) {
return arr != null ? U.bytesToIgniteUuid(arr, 0) : null;
}
+ /** {@inheritDoc} */
+ @Override public AffinityTopologyVersion readAffinityTopologyVersion() {
+ throw new UnsupportedOperationException("Not implemented");
+ }
+
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public <T extends Message> T readMessage(MessageReader reader) {
@@ -1212,6 +1223,7 @@ private void write(MessageCollectionItemType type, Object val, MessageWriter wri
break;
+ case AFFINITY_TOPOLOGY_VERSION:
case MSG:
try {
if (val != null)
@@ -1298,6 +1310,7 @@ private Object read(MessageCollectionItemType type, MessageReader reader) {
case IGNITE_UUID:
return readIgniteUuid();
+ case AFFINITY_TOPOLOGY_VERSION:
case MSG:
return readMessage(reader);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
index e338bc0187d4..fd93cfb81f83 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
@@ -29,6 +29,7 @@
import java.util.UUID;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.direct.stream.DirectByteBufferStream;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -298,7 +299,7 @@
private long uuidLocId;
/** */
- private boolean lastFinished;
+ protected boolean lastFinished;
/**
* @param msgFactory Message factory.
@@ -657,6 +658,11 @@ public DirectByteBufferStreamImplV2(MessageFactory msgFactory) {
}
}
+ /** {@inheritDoc} */
+ @Override public void writeAffinityTopologyVersion(AffinityTopologyVersion val) {
+ throw new UnsupportedOperationException("Not implemented");
+ }
+
/** {@inheritDoc} */
@Override public void writeMessage(Message msg, MessageWriter writer) {
if (msg != null) {
@@ -1152,6 +1158,11 @@ public DirectByteBufferStreamImplV2(MessageFactory msgFactory) {
return val;
}
+ /** {@inheritDoc} */
+ @Override public AffinityTopologyVersion readAffinityTopologyVersion() {
+ throw new UnsupportedOperationException("Not implemented");
+ }
+
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public <T extends Message> T readMessage(MessageReader reader) {
@@ -1587,7 +1598,7 @@ private boolean writeArrayLength(int len) {
* @param val Value.
* @param writer Writer.
*/
- private void write(MessageCollectionItemType type, Object val, MessageWriter writer) {
+ protected void write(MessageCollectionItemType type, Object val, MessageWriter writer) {
switch (type) {
case BYTE:
writeByte((Byte)val);
@@ -1689,6 +1700,7 @@ private void write(MessageCollectionItemType type, Object val, MessageWriter wri
break;
+ case AFFINITY_TOPOLOGY_VERSION:
case MSG:
try {
if (val != null)
@@ -1713,7 +1725,7 @@ private void write(MessageCollectionItemType type, Object val, MessageWriter wri
* @param reader Reader.
* @return Value.
*/
- private Object read(MessageCollectionItemType type, MessageReader reader) {
+ protected Object read(MessageCollectionItemType type, MessageReader reader) {
switch (type) {
case BYTE:
return readByte();
@@ -1775,6 +1787,7 @@ private Object read(MessageCollectionItemType type, MessageReader reader) {
case IGNITE_UUID:
return readIgniteUuid();
+ case AFFINITY_TOPOLOGY_VERSION:
case MSG:
return readMessage(reader);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v3/DirectByteBufferStreamImplV3.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v3/DirectByteBufferStreamImplV3.java
new file mode 100644
index 000000000000..89043ebcbc0c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v3/DirectByteBufferStreamImplV3.java
@@ -0,0 +1,298 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.direct.stream.v3;
+
+import java.util.BitSet;
+import java.util.UUID;
+import org.apache.ignite.internal.direct.stream.v2.DirectByteBufferStreamImplV2;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageReader;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+
+/**
+ *
+ */
+public class DirectByteBufferStreamImplV3 extends DirectByteBufferStreamImplV2 {
+ /** */
+ private byte topVerState;
+
+ /** */
+ private long topVerMajor;
+
+ /** */
+ private int topVerMinor;
+
+ /**
+ * @param msgFactory Message factory.
+ */
+ public DirectByteBufferStreamImplV3(MessageFactory msgFactory) {
+ super(msgFactory);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeAffinityTopologyVersion(AffinityTopologyVersion val) {
+ if (val != null) {
+ switch (topVerState) {
+ case 0:
+ writeInt(val.minorTopologyVersion());
+
+ if (!lastFinished)
+ return;
+
+ topVerState++;
+
+ case 1:
+ writeLong(val.topologyVersion());
+
+ if (!lastFinished)
+ return;
+
+ topVerState = 0;
+ }
+ }
+ else
+ writeInt(-1);
+ }
+
+ /** {@inheritDoc} */
+ @Override public AffinityTopologyVersion readAffinityTopologyVersion() {
+ switch (topVerState) {
+ case 0:
+ topVerMinor = readInt();
+
+ if (!lastFinished || topVerMinor == -1)
+ return null;
+
+ topVerState++;
+
+ case 1:
+ topVerMajor = readLong();
+
+ if (!lastFinished)
+ return null;
+
+ topVerState = 0;
+ }
+
+ return new AffinityTopologyVersion(topVerMajor, topVerMinor);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void write(MessageCollectionItemType type, Object val, MessageWriter writer) {
+ switch (type) {
+ case BYTE:
+ writeByte((Byte)val);
+
+ break;
+
+ case SHORT:
+ writeShort((Short)val);
+
+ break;
+
+ case INT:
+ writeInt((Integer)val);
+
+ break;
+
+ case LONG:
+ writeLong((Long)val);
+
+ break;
+
+ case FLOAT:
+ writeFloat((Float)val);
+
+ break;
+
+ case DOUBLE:
+ writeDouble((Double)val);
+
+ break;
+
+ case CHAR:
+ writeChar((Character)val);
+
+ break;
+
+ case BOOLEAN:
+ writeBoolean((Boolean)val);
+
+ break;
+
+ case BYTE_ARR:
+ writeByteArray((byte[])val);
+
+ break;
+
+ case SHORT_ARR:
+ writeShortArray((short[])val);
+
+ break;
+
+ case INT_ARR:
+ writeIntArray((int[])val);
+
+ break;
+
+ case LONG_ARR:
+ writeLongArray((long[])val);
+
+ break;
+
+ case FLOAT_ARR:
+ writeFloatArray((float[])val);
+
+ break;
+
+ case DOUBLE_ARR:
+ writeDoubleArray((double[])val);
+
+ break;
+
+ case CHAR_ARR:
+ writeCharArray((char[])val);
+
+ break;
+
+ case BOOLEAN_ARR:
+ writeBooleanArray((boolean[])val);
+
+ break;
+
+ case STRING:
+ writeString((String)val);
+
+ break;
+
+ case BIT_SET:
+ writeBitSet((BitSet)val);
+
+ break;
+
+ case UUID:
+ writeUuid((UUID)val);
+
+ break;
+
+ case IGNITE_UUID:
+ writeIgniteUuid((IgniteUuid)val);
+
+ break;
+
+ case AFFINITY_TOPOLOGY_VERSION:
+ writeAffinityTopologyVersion((AffinityTopologyVersion)val);
+
+ break;
+ case MSG:
+ try {
+ if (val != null)
+ writer.beforeInnerMessageWrite();
+
+ writeMessage((Message)val, writer);
+ }
+ finally {
+ if (val != null)
+ writer.afterInnerMessageWrite(lastFinished);
+ }
+
+ break;
+
+ default:
+ throw new IllegalArgumentException("Unknown type: " + type);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override protected Object read(MessageCollectionItemType type, MessageReader reader) {
+ switch (type) {
+ case BYTE:
+ return readByte();
+
+ case SHORT:
+ return readShort();
+
+ case INT:
+ return readInt();
+
+ case LONG:
+ return readLong();
+
+ case FLOAT:
+ return readFloat();
+
+ case DOUBLE:
+ return readDouble();
+
+ case CHAR:
+ return readChar();
+
+ case BOOLEAN:
+ return readBoolean();
+
+ case BYTE_ARR:
+ return readByteArray();
+
+ case SHORT_ARR:
+ return readShortArray();
+
+ case INT_ARR:
+ return readIntArray();
+
+ case LONG_ARR:
+ return readLongArray();
+
+ case FLOAT_ARR:
+ return readFloatArray();
+
+ case DOUBLE_ARR:
+ return readDoubleArray();
+
+ case CHAR_ARR:
+ return readCharArray();
+
+ case BOOLEAN_ARR:
+ return readBooleanArray();
+
+ case STRING:
+ return readString();
+
+ case BIT_SET:
+ return readBitSet();
+
+ case UUID:
+ return readUuid();
+
+ case IGNITE_UUID:
+ return readIgniteUuid();
+
+ case AFFINITY_TOPOLOGY_VERSION:
+ return readAffinityTopologyVersion();
+
+ case MSG:
+ return readMessage(reader);
+
+ default:
+ throw new IllegalArgumentException("Unknown type: " + type);
+ }
+ }
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
index 8b21ff2fe538..4b25e0b68766 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
@@ -177,4 +177,4 @@ public String getCheckpointSpi() {
@Override public String toString() {
return S.toString(GridCheckpointRequest.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index b3c80b05f635..ae117bb07355 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -135,7 +135,7 @@
public static final String DIRECT_PROTO_VER_ATTR = "comm.direct.proto.ver";
/** Direct protocol version. */
- public static final byte DIRECT_PROTO_VER = 2;
+ public static final byte DIRECT_PROTO_VER = 3;
/** Current IO policy. */
private static final ThreadLocal<Byte> CUR_PLC = new ThreadLocal<>();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
index 332a9de511c7..408fad773f93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
@@ -358,4 +358,4 @@ public void deployment(GridDeployment dep) {
@Override public String toString() {
return S.toString(GridIoUserMessage.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
index 0a8b2b7a38e6..a6a2469736ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessage.java
@@ -20,6 +20,7 @@
import java.nio.ByteBuffer;
import java.util.UUID;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
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;
@@ -28,6 +29,7 @@
/**
*
*/
+@IgniteCodeGeneratingFail
public class IgniteIoTestMessage implements Message {
/** */
private static byte FLAG_PROC_FROM_NIO = 1;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
index c3efc592b134..3450aa5195c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeployment.java
@@ -35,6 +35,7 @@
import org.apache.ignite.compute.ComputeTask;
import org.apache.ignite.configuration.DeploymentMode;
import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
import org.apache.ignite.internal.util.GridLeanSet;
import org.apache.ignite.internal.util.lang.GridMetadataAwareAdapter;
import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
@@ -45,6 +46,7 @@
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.ConcurrentHashMap;
@@ -383,6 +385,20 @@ public boolean internalTask(@Nullable ComputeTask task, Class<?> taskCls) {
return res;
}
+ /**
+ * Checks whether task class is annotated with {@link GridVisorManagementTask}.
+ *
+ * @param task Task.
+ * @param taskCls Task class.
+ * @return {@code True} if task is internal.
+ */
+ @SuppressWarnings("unchecked")
+ public boolean visorManagementTask(@Nullable ComputeTask task, @NotNull Class<?> taskCls) {
+ return annotation(task instanceof GridPeerDeployAware ?
+ ((GridPeerDeployAware)task).deployClass() : taskCls,
+ GridVisorManagementTask.class) != null;
+ }
+
/**
* @param cls Class to create new instance of (using default constructor).
* @return New instance.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
index 7f58ce36001a..72f5ec6b3057 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -277,4 +277,4 @@ public GridDeploymentInfoBean(GridDeploymentInfo dep) {
@Override public String toString() {
return S.toString(GridDeploymentInfoBean.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
index 729cf4c54278..708c64860579 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
@@ -278,4 +278,4 @@ public void nodeIds(Collection<UUID> nodeIds) {
@Override public String toString() {
return S.toString(GridDeploymentRequest.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
index d1b0384f0fb6..591957d37bd2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
@@ -197,4 +197,4 @@ void errorMessage(String errMsg) {
@Override public String toString() {
return S.toString(GridDeploymentResponse.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
index d4daab85c0ed..92a2eefe0bcf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
@@ -316,6 +316,9 @@ public void record(DiscoveryEvent evt, DiscoCache discoCache) {
private void record0(Event evt, Object... params) {
assert evt != null;
+ if (ctx.recoveryMode())
+ return;
+
if (!enterBusy())
return;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
index 515500b91d0f..fd5326cf0577 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
@@ -445,4 +445,4 @@ void exceptionBytes(byte[] exBytes) {
@Override public String toString() {
return S.toString(GridEventStorageMessage.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
index d7c61e9b114f..1408383be168 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/store/IgnitePageStoreManager.java
@@ -19,6 +19,7 @@
import java.nio.ByteBuffer;
import java.util.Map;
+import java.util.function.Predicate;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.pagemem.PageMemory;
@@ -243,10 +244,19 @@ public void initializeForCache(CacheGroupDescriptor grpDesc, StoredCacheData cac
public void cleanupPersistentSpace(CacheConfiguration cacheConfiguration) throws IgniteCheckedException;
/**
- * Cleanup persistent space for all caches.
+ * Cleanup persistent space for all caches except metastore.
*/
public void cleanupPersistentSpace() throws IgniteCheckedException;
+ /**
+ * Cleanup cache store whether it matches the provided predicate and if matched
+ * store was previously initizlized.
+ *
+ * @param cacheGrpPred Predicate to match by id cache group stores to clean.
+ * @param cleanFiles {@code True} to delete all persisted files related to particular store.
+ */
+ public void cleanupPageStoreIfMatch(Predicate<Integer> cacheGrpPred, boolean cleanFiles);
+
/**
* Creates and initializes cache work directory retrieved from {@code cacheCfg}.
*
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/IgniteWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/IgniteWriteAheadLogManager.java
index 12fd3e94bd0f..679eec98acc0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/IgniteWriteAheadLogManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/IgniteWriteAheadLogManager.java
@@ -19,6 +19,7 @@
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.pagemem.wal.record.RolloverType;
import org.apache.ignite.internal.pagemem.wal.record.WALRecord;
import org.apache.ignite.internal.processors.cache.GridCacheSharedManager;
import org.apache.ignite.internal.processors.cache.persistence.StorageException;
@@ -46,13 +47,15 @@
/**
* Resumes logging after start. When WAL manager is started, it will skip logging any updates until this
* method is called to avoid logging changes induced by the state restore procedure.
+ *
+ * @throws IgniteCheckedException If fails.
*/
public void resumeLogging(WALPointer lastWrittenPtr) throws IgniteCheckedException;
/**
* Appends the given log entry to the write-ahead log.
*
- * @param entry entry to log.
+ * @param entry Entry to log.
* @return WALPointer that may be passed to {@link #flush(WALPointer, boolean)} method to make sure the record is
* written to the log.
* @throws IgniteCheckedException If failed to construct log entry.
@@ -60,6 +63,22 @@
*/
public WALPointer log(WALRecord entry) throws IgniteCheckedException, StorageException;
+ /**
+ * Appends the given log entry to the write-ahead log. If entry logging leads to rollover, caller can specify
+ * whether to write the entry to the current segment or to th next one.
+ *
+ * @param entry Entry to log.
+ * @param rolloverType Rollover type.
+ * @return WALPointer that may be passed to {@link #flush(WALPointer, boolean)} method to make sure the record is
+ * written to the log.
+ * @throws IgniteCheckedException If failed to construct log entry.
+ * @throws StorageException If IO error occurred while writing log entry.
+ *
+ * @see RolloverType
+ */
+ public WALPointer log(WALRecord entry, RolloverType rolloverType)
+ throws IgniteCheckedException, StorageException;
+
/**
* Makes sure that all log entries written to the log up until the specified pointer are actually written
* to the underlying storage.
@@ -86,9 +105,8 @@
* Invoke this method to reserve WAL history since provided pointer and prevent it's deletion.
*
* @param start WAL pointer.
- * @throws IgniteException If failed to reserve.
*/
- public boolean reserve(WALPointer start) throws IgniteCheckedException;
+ public boolean reserve(WALPointer start);
/**
* Invoke this method to release WAL history since provided pointer that was previously reserved.
@@ -162,9 +180,4 @@
* @param grpId Group id.
*/
public boolean disabled(int grpId);
-
- /**
- * Cleanup all directories relating to WAL (e.g. work WAL dir, archive WAL dir).
- */
- public void cleanupWalDirectories() throws IgniteCheckedException;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataRecord.java
index 7a4d6b8793a2..d5ab53a7226c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataRecord.java
@@ -76,6 +76,13 @@ public DataRecord(List<DataEntry> writeEntries, long timestamp) {
this.writeEntries = writeEntries;
}
+ /**
+ * @param writeEntries Write entries.
+ */
+ public void setWriteEntries(List<DataEntry> writeEntries) {
+ this.writeEntries = writeEntries;
+ }
+
/**
* @return Collection of write entries.
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/MemoryRecoveryRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/MemoryRecoveryRecord.java
index 8843eeedef90..5a48b340d0ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/MemoryRecoveryRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/MemoryRecoveryRecord.java
@@ -20,11 +20,11 @@
import org.apache.ignite.internal.util.typedef.internal.S;
/**
- * Marker that we start memory recovering
+ * Marker indicates that binary memory recovery has finished.
*/
public class MemoryRecoveryRecord extends WALRecord {
/** Create timestamp, millis */
- private long time;
+ private final long time;
/**
* Default constructor.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/MetastoreDataRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/MetastoreDataRecord.java
index e269de2adc01..9e734244c7b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/MetastoreDataRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/MetastoreDataRecord.java
@@ -18,13 +18,14 @@
package org.apache.ignite.internal.pagemem.wal.record;
+import org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.jetbrains.annotations.Nullable;
/**
*
*/
-public class MetastoreDataRecord extends WALRecord {
+public class MetastoreDataRecord extends WALRecord implements WalRecordCacheGroupAware {
/** */
private final String key;
@@ -59,4 +60,9 @@ public String key() {
@Override public String toString() {
return S.toString(MetastoreDataRecord.class, this, "super", super.toString());
}
+
+ /** {@inheritDoc} */
+ @Override public int groupId() {
+ return MetaStorage.METASTORAGE_CACHE_ID;
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/RolloverType.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/RolloverType.java
new file mode 100644
index 000000000000..1d99de1e7974
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/RolloverType.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.pagemem.wal.record;
+
+/**
+ * Defines WAL logging type with regard to segment rollover.
+ */
+public enum RolloverType {
+ /** Record being logged is not a rollover record. */
+ NONE,
+
+ /**
+ * Record being logged is a rollover record and it should get to the current segment whenever possible.
+ * If current segment is full, then the record gets to the next segment. Anyway, logging implementation should
+ * guarantee segment rollover afterwards.
+ */
+ CURRENT_SEGMENT,
+
+ /**
+ * Record being logged is a rollover record and it should become the first record in the next segment.
+ */
+ NEXT_SEGMENT;
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/SnapshotRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/SnapshotRecord.java
index c6b63295c781..caa1494b00e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/SnapshotRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/SnapshotRecord.java
@@ -51,11 +51,6 @@ public boolean isFull() {
return full;
}
- /** {@inheritDoc} */
- @Override public boolean rollOver() {
- return true;
- }
-
/**
*
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
index 88f24af0dedc..ad8a2a407c75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
@@ -296,13 +296,6 @@ public void size(int size) {
this.size = size;
}
- /**
- * @return Need wal rollOver.
- */
- public boolean rollOver(){
- return false;
- }
-
/**
* @return Entry type.
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
index e5bd343bcb5e..28294a9f2cd5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/MetaPageUpdatePartitionDataRecord.java
@@ -55,7 +55,8 @@ public MetaPageUpdatePartitionDataRecord(
long updateCntr,
long globalRmvId,
int partSize,
- long cntrsPageId, byte state,
+ long cntrsPageId,
+ byte state,
int allocatedIdxCandidate
) {
super(grpId, pageId);
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 44b27534dee6..333841d1b33b 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
@@ -219,4 +219,4 @@ public int minorTopologyVersion() {
@Override public String toString() {
return S.toString(AffinityTopologyVersion.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 2290ce6bee72..d98ed5f50709 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -691,19 +691,41 @@ public AffinityAssignment readyAffinity(AffinityTopologyVersion topVer) {
* @return Cached affinity.
*/
public AffinityAssignment cachedAffinity(AffinityTopologyVersion topVer) {
+ AffinityTopologyVersion lastAffChangeTopVer =
+ ctx.cache().context().exchange().lastAffinityChangedTopologyVersion(topVer);
+
+ return cachedAffinity(topVer, lastAffChangeTopVer);
+ }
+
+ /**
+ * Get cached affinity for specified topology version.
+ *
+ * @param topVer Topology version.
+ * @return Cached affinity.
+ */
+ public AffinityAssignment cachedAffinity(AffinityTopologyVersion topVer, AffinityTopologyVersion lastAffChangeTopVer) {
if (topVer.equals(AffinityTopologyVersion.NONE))
- topVer = lastVersion();
- else
- awaitTopologyVersion(topVer);
+ topVer = lastAffChangeTopVer = lastVersion();
+ else {
+ if (lastAffChangeTopVer.equals(AffinityTopologyVersion.NONE))
+ lastAffChangeTopVer = topVer;
+
+ awaitTopologyVersion(lastAffChangeTopVer);
+ }
assert topVer.topologyVersion() >= 0 : topVer;
AffinityAssignment cache = head.get();
- if (!cache.topologyVersion().equals(topVer)) {
- cache = affCache.get(topVer);
+ if (!(cache.topologyVersion().compareTo(lastAffChangeTopVer) >= 0 &&
+ cache.topologyVersion().compareTo(topVer) <= 0)) {
- if (cache == null) {
+ Map.Entry<AffinityTopologyVersion, HistoryAffinityAssignment> e = affCache.ceilingEntry(lastAffChangeTopVer);
+
+ if (e != null)
+ cache = e.getValue();
+
+ if (cache == null || cache.topologyVersion().compareTo(topVer) > 0) {
throw new IllegalStateException("Getting affinity for topology version earlier than affinity is " +
"calculated [locNode=" + ctx.discovery().localNode() +
", grp=" + cacheOrGrpName +
@@ -714,7 +736,8 @@ public AffinityAssignment cachedAffinity(AffinityTopologyVersion topVer) {
}
}
- assert cache.topologyVersion().equals(topVer) : "Invalid cached affinity: " + cache;
+ assert cache.topologyVersion().compareTo(lastAffChangeTopVer) >= 0 &&
+ cache.topologyVersion().compareTo(topVer) <= 0 : "Invalid cached affinity: [cache=" + cache + ", topVer=" + topVer + ", lastAffChangedTopVer=" + lastAffChangeTopVer + "]";
return cache;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
index d86b1ad91a55..e3dee3ce92a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/authentication/UserAuthenticateResponseMessage.java
@@ -98,7 +98,6 @@ public IgniteUuid id() {
writer.incrementState();
-
}
return true;
@@ -127,6 +126,7 @@ public IgniteUuid id() {
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(UserAuthenticateResponseMessage.class);
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 0dda7ef49667..2724ceed863b 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
@@ -17,20 +17,23 @@
package org.apache.ignite.internal.processors.cache;
+import javax.cache.CacheException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import javax.cache.CacheException;
+import java.util.stream.Collectors;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.affinity.AffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
@@ -359,11 +362,7 @@ void checkRebalanceState(GridDhtPartitionTopology top, Integer checkGrpId) {
void onCacheGroupCreated(CacheGroupContext grp) {
if (!grpHolders.containsKey(grp.groupId())) {
cctx.io().addCacheGroupHandler(grp.groupId(), GridDhtAffinityAssignmentResponse.class,
- new IgniteBiInClosure<UUID, GridDhtAffinityAssignmentResponse>() {
- @Override public void apply(UUID nodeId, GridDhtAffinityAssignmentResponse res) {
- processAffinityAssignmentResponse(nodeId, res);
- }
- });
+ (IgniteBiInClosure<UUID, GridDhtAffinityAssignmentResponse>) this::processAffinityAssignmentResponse);
}
}
@@ -425,25 +424,43 @@ void onCacheGroupCreated(CacheGroupContext grp) {
Map<Integer, GridDhtAssignmentFetchFuture> fetchFuts = U.newHashMap(startDescs.size());
- Set<String> startedCaches = U.newHashSet(startDescs.size());
-
Map<Integer, Boolean> startedInfos = U.newHashMap(startDescs.size());
- for (DynamicCacheDescriptor desc : startDescs) {
- try {
- startedCaches.add(desc.cacheName());
+ List<StartCacheInfo> startCacheInfos = startDescs.stream()
+ .map(desc -> {
+ DynamicCacheChangeRequest changeReq = startReqs.get(desc.cacheName());
- DynamicCacheChangeRequest startReq = startReqs.get(desc.cacheName());
-
- cctx.cache().prepareCacheStart(
- desc.cacheConfiguration(),
+ return new StartCacheInfo(
desc,
- startReq.nearCacheConfiguration(),
+ changeReq.nearCacheConfiguration(),
topVer,
- startReq.disabledAfterStart()
+ changeReq.disabledAfterStart()
);
+ })
+ .collect(Collectors.toList());
- startedInfos.put(desc.cacheId(), startReq.nearCacheConfiguration() != null);
+ Set<String> startedCaches = startCacheInfos.stream()
+ .map(info -> info.getCacheDescriptor().cacheName())
+ .collect(Collectors.toSet());
+
+ try {
+ cctx.cache().prepareStartCaches(startCacheInfos);
+ }
+ catch (IgniteCheckedException e) {
+ cctx.cache().closeCaches(startedCaches, false);
+
+ cctx.cache().completeClientCacheChangeFuture(msg.requestId(), e);
+
+ return null;
+ }
+
+ for (StartCacheInfo startCacheInfo : startCacheInfos) {
+ try {
+ DynamicCacheDescriptor desc = startCacheInfo.getCacheDescriptor();
+
+ startedCaches.add(desc.cacheName());
+
+ startedInfos.put(desc.cacheId(), startCacheInfo.getReqNearCfg() != null);
CacheGroupContext grp = cctx.cache().cacheGroup(desc.groupId());
@@ -858,6 +875,8 @@ private void processCacheStartRequests(
long time = System.currentTimeMillis();
+ Map<StartCacheInfo, DynamicCacheChangeRequest> startCacheInfos = new LinkedHashMap<>();
+
for (ExchangeActions.CacheActionData action : exchActions.cacheStartRequests()) {
DynamicCacheDescriptor cacheDesc = action.descriptor();
@@ -893,29 +912,41 @@ private void processCacheStartRequests(
}
}
- try {
- if (startCache) {
- cctx.cache().prepareCacheStart(
+ if (startCache) {
+ startCacheInfos.put(
+ new StartCacheInfo(
req.startCacheConfiguration(),
cacheDesc,
nearCfg,
evts.topologyVersion(),
req.disabledAfterStart()
- );
-
- if (fut.cacheAddedOnExchange(cacheDesc.cacheId(), cacheDesc.receivedFrom())) {
- if (fut.events().discoveryCache().cacheGroupAffinityNodes(cacheDesc.groupId()).isEmpty())
- U.quietAndWarn(log, "No server nodes found for cache client: " + req.cacheName());
- }
- }
+ ),
+ req
+ );
}
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to initialize cache. Will try to rollback cache start routine. " +
- "[cacheName=" + req.cacheName() + ']', e);
+ }
+
+ Map<StartCacheInfo, IgniteCheckedException> failedCaches = cctx.cache().prepareStartCachesIfPossible(startCacheInfos.keySet());
+
+ failedCaches.forEach((cacheInfo, exception) -> {
+ U.error(log, "Failed to initialize cache. Will try to rollback cache start routine. " +
+ "[cacheName=" + cacheInfo.getStartedConfiguration().getName() + ']', exception);
+
+ cctx.cache().closeCaches(Collections.singleton(cacheInfo.getStartedConfiguration().getName()), false);
+
+ cctx.cache().completeCacheStartFuture(startCacheInfos.get(cacheInfo), false, exception);
+ });
+
+ Set<StartCacheInfo> failedCacheInfos = failedCaches.keySet();
- cctx.cache().closeCaches(Collections.singleton(req.cacheName()), false);
+ List<StartCacheInfo> cacheInfos = startCacheInfos.keySet().stream()
+ .filter(failedCacheInfos::contains)
+ .collect(Collectors.toList());
- cctx.cache().completeCacheStartFuture(req, false, e);
+ for (StartCacheInfo info : cacheInfos) {
+ if (fut.cacheAddedOnExchange(info.getCacheDescriptor().cacheId(), info.getCacheDescriptor().receivedFrom())) {
+ if (fut.events().discoveryCache().cacheGroupAffinityNodes(info.getCacheDescriptor().groupId()).isEmpty())
+ U.quietAndWarn(log, "No server nodes found for cache client: " + info.getCacheDescriptor().cacheName());
}
}
@@ -924,28 +955,46 @@ private void processCacheStartRequests(
time = System.currentTimeMillis();
- Set<Integer> gprs = new HashSet<>();
+ initAffinityOnCacheGroupsStart(fut, exchActions, crd);
- for (ExchangeActions.CacheActionData action : exchActions.cacheStartRequests()) {
- int grpId = action.descriptor().groupId();
+ if (log.isInfoEnabled())
+ log.info("Affinity initialization for started caches performed in " + (System.currentTimeMillis() - time) + " ms.");
+ }
- if (gprs.add(grpId)) {
+ /**
+ * Initializes affinity for started cache groups received during {@code fut}.
+ *
+ * @param fut Exchange future.
+ * @param exchangeActions Exchange actions.
+ * @param crd {@code True} if local node is coordinator.
+ */
+ private void initAffinityOnCacheGroupsStart(
+ GridDhtPartitionsExchangeFuture fut,
+ ExchangeActions exchangeActions,
+ boolean crd
+ ) throws IgniteCheckedException {
+ List<CacheGroupDescriptor> startedGroups = exchangeActions.cacheStartRequests().stream()
+ .map(action -> action.descriptor().groupDescriptor())
+ .distinct()
+ .collect(Collectors.toList());
+
+ U.doInParallel(
+ cctx.kernalContext().getSystemExecutorService(),
+ startedGroups,
+ grpDesc -> {
if (crd)
- initStartedGroupOnCoordinator(fut, action.descriptor().groupDescriptor());
+ initStartedGroupOnCoordinator(fut, grpDesc);
else {
- CacheGroupContext grp = cctx.cache().cacheGroup(grpId);
+ CacheGroupContext grp = cctx.cache().cacheGroup(grpDesc.groupId());
- if (grp != null && !grp.isLocal() && grp.localStartVersion().equals(fut.initialVersion())) {
- assert grp.affinity().lastVersion().equals(AffinityTopologyVersion.NONE) : grp.affinity().lastVersion();
+ if (grp != null && !grp.isLocal() && grp.localStartVersion().equals(fut.initialVersion())) {
+ assert grp.affinity().lastVersion().equals(AffinityTopologyVersion.NONE) : grp.affinity().lastVersion();
initAffinity(cachesRegistry.group(grp.groupId()), grp.affinity(), fut);
}
}
}
- }
-
- if (log.isInfoEnabled())
- log.info("Affinity initialization for started caches performed in " + (System.currentTimeMillis() - time) + " ms.");
+ );
}
/**
@@ -954,7 +1003,7 @@ private void processCacheStartRequests(
* @param fut Exchange future.
* @param crd Coordinator flag.
* @param exchActions Cache change requests.
- * @param forceClose
+ * @param forceClose Force close flag.
* @return Set of cache groups to be stopped.
*/
private Set<Integer> processCacheStopRequests(
@@ -1011,9 +1060,11 @@ public void clearGroupHoldersAndRegistry() {
* @param crd Coordinator flag.
* @param msg Affinity change message.
*/
- public void onExchangeChangeAffinityMessage(GridDhtPartitionsExchangeFuture exchFut,
+ public void onExchangeChangeAffinityMessage(
+ GridDhtPartitionsExchangeFuture exchFut,
boolean crd,
- CacheAffinityChangeMessage msg) {
+ CacheAffinityChangeMessage msg
+ ) {
if (log.isDebugEnabled()) {
log.debug("Process exchange affinity change message [exchVer=" + exchFut.initialVersion() +
", msg=" + msg + ']');
@@ -1027,7 +1078,7 @@ public void onExchangeChangeAffinityMessage(GridDhtPartitionsExchangeFuture exch
assert assignment != null;
- final Map<Object, List<List<ClusterNode>>> affCache = new HashMap<>();
+ final Map<Object, List<List<ClusterNode>>> affCache = new ConcurrentHashMap<>();
forAllCacheGroups(crd, new IgniteInClosureX<GridAffinityAssignmentCache>() {
@Override public void applyx(GridAffinityAssignmentCache aff) throws IgniteCheckedException {
@@ -1061,10 +1112,11 @@ public void onExchangeChangeAffinityMessage(GridDhtPartitionsExchangeFuture exch
* @param msg Message.
* @throws IgniteCheckedException If failed.
*/
- public void onChangeAffinityMessage(final GridDhtPartitionsExchangeFuture exchFut,
+ public void onChangeAffinityMessage(
+ final GridDhtPartitionsExchangeFuture exchFut,
boolean crd,
- final CacheAffinityChangeMessage msg)
- throws IgniteCheckedException {
+ final CacheAffinityChangeMessage msg
+ ) {
assert msg.topologyVersion() != null && msg.exchangeId() == null : msg;
final AffinityTopologyVersion topVer = exchFut.initialVersion();
@@ -1080,7 +1132,7 @@ public void onChangeAffinityMessage(final GridDhtPartitionsExchangeFuture exchFu
final Map<Integer, IgniteUuid> deploymentIds = msg.cacheDeploymentIds();
- final Map<Object, List<List<ClusterNode>>> affCache = new HashMap<>();
+ final Map<Object, List<List<ClusterNode>>> affCache = new ConcurrentHashMap<>();
forAllCacheGroups(crd, new IgniteInClosureX<GridAffinityAssignmentCache>() {
@Override public void applyx(GridAffinityAssignmentCache aff) throws IgniteCheckedException {
@@ -1196,14 +1248,17 @@ private void processAffinityAssignmentResponse(UUID nodeId, GridDhtAffinityAssig
/**
* @param c Cache closure.
- * @throws IgniteCheckedException If failed
*/
- private void forAllRegisteredCacheGroups(IgniteInClosureX<CacheGroupDescriptor> c) throws IgniteCheckedException {
- for (CacheGroupDescriptor cacheDesc : cachesRegistry.allGroups().values()) {
- if (cacheDesc.config().getCacheMode() == LOCAL)
- continue;
+ private void forAllRegisteredCacheGroups(IgniteInClosureX<CacheGroupDescriptor> c) {
+ Collection<CacheGroupDescriptor> affinityCaches = cachesRegistry.allGroups().values().stream()
+ .filter(desc -> desc.config().getCacheMode() != LOCAL)
+ .collect(Collectors.toList());
- c.applyx(cacheDesc);
+ try {
+ U.doInParallel(cctx.kernalContext().getSystemExecutorService(), affinityCaches, c::applyx);
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException("Failed to execute affinity operation on cache groups", e);
}
}
@@ -1212,17 +1267,25 @@ private void forAllRegisteredCacheGroups(IgniteInClosureX<CacheGroupDescriptor>
* @param c Closure.
*/
private void forAllCacheGroups(boolean crd, IgniteInClosureX<GridAffinityAssignmentCache> c) {
+ Collection<GridAffinityAssignmentCache> affinityCaches;
+
if (crd) {
- for (CacheGroupHolder grp : grpHolders.values())
- c.apply(grp.affinity());
+ affinityCaches = grpHolders.values().stream()
+ .map(CacheGroupHolder::affinity)
+ .collect(Collectors.toList());
}
else {
- for (CacheGroupContext grp : cctx.kernalContext().cache().cacheGroups()) {
- if (grp.isLocal())
- continue;
-
- c.apply(grp.affinity());
- }
+ affinityCaches = cctx.kernalContext().cache().cacheGroups().stream()
+ .filter(grp -> !grp.isLocal())
+ .filter(grp -> !grp.isRecoveryMode())
+ .map(CacheGroupContext::affinity)
+ .collect(Collectors.toList());
+ }
+ try {
+ U.doInParallel(cctx.kernalContext().getSystemExecutorService(), affinityCaches, c::applyx);
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException("Failed to execute affinity operation on cache groups", e);
}
}
@@ -1384,11 +1447,14 @@ public GridAffinityAssignmentCache affinity(Integer grpId) {
* @param fut Current exchange future.
* @param msg Finish exchange message.
*/
- public void applyAffinityFromFullMessage(final GridDhtPartitionsExchangeFuture fut,
- final GridDhtPartitionsFullMessage msg) {
- final Map<Long, ClusterNode> nodesByOrder = new HashMap<>();
+ public void applyAffinityFromFullMessage(
+ final GridDhtPartitionsExchangeFuture fut,
+ final GridDhtPartitionsFullMessage msg
+ ) {
+ // Please do not use following pattern of code (nodesByOrder, affCache). NEVER.
+ final Map<Long, ClusterNode> nodesByOrder = new ConcurrentHashMap<>();
- final Map<Object, List<List<ClusterNode>>> affCache = new HashMap<>();
+ final Map<Object, List<List<ClusterNode>>> affCache = new ConcurrentHashMap<>();
long time = System.currentTimeMillis();
@@ -1435,13 +1501,13 @@ public void applyAffinityFromFullMessage(final GridDhtPartitionsExchangeFuture f
* @param msg Message finish message.
* @param resTopVer Result topology version.
*/
- public void onLocalJoin(final GridDhtPartitionsExchangeFuture fut,
+ public void onLocalJoin(
+ final GridDhtPartitionsExchangeFuture fut,
GridDhtPartitionsFullMessage msg,
- final AffinityTopologyVersion resTopVer) {
+ final AffinityTopologyVersion resTopVer
+ ) {
final Set<Integer> affReq = fut.context().groupsAffinityRequestOnJoin();
- final Map<Long, ClusterNode> nodesByOrder = new HashMap<>();
-
final Map<Integer, CacheGroupAffinityMessage> receivedAff = msg.joinedNodeAffinity();
assert F.isEmpty(affReq) || (!F.isEmpty(receivedAff) && receivedAff.size() >= affReq.size())
@@ -1450,6 +1516,8 @@ public void onLocalJoin(final GridDhtPartitionsExchangeFuture fut,
", receivedCnt=" + (receivedAff != null ? receivedAff.size() : "none") +
", msg=" + msg + "]");
+ final Map<Long, ClusterNode> nodesByOrder = new ConcurrentHashMap<>();
+
long time = System.currentTimeMillis();
forAllCacheGroups(false, new IgniteInClosureX<GridAffinityAssignmentCache>() {
@@ -1799,8 +1867,8 @@ private GridDhtAffinityAssignmentResponse fetchAffinity(
@Nullable ExchangeDiscoveryEvents events,
DiscoCache discoCache,
GridAffinityAssignmentCache affCache,
- GridDhtAssignmentFetchFuture fetchFut)
- throws IgniteCheckedException {
+ GridDhtAssignmentFetchFuture fetchFut
+ ) throws IgniteCheckedException {
assert affCache != null;
GridDhtAffinityAssignmentResponse res = fetchFut.get();
@@ -1882,7 +1950,7 @@ public boolean onCentralizedAffinityChange(final GridDhtPartitionsExchangeFuture
final GridDhtPartitionsExchangeFuture fut,
final boolean newAff
) throws IgniteCheckedException {
- final List<IgniteInternalFuture<AffinityTopologyVersion>> futs = new ArrayList<>();
+ final List<IgniteInternalFuture<AffinityTopologyVersion>> futs = Collections.synchronizedList(new ArrayList<>());
final AffinityTopologyVersion topVer = fut.initialVersion();
@@ -2039,31 +2107,30 @@ private CacheGroupHolder groupHolder(AffinityTopologyVersion topVer, final Cache
/**
* @param fut Current exchange future.
* @param crd Coordinator flag.
- * @throws IgniteCheckedException If failed.
* @return Rabalance info.
*/
- @Nullable private WaitRebalanceInfo initAffinityOnNodeJoin(final GridDhtPartitionsExchangeFuture fut, boolean crd)
- throws IgniteCheckedException {
+ @Nullable private WaitRebalanceInfo initAffinityOnNodeJoin(final GridDhtPartitionsExchangeFuture fut, boolean crd) {
final ExchangeDiscoveryEvents evts = fut.context().events();
- final Map<Object, List<List<ClusterNode>>> affCache = new HashMap<>();
+ final Map<Object, List<List<ClusterNode>>> affCache = new ConcurrentHashMap<>();
if (!crd) {
- for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
- if (grp.isLocal())
- continue;
+ forAllCacheGroups(false, new IgniteInClosureX<GridAffinityAssignmentCache>() {
+ @Override public void applyx(GridAffinityAssignmentCache grpAffCache) throws IgniteCheckedException {
+ CacheGroupContext grp = cctx.cache().cacheGroup(grpAffCache.groupId());
- boolean latePrimary = grp.rebalanceEnabled();
+ assert grp != null;
- initAffinityOnNodeJoin(evts,
- evts.nodeJoined(grp.receivedFrom()),
- grp.affinity(),
- null,
- latePrimary,
- affCache);
+ initAffinityOnNodeJoin(evts,
+ evts.nodeJoined(grp.receivedFrom()),
+ grp.affinity(),
+ null,
+ grp.rebalanceEnabled(),
+ affCache);
- cctx.exchange().exchangerUpdateHeartbeat();
- }
+ cctx.exchange().exchangerUpdateHeartbeat();
+ }
+ });
return null;
}
@@ -2107,6 +2174,9 @@ private CacheGroupHolder groupHolder(AffinityTopologyVersion topVer, final Cache
}
}
+ /**
+ * @param aff Affinity assignment.
+ */
private Map<UUID, GridDhtPartitionMap> affinityFullMap(AffinityAssignment aff) {
Map<UUID, GridDhtPartitionMap> map = new HashMap<>();
@@ -2272,7 +2342,7 @@ private void initAffinityOnNodeJoin(
try {
resFut.onDone(initAffinityBasedOnPartitionsAvailability(fut.initialVersion(), fut, NODE_TO_ID, false));
}
- catch (IgniteCheckedException e) {
+ catch (Exception e) {
resFut.onDone(e);
}
}
@@ -2292,14 +2362,15 @@ private void initAffinityOnNodeJoin(
* @param fut Exchange future.
* @param c Closure converting affinity diff.
* @param initAff {@code True} if need initialize affinity.
- * @return Affinity assignment.
- * @throws IgniteCheckedException If failed.
+ *
+ * @return Affinity assignment for each of registered cache group.
*/
- private <T> Map<Integer, Map<Integer, List<T>>> initAffinityBasedOnPartitionsAvailability(final AffinityTopologyVersion topVer,
+ private <T> Map<Integer, Map<Integer, List<T>>> initAffinityBasedOnPartitionsAvailability(
+ final AffinityTopologyVersion topVer,
final GridDhtPartitionsExchangeFuture fut,
final IgniteClosure<ClusterNode, T> c,
- final boolean initAff)
- throws IgniteCheckedException {
+ final boolean initAff
+ ) {
final boolean enforcedCentralizedAssignment =
DiscoveryCustomEvent.requiresCentralizedAffinityAssignment(fut.firstEvent());
@@ -2309,7 +2380,7 @@ private void initAffinityOnNodeJoin(
final Collection<ClusterNode> aliveNodes = fut.context().events().discoveryCache().serverNodes();
- final Map<Integer, Map<Integer, List<T>>> assignment = new HashMap<>();
+ final Map<Integer, Map<Integer, List<T>>> assignment = new ConcurrentHashMap<>();
forAllRegisteredCacheGroups(new IgniteInClosureX<CacheGroupDescriptor>() {
@Override public void applyx(CacheGroupDescriptor desc) throws IgniteCheckedException {
@@ -2705,13 +2776,13 @@ static CacheGroupHolder2 create(
private final AffinityTopologyVersion topVer;
/** */
- private Map<Integer, Map<Integer, UUID>> waitGrps;
+ private final Map<Integer, Map<Integer, UUID>> waitGrps = new ConcurrentHashMap<>();
/** */
- private Map<Integer, Map<Integer, List<ClusterNode>>> assignments;
+ private final Map<Integer, Map<Integer, List<ClusterNode>>> assignments = new ConcurrentHashMap<>();
/** */
- private Map<Integer, IgniteUuid> deploymentIds;
+ private final Map<Integer, IgniteUuid> deploymentIds = new ConcurrentHashMap<>();
/**
* @param topVer Topology version.
@@ -2724,14 +2795,15 @@ static CacheGroupHolder2 create(
* @return {@code True} if there are partitions waiting for rebalancing.
*/
boolean empty() {
- if (waitGrps != null) {
- assert !waitGrps.isEmpty();
+ boolean isEmpty = waitGrps.isEmpty();
+
+ if (!isEmpty) {
assert waitGrps.size() == assignments.size();
return false;
}
- return true;
+ return isEmpty;
}
/**
@@ -2743,28 +2815,11 @@ boolean empty() {
void add(Integer grpId, Integer part, UUID waitNode, List<ClusterNode> assignment) {
assert !F.isEmpty(assignment) : assignment;
- if (waitGrps == null) {
- waitGrps = new HashMap<>();
- assignments = new HashMap<>();
- deploymentIds = new HashMap<>();
- }
-
- Map<Integer, UUID> cacheWaitParts = waitGrps.get(grpId);
-
- if (cacheWaitParts == null) {
- waitGrps.put(grpId, cacheWaitParts = new HashMap<>());
-
- deploymentIds.put(grpId, cachesRegistry.group(grpId).deploymentId());
- }
-
- cacheWaitParts.put(part, waitNode);
-
- Map<Integer, List<ClusterNode>> cacheAssignment = assignments.get(grpId);
+ deploymentIds.putIfAbsent(grpId, cachesRegistry.group(grpId).deploymentId());
- if (cacheAssignment == null)
- assignments.put(grpId, cacheAssignment = new HashMap<>());
+ waitGrps.computeIfAbsent(grpId, k -> new HashMap<>()).put(part, waitNode);
- cacheAssignment.put(part, assignment);
+ assignments.computeIfAbsent(grpId, k -> new HashMap<>()).put(part, assignment);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
index 6d65d828fc29..9790f754a8d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolutionManager.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.processors.cache;
-import org.apache.ignite.internal.processors.cache.version.*;
+import org.apache.ignite.internal.processors.cache.version.CacheVersionConflictResolver;
/**
* Conflict resolver manager.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
index 614d7c06fbf5..968afd521264 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java
@@ -128,4 +128,4 @@ public void add(GridCacheEntryInfo info) {
@Override public byte fieldsCount() {
return 1;
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
index 61cbb9e04fb5..36312a159113 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicate.java
@@ -42,4 +42,4 @@
* @param locked Entry locked
*/
public void entryLocked(boolean locked);
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
index e41938997daa..62325323e1d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java
@@ -97,4 +97,4 @@
@Override public void onAckReceived() {
// No-op.
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java
index 76806a44f5cf..73a98b74ac0c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java
@@ -140,4 +140,4 @@ public CacheEntryPredicateContainsValue(CacheObject val) {
@Override public String toString() {
return S.toString(CacheEntryPredicateContainsValue.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java
index cac04357a581..210cc7059b21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java
@@ -28,4 +28,4 @@
@Override public boolean apply(GridCacheEntryEx e) {
return peekVisibleValue(e) != null;
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java
index 2790170e959e..4c8917fcc68b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java
@@ -28,4 +28,4 @@
@Override public boolean apply(GridCacheEntryEx e) {
return peekVisibleValue(e) == null;
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
index 9057e41fbfbf..257433636e6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java
@@ -156,4 +156,4 @@ public CacheEntryPredicate predicate() {
@Override public byte fieldsCount() {
return 1;
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
index 2717b1e03e22..96b85df2f072 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java
@@ -185,4 +185,4 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
@Override public byte fieldsCount() {
return 3;
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index a546a369f099..3c54cc760b09 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.affinity.AffinityFunction;
@@ -39,9 +40,9 @@
import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentRequest;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtAffinityAssignmentResponse;
+import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopologyImpl;
-import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader;
import org.apache.ignite.internal.processors.cache.persistence.DataRegion;
import org.apache.ignite.internal.processors.cache.persistence.GridCacheOffheapManager;
import org.apache.ignite.internal.processors.cache.persistence.freelist.FreeList;
@@ -78,13 +79,13 @@
private final int grpId;
/** Node ID cache group was received from. */
- private final UUID rcvdFrom;
+ private volatile UUID rcvdFrom;
/** Flag indicating that this cache group is in a recovery mode due to partitions loss. */
private boolean needsRecovery;
/** */
- private final AffinityTopologyVersion locStartVer;
+ private volatile AffinityTopologyVersion locStartVer;
/** */
private final CacheConfiguration<?, ?> ccfg;
@@ -93,7 +94,7 @@
private final GridCacheSharedContext ctx;
/** */
- private final boolean affNode;
+ private volatile boolean affNode;
/** */
private final CacheType cacheType;
@@ -117,16 +118,17 @@
private final IgniteLogger log;
/** */
- private GridAffinityAssignmentCache aff;
+ private volatile GridAffinityAssignmentCache aff;
/** */
- private GridDhtPartitionTopologyImpl top;
+ private volatile GridDhtPartitionTopologyImpl top;
/** */
- private IgniteCacheOffheapManager offheapMgr;
+ private volatile IgniteCacheOffheapManager offheapMgr;
/** */
- private GridCachePreloader preldr;
+ private volatile GridCachePreloader preldr;
+
/** */
private final DataRegion dataRegion;
@@ -160,6 +162,9 @@
/** */
private volatile boolean globalWalEnabled;
+ /** Flag indicates that cache group is under recovering and not attached to topology. */
+ private final AtomicBoolean recoveryMode;
+
/**
* @param ctx Context.
* @param grpId Group ID.
@@ -188,7 +193,8 @@
ReuseList reuseList,
AffinityTopologyVersion locStartVer,
boolean persistenceEnabled,
- boolean walEnabled
+ boolean walEnabled,
+ boolean recoveryMode
) {
assert ccfg != null;
assert dataRegion != null || !affNode;
@@ -208,8 +214,7 @@
this.globalWalEnabled = walEnabled;
this.persistenceEnabled = persistenceEnabled;
this.localWalEnabled = true;
-
- persistGlobalWalState(walEnabled);
+ this.recoveryMode = new AtomicBoolean(recoveryMode);
ioPlc = cacheType.ioPolicy();
@@ -715,9 +720,11 @@ public boolean sharedGroup() {
*
*/
public void onKernalStop() {
- aff.cancelFutures(new IgniteCheckedException("Failed to wait for topology update, node is stopping."));
+ if (!isRecoveryMode()) {
+ aff.cancelFutures(new IgniteCheckedException("Failed to wait for topology update, node is stopping."));
- preldr.onKernalStop();
+ preldr.onKernalStop();
+ }
offheapMgr.onKernalStop();
}
@@ -739,6 +746,11 @@ void stopCache(GridCacheContext cctx, boolean destroy) {
*
*/
void stopGroup() {
+ offheapMgr.stop();
+
+ if (isRecoveryMode())
+ return;
+
IgniteCheckedException err =
new IgniteCheckedException("Failed to wait for topology update, cache (or node) is stopping.");
@@ -748,11 +760,66 @@ void stopGroup() {
preldr.onKernalStop();
- offheapMgr.stop();
-
ctx.io().removeCacheGroupHandlers(grpId);
}
+ /**
+ * Finishes recovery for current cache group.
+ * Attaches topology version and initializes I/O.
+ *
+ * @param startVer Cache group start version.
+ * @param originalReceivedFrom UUID of node that was first who initiated cache group creating.
+ * This is needed to decide should node calculate affinity locally or fetch from other nodes.
+ * @param affinityNode Flag indicates, is local node affinity node or not. This may be calculated only after node joined to topology.
+ * @throws IgniteCheckedException If failed.
+ */
+ public void finishRecovery(
+ AffinityTopologyVersion startVer,
+ UUID originalReceivedFrom,
+ boolean affinityNode
+ ) throws IgniteCheckedException {
+ if (recoveryMode.compareAndSet(true, false)) {
+ affNode = affinityNode;
+
+ rcvdFrom = originalReceivedFrom;
+
+ locStartVer = startVer;
+
+ persistGlobalWalState(globalWalEnabled);
+
+ initializeIO();
+
+ ctx.affinity().onCacheGroupCreated(this);
+ }
+ }
+
+ /**
+ * @return {@code True} if current cache group is in recovery mode.
+ */
+ public boolean isRecoveryMode() {
+ return recoveryMode.get();
+ }
+
+ /**
+ * Initializes affinity and rebalance I/O handlers.
+ */
+ private void initializeIO() throws IgniteCheckedException {
+ assert !recoveryMode.get() : "Couldn't initialize I/O handlers, recovery mode is on for group " + this;
+
+ if (ccfg.getCacheMode() != LOCAL) {
+ if (!ctx.kernalContext().clientNode()) {
+ ctx.io().addCacheGroupHandler(groupId(), GridDhtAffinityAssignmentRequest.class,
+ (IgniteBiInClosure<UUID, GridDhtAffinityAssignmentRequest>) this::processAffinityAssignmentRequest);
+ }
+
+ preldr = new GridDhtPreloader(this);
+
+ preldr.start();
+ }
+ else
+ preldr = new GridCachePreloaderAdapter(this);
+ }
+
/**
* @return IDs of caches in this group.
*/
@@ -777,7 +844,7 @@ void stopGroup() {
/**
* @return {@code True} if group contains caches.
*/
- boolean hasCaches() {
+ public boolean hasCaches() {
List<GridCacheContext> caches = this.caches;
return !caches.isEmpty();
@@ -904,39 +971,25 @@ public void start() throws IgniteCheckedException {
ccfg.getCacheMode() == LOCAL,
persistenceEnabled());
- if (ccfg.getCacheMode() != LOCAL) {
+ if (ccfg.getCacheMode() != LOCAL)
top = new GridDhtPartitionTopologyImpl(ctx, this);
- if (!ctx.kernalContext().clientNode()) {
- ctx.io().addCacheGroupHandler(groupId(), GridDhtAffinityAssignmentRequest.class,
- new IgniteBiInClosure<UUID, GridDhtAffinityAssignmentRequest>() {
- @Override public void apply(UUID nodeId, GridDhtAffinityAssignmentRequest msg) {
- processAffinityAssignmentRequest(nodeId, msg);
- }
- });
- }
-
- preldr = new GridDhtPreloader(this);
-
- preldr.start();
+ try {
+ offheapMgr = persistenceEnabled
+ ? new GridCacheOffheapManager()
+ : new IgniteCacheOffheapManagerImpl();
}
- else
- preldr = new GridCachePreloaderAdapter(this);
-
- if (persistenceEnabled()) {
- try {
- offheapMgr = new GridCacheOffheapManager();
- }
- catch (Exception e) {
- throw new IgniteCheckedException("Failed to initialize offheap manager", e);
- }
+ catch (Exception e) {
+ throw new IgniteCheckedException("Failed to initialize offheap manager", e);
}
- else
- offheapMgr = new IgniteCacheOffheapManagerImpl();
offheapMgr.start(ctx, this);
- ctx.affinity().onCacheGroupCreated(this);
+ if (!isRecoveryMode()) {
+ initializeIO();
+
+ ctx.affinity().onCacheGroupCreated(this);
+ }
}
/**
@@ -950,8 +1003,7 @@ public boolean persistenceEnabled() {
* @param nodeId Node ID.
* @param req Request.
*/
- private void processAffinityAssignmentRequest(final UUID nodeId,
- final GridDhtAffinityAssignmentRequest req) {
+ private void processAffinityAssignmentRequest(UUID nodeId, GridDhtAffinityAssignmentRequest req) {
if (log.isDebugEnabled())
log.debug("Processing affinity assignment request [node=" + nodeId + ", req=" + req + ']');
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupDescriptor.java
index 70cdcc735af6..e72de28a0567 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupDescriptor.java
@@ -23,6 +23,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.UUID;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
@@ -311,4 +312,22 @@ public boolean persistenceEnabled() {
@Override public String toString() {
return S.toString(CacheGroupDescriptor.class, this, "cacheName", cacheCfg.getName());
}
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ CacheGroupDescriptor that = (CacheGroupDescriptor) o;
+
+ return grpId == that.grpId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return Objects.hash(grpId);
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
index 3b463afe8a25..3f880339eb88 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java
@@ -267,4 +267,4 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
@Override public String toString() {
return S.toString(CacheInvokeDirectResult.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java
index 3bc2a6dcb062..f9f384a7f970 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java
@@ -118,4 +118,4 @@
* @throws IgniteCheckedException If failed.
*/
public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException;
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
index 67ee410d06e2..c6d900250f6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java
@@ -247,4 +247,4 @@ else if (off >= headSize)
return true;
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java
index 57a70f83e504..de5a9191950c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java
@@ -191,4 +191,4 @@ public CacheObjectByteArrayImpl(byte[] val) {
@Override public String toString() {
return "CacheObjectByteArrayImpl [arrLen=" + (val != null ? val.length : 0) + ']';
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
index 2124a97940b9..b29c19e1e254 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
@@ -152,4 +152,4 @@ else if (kernalCtx.config().isPeerClassLoadingEnabled())
@Override public CacheObject prepareForCache(CacheObjectContext ctx) {
return this;
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
index c99eb006002e..8913634a3441 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GatewayProtectedCacheProxy.java
@@ -49,8 +49,8 @@
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.internal.AsyncSupportAdapter;
-import org.apache.ignite.internal.processors.cache.mvcc.MvccUtils;
import org.apache.ignite.internal.GridKernalState;
+import org.apache.ignite.internal.processors.cache.mvcc.MvccUtils;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.future.IgniteFutureImpl;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
@@ -1494,6 +1494,42 @@ public void setCacheManager(org.apache.ignite.cache.CacheManager cacheMgr) {
}
}
+ /** {@inheritDoc} */
+ @Override public void preloadPartition(int part) {
+ CacheOperationGate opGate = onEnter();
+
+ try {
+ delegate.preloadPartition(part);
+ }
+ finally {
+ onLeave(opGate);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteFuture<Void> preloadPartitionAsync(int part) {
+ CacheOperationGate opGate = onEnter();
+
+ try {
+ return delegate.preloadPartitionAsync(part);
+ }
+ finally {
+ onLeave(opGate);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean localPreloadPartition(int part) {
+ CacheOperationGate opGate = onEnter();
+
+ try {
+ return delegate.localPreloadPartition(part);
+ }
+ finally {
+ onLeave(opGate);
+ }
+ }
+
/**
* Safely get CacheGateway.
*
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 3156d6d662d1..a62c64cb7c18 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -87,9 +87,11 @@
import org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityImpl;
import org.apache.ignite.internal.processors.cache.distributed.IgniteExternalizableExpiryPolicy;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheAdapter;
-import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtInvalidPartitionException;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxLocalAdapter;
+import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtInvalidPartitionException;
+import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition;
+import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal;
import org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo;
import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot;
@@ -136,10 +138,13 @@
import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.lang.IgniteOutClosure;
import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lang.IgniteRunnable;
import org.apache.ignite.mxbean.CacheMetricsMXBean;
import org.apache.ignite.plugin.security.SecurityPermission;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.JobContextResource;
+import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
@@ -149,6 +154,7 @@
import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_RETRIES_COUNT;
import static org.apache.ignite.internal.GridClosureCallMode.BROADCAST;
import static org.apache.ignite.internal.processors.cache.CacheOperationContext.DFLT_ALLOW_ATOMIC_OPS_IN_TX;
+import static org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState.OWNING;
import static org.apache.ignite.internal.processors.dr.GridDrType.DR_LOAD;
import static org.apache.ignite.internal.processors.dr.GridDrType.DR_NONE;
import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER;
@@ -179,6 +185,9 @@
/** Maximum number of retries when topology changes. */
public static final int MAX_RETRIES = IgniteSystemProperties.getInteger(IGNITE_CACHE_RETRIES_COUNT, 100);
+ /** Minimum version supporting partition preloading. */
+ private static final IgniteProductVersion PRELOAD_PARTITION_SINCE = IgniteProductVersion.fromString("2.7.0");
+
/** Deserialization stash. */
private static final ThreadLocal<IgniteBiTuple<String, String>> stash = new ThreadLocal<IgniteBiTuple<String,
String>>() {
@@ -284,6 +293,9 @@
/** Asynchronous operations limit semaphore. */
private Semaphore asyncOpsSem;
+ /** {@code True} if attempted to use partition preloading on outdated node. */
+ private volatile boolean partPreloadBadVerWarned;
+
/** Active. */
private volatile boolean active;
@@ -1261,6 +1273,31 @@ private void clear(@Nullable Set<? extends K> keys) throws IgniteCheckedExceptio
return new GridFinishedFuture<>();
}
+ /**
+ * @param part Partition id.
+ * @return Future.
+ */
+ private IgniteInternalFuture<?> executePreloadTask(int part) throws IgniteCheckedException {
+ ClusterGroup grp = ctx.grid().cluster().forDataNodes(ctx.name());
+
+ @Nullable ClusterNode targetNode = ctx.affinity().primaryByPartition(part, ctx.topology().readyTopologyVersion());
+
+ if (targetNode == null || targetNode.version().compareTo(PRELOAD_PARTITION_SINCE) < 0) {
+ if (!partPreloadBadVerWarned) {
+ U.warn(log(), "Attempting to execute partition preloading task on outdated or not mapped node " +
+ "[targetNodeVer=" + (targetNode == null ? "NA" : targetNode.version()) +
+ ", minSupportedNodeVer=" + PRELOAD_PARTITION_SINCE + ']');
+
+ partPreloadBadVerWarned = true;
+ }
+
+ return new GridFinishedFuture<>();
+ }
+
+ return ctx.closures().affinityRun(Collections.singleton(name()), part,
+ new PartitionPreloadJob(ctx.name(), part), grp.nodes(), null);
+ }
+
/**
* @param keys Keys.
* @param readers Readers flag.
@@ -4961,6 +4998,55 @@ private void advance() {
return new CacheEntryImpl<>((K)key0, (V)val0, entry.version());
}
+ /** {@inheritDoc} */
+ @Override public void preloadPartition(int part) throws IgniteCheckedException {
+ if (isLocal())
+ ctx.offheap().preloadPartition(part);
+ else
+ executePreloadTask(part).get();
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteInternalFuture<?> preloadPartitionAsync(int part) throws IgniteCheckedException {
+ if (isLocal()) {
+ return ctx.kernalContext().closure().runLocalSafe(() -> {
+ try {
+ ctx.offheap().preloadPartition(part);
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
+ }
+ });
+ }
+ else
+ return executePreloadTask(part);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean localPreloadPartition(int part) throws IgniteCheckedException {
+ if (!ctx.affinityNode())
+ return false;
+
+ GridDhtPartitionTopology top = ctx.group().topology();
+
+ @Nullable GridDhtLocalPartition p = top.localPartition(part, top.readyTopologyVersion(), false);
+
+ if (p == null)
+ return false;
+
+ try {
+ if (!p.reserve() || p.state() != OWNING)
+ return false;
+
+ p.dataStore().preload();
+ }
+ finally {
+ p.release();
+ }
+
+ return true;
+ }
+
/**
*
*/
@@ -6691,6 +6777,52 @@ public ClearTask(String cacheName, AffinityTopologyVersion topVer, Set<? extends
}
}
+ /**
+ * Partition preload job.
+ */
+ @GridInternal
+ private static class PartitionPreloadJob implements IgniteRunnable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
+ @IgniteInstanceResource
+ private IgniteEx ignite;
+
+ /** */
+ @LoggerResource
+ private IgniteLogger log;
+
+ /** */
+ private final String name;
+
+ /** Cache name. */
+ private final int part;
+
+ /**
+ * @param name Name.
+ * @param part Partition.
+ */
+ public PartitionPreloadJob(String name, int part) {
+ this.name = name;
+ this.part = part;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void run() {
+ IgniteInternalCache cache = ignite.context().cache().cache(name);
+
+ try {
+ cache.context().offheap().preloadPartition(part);
+ }
+ catch (IgniteCheckedException e) {
+ log.error("Failed to preload the partition [cache=" + name + ", partition=" + part + ']', e);
+
+ throw new IgniteException(e);
+ }
+ }
+ }
+
/**
* Iterator implementation for KeySet.
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
index cf4344d9b74b..f811f6db9c92 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java
@@ -233,15 +233,25 @@ public Object affinityKey(Object key) {
* @return Affinity assignment.
*/
public AffinityAssignment assignment(AffinityTopologyVersion topVer) {
+ return assignment(topVer, cctx.shared().exchange().lastAffinityChangedTopologyVersion(topVer));
+ }
+
+ /**
+ * Get affinity assignment for the given topology version.
+ *
+ * @param topVer Topology version.
+ * @return Affinity assignment.
+ */
+ public AffinityAssignment assignment(AffinityTopologyVersion topVer, AffinityTopologyVersion lastAffChangedTopVer) {
if (cctx.isLocal())
- topVer = LOC_CACHE_TOP_VER;
+ topVer = lastAffChangedTopVer = LOC_CACHE_TOP_VER;
GridAffinityAssignmentCache aff0 = aff;
if (aff0 == null)
throw new IgniteException(FAILED_TO_FIND_CACHE_ERR_MSG + cctx.name());
- return aff0.cachedAffinity(topVer);
+ return aff0.cachedAffinity(topVer, lastAffChangedTopVer);
}
public MvccCoordinator mvccCoordinator(AffinityTopologyVersion topVer) {
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 7eea905966b6..ff430b6eeea9 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
@@ -226,7 +226,7 @@
private CacheWeakQueryIteratorsHolder<Map.Entry<K, V>> itHolder;
/** Affinity node. */
- private boolean affNode;
+ private volatile boolean affNode;
/** Conflict resolver. */
private CacheVersionConflictResolver conflictRslvr;
@@ -238,7 +238,7 @@
private CountDownLatch startLatch = new CountDownLatch(1);
/** Topology version when cache was started on local node. */
- private AffinityTopologyVersion locStartTopVer;
+ private volatile AffinityTopologyVersion locStartTopVer;
/** Dynamic cache deployment ID. */
private IgniteUuid dynamicDeploymentId;
@@ -271,7 +271,10 @@
private boolean readFromBackup = CacheConfiguration.DFLT_READ_FROM_BACKUP;
/** Local node's MAC address. */
- private String locMacs;
+ private volatile String locMacs;
+
+ /** Recovery mode flag. */
+ private volatile boolean recoveryMode;
/**
* Empty constructor required for {@link Externalizable}.
@@ -311,6 +314,7 @@ public GridCacheContext(
AffinityTopologyVersion locStartTopVer,
boolean affNode,
boolean updatesAllowed,
+ boolean recoveryMode,
/*
* Managers in starting order!
@@ -395,11 +399,45 @@ public GridCacheContext(
readFromBackup = cacheCfg.isReadFromBackup();
+ this.recoveryMode = recoveryMode;
+
+ assert kernalContext().recoveryMode() == recoveryMode;
+
+ if (!recoveryMode) {
+ locMacs = localNode().attribute(ATTR_MACS);
+
+ assert locMacs != null;
+ }
+ }
+
+ /**
+ * Called when cache was restored during recovery and node has joined to topology.
+ *
+ * @param topVer Cache topology join version.
+ * @param statisticsEnabled Flag indicates is statistics enabled or not for that cache.
+ * Value may be changed after node joined to topology.
+ */
+ public void finishRecovery(AffinityTopologyVersion topVer, boolean statisticsEnabled) {
+ assert recoveryMode : this;
+
+ recoveryMode = false;
+
+ locStartTopVer = topVer;
+
locMacs = localNode().attribute(ATTR_MACS);
+ this.statisticsEnabled = statisticsEnabled;
+
assert locMacs != null;
}
+ /**
+ * @return {@code True} if cache is in recovery mode.
+ */
+ public boolean isRecoveryMode() {
+ return recoveryMode;
+ }
+
/**
* @return Cache group ID.
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
index 3c5cf1e944ad..ef350160eb11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
@@ -372,6 +372,10 @@ public void addEvent(
public boolean isRecordable(int type) {
GridCacheContext cctx0 = cctx;
+ // Event recording is impossible in recovery mode.
+ if (cctx0 != null && cctx0.kernalContext().recoveryMode())
+ return false;
+
return cctx0 != null && cctx0.userCache() && cctx0.gridEvents().isRecordable(type)
&& !cctx0.config().isEventsDisabled();
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
index 09c143b0c0dd..bfdce35e86e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGroupIdMessage.java
@@ -50,7 +50,7 @@ public int groupId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 3;
+ return 4;
}
/** {@inheritDoc} */
@@ -68,7 +68,7 @@ public int groupId() {
}
switch (writer.state()) {
- case 2:
+ case 3:
if (!writer.writeInt("grpId", grpId))
return false;
@@ -90,7 +90,7 @@ public int groupId() {
return false;
switch (reader.state()) {
- case 2:
+ case 3:
grpId = reader.readInt("grpId");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
index 6c20bdd15bdd..e0944397ecf3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIdMessage.java
@@ -52,7 +52,7 @@ public void cacheId(int cacheId) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 3;
+ return 4;
}
/** {@inheritDoc} */
@@ -70,7 +70,7 @@ public void cacheId(int cacheId) {
}
switch (writer.state()) {
- case 2:
+ case 3:
if (!writer.writeInt("cacheId", cacheId))
return false;
@@ -92,7 +92,7 @@ public void cacheId(int cacheId) {
return false;
switch (reader.state()) {
- case 2:
+ case 3:
cacheId = reader.readInt("cacheId");
if (!reader.isLastRead())
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 2e66e5bfc3fe..23cd4ba1afec 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
@@ -165,6 +165,11 @@ public void dumpPendingMessages(StringBuilder sb) {
final GridCacheMessage cacheMsg = (GridCacheMessage)msg;
+ AffinityTopologyVersion rmtAffVer = cacheMsg.topologyVersion();
+ AffinityTopologyVersion lastAffChangedVer = cacheMsg.lastAffinityChangedTopologyVersion();
+
+ cctx.exchange().lastAffinityChangedTopologyVersion(rmtAffVer, lastAffChangedVer);
+
IgniteInternalFuture<?> fut = null;
if (cacheMsg.partitionExchangeMessage()) {
@@ -222,9 +227,8 @@ else if (desc.receivedFromStartVersion() != null)
}
else {
AffinityTopologyVersion locAffVer = cctx.exchange().readyAffinityVersion();
- AffinityTopologyVersion rmtAffVer = cacheMsg.topologyVersion();
- if (locAffVer.compareTo(rmtAffVer) < 0) {
+ if (locAffVer.compareTo(lastAffChangedVer) < 0) {
IgniteLogger log = cacheMsg.messageLogger(cctx);
if (log.isDebugEnabled()) {
@@ -234,12 +238,13 @@ else if (desc.receivedFromStartVersion() != null)
msg0.append(", locTopVer=").append(locAffVer).
append(", rmtTopVer=").append(rmtAffVer).
+ append(", lastAffChangedVer=").append(lastAffChangedVer).
append(']');
log.debug(msg0.toString());
}
- fut = cctx.exchange().affinityReadyFuture(rmtAffVer);
+ fut = cctx.exchange().affinityReadyFuture(lastAffChangedVer);
}
}
@@ -1155,6 +1160,8 @@ public boolean checkNodeLeft(UUID nodeId, IgniteCheckedException sndErr, boolean
public void send(ClusterNode node, GridCacheMessage msg, byte plc) throws IgniteCheckedException {
assert !node.isLocal() : node;
+ msg.lastAffinityChangedTopologyVersion(cctx.exchange().lastAffinityChangedTopologyVersion(msg.topologyVersion()));
+
if (!onSend(msg, node.id()))
return;
@@ -1222,6 +1229,8 @@ public void sendOrderedMessage(ClusterNode node, Object topic, GridCacheMessage
if (!onSend(msg, node.id()))
return;
+ msg.lastAffinityChangedTopologyVersion(cctx.exchange().lastAffinityChangedTopologyVersion(msg.topologyVersion()));
+
int cnt = 0;
while (cnt <= retryCnt) {
@@ -1278,6 +1287,8 @@ void sendNoRetry(ClusterNode node,
if (!onSend(msg, null))
return;
+ msg.lastAffinityChangedTopologyVersion(cctx.exchange().lastAffinityChangedTopologyVersion(msg.topologyVersion()));
+
try {
cctx.gridIO().sendToGridTopic(node, TOPIC_CACHE, msg, plc);
@@ -1340,22 +1351,22 @@ private void addHandler(
if (msgIdx != -1) {
Map<Integer, IgniteBiInClosure[]> idxClsHandlers0 = msgHandlers.idxClsHandlers;
- IgniteBiInClosure[] cacheClsHandlers = idxClsHandlers0.get(hndId);
+ IgniteBiInClosure[] cacheClsHandlers = idxClsHandlers0.compute(hndId, (key, clsHandlers) -> {
+ if (clsHandlers == null)
+ clsHandlers = new IgniteBiInClosure[GridCacheMessage.MAX_CACHE_MSG_LOOKUP_INDEX];
- if (cacheClsHandlers == null) {
- cacheClsHandlers = new IgniteBiInClosure[GridCacheMessage.MAX_CACHE_MSG_LOOKUP_INDEX];
+ if(clsHandlers[msgIdx] != null)
+ return null;
- idxClsHandlers0.put(hndId, cacheClsHandlers);
- }
+ clsHandlers[msgIdx] = c;
+
+ return clsHandlers;
+ });
- if (cacheClsHandlers[msgIdx] != null)
+ if (cacheClsHandlers == null)
throw new IgniteException("Duplicate cache message ID found [hndId=" + hndId +
", type=" + type + ']');
- cacheClsHandlers[msgIdx] = c;
-
- msgHandlers.idxClsHandlers = idxClsHandlers0;
-
return;
}
else {
@@ -1572,7 +1583,7 @@ else if (msg instanceof GridCacheGroupIdMessage)
*/
static class MessageHandlers {
/** Indexed class handlers. */
- volatile Map<Integer, IgniteBiInClosure[]> idxClsHandlers = new HashMap<>();
+ volatile Map<Integer, IgniteBiInClosure[]> idxClsHandlers = new ConcurrentHashMap<>();
/** Handler registry. */
ConcurrentMap<ListenerKey, IgniteBiInClosure<UUID, GridCacheMessage>>
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 2d788c86e206..19ee9d1cf0be 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -75,7 +75,6 @@
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersionedEntryEx;
import org.apache.ignite.internal.processors.dr.GridDrType;
import org.apache.ignite.internal.processors.query.IgniteSQLException;
@@ -222,7 +221,7 @@ protected GridCacheMapEntry(
this.cctx = cctx;
this.listenerLock = cctx.continuousQueries().getListenerReadLock();
- ver = GridCacheVersionManager.START_VER;
+ ver = cctx.shared().versions().startVersion();
}
/**
@@ -332,7 +331,7 @@ protected void value(@Nullable CacheObject val) {
* @return {@code True} if start version.
*/
public boolean isStartVersion() {
- return ver == GridCacheVersionManager.START_VER;
+ return cctx.shared().versions().isStartVersion(ver);
}
/** {@inheritDoc} */
@@ -1467,7 +1466,7 @@ else if (res.resultType() == ResultType.LOCKED) {
boolean internal = isInternal() || !context().userCache();
Map<UUID, CacheContinuousQueryListener> lsnrCol =
- notifyContinuousQueries(tx) ?
+ notifyContinuousQueries() ?
cctx.continuousQueries().updateListeners(internal, false) : null;
if (startVer && (retval || intercept || lsnrCol != null))
@@ -1700,7 +1699,7 @@ protected Object keyValue(boolean cpy) {
boolean internal = isInternal() || !context().userCache();
Map<UUID, CacheContinuousQueryListener> lsnrCol =
- notifyContinuousQueries(tx) ?
+ notifyContinuousQueries() ?
cctx.continuousQueries().updateListeners(internal, false) : null;
if (startVer && (retval || intercept || lsnrCol != null))
@@ -2908,11 +2907,6 @@ protected final boolean markObsolete0(GridCacheVersion ver, boolean clear, GridC
ver = newVer;
flags &= ~IS_EVICT_DISABLED;
- if (cctx.mvccEnabled())
- cctx.offheap().mvccRemoveAll(this);
- else
- removeValue();
-
onInvalidate();
return obsoleteVersionExtras() != null;
@@ -2959,13 +2953,10 @@ protected final void update(@Nullable CacheObject val, long expireTime, long ttl
}
/**
- * @param tx Transaction.
- * @return {@code True} if should notify continuous query manager.
+ * @return {@code True} if should notify continuous query manager on updates of this entry.
*/
- private boolean notifyContinuousQueries(@Nullable IgniteInternalTx tx) {
- return cctx.isLocal() ||
- cctx.isReplicated() ||
- (!isNear() && !(tx != null && tx.onePhaseCommit() && !tx.local()));
+ private boolean notifyContinuousQueries() {
+ return !isNear();
}
/**
@@ -3294,7 +3285,7 @@ protected final boolean hasValueUnlocked() {
GridCacheVersion currentVer = row != null ? row.version() : GridCacheMapEntry.this.ver;
- boolean isStartVer = currentVer == GridCacheVersionManager.START_VER;
+ boolean isStartVer = cctx.shared().versions().isStartVersion(currentVer);
if (cctx.group().persistenceEnabled()) {
if (!isStartVer) {
@@ -3422,7 +3413,7 @@ else if (deletedUnlocked())
expireTime,
partition(),
updateCntr,
- mvccVer
+ mvccVer == null ? MvccUtils.INITIAL_VERSION : mvccVer
)));
} else {
cctx.shared().wal().log(new DataRecord(new DataEntry(
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index 11916e92270f..f6c2e2eb9383 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -68,6 +68,10 @@
@GridToStringInclude
private GridDeploymentInfoBean depInfo;
+ /** */
+ @GridToStringInclude
+ private @Nullable AffinityTopologyVersion lastAffChangedTopVer;
+
/** */
@GridDirectTransient
protected boolean addDepInfo;
@@ -184,6 +188,27 @@ public AffinityTopologyVersion topologyVersion() {
return AffinityTopologyVersion.NONE;
}
+ /**
+ * Returns the earliest affinity topology version for which this message is valid.
+ *
+ * @return Last affinity topology version when affinity was modified.
+ */
+ public AffinityTopologyVersion lastAffinityChangedTopologyVersion() {
+ if (lastAffChangedTopVer == null || lastAffChangedTopVer.topologyVersion() <= 0)
+ return topologyVersion();
+
+ return lastAffChangedTopVer;
+ }
+
+ /**
+ * Sets the earliest affinity topology version for which this message is valid.
+ *
+ * @param topVer Last affinity topology version when affinity was modified.
+ */
+ public void lastAffinityChangedTopologyVersion(AffinityTopologyVersion topVer) {
+ lastAffChangedTopVer = topVer;
+ }
+
/**
* Deployment enabled flag indicates whether deployment info has to be added to this message.
*
@@ -637,7 +662,7 @@ public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 2;
+ return 3;
}
/** {@inheritDoc} */
@@ -659,6 +684,12 @@ public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
writer.incrementState();
case 1:
+ if (!writer.writeAffinityTopologyVersion("lastAffChangedTopVer", lastAffChangedTopVer))
+ return false;
+
+ writer.incrementState();
+
+ case 2:
if (!writer.writeLong("msgId", msgId))
return false;
@@ -686,6 +717,14 @@ public IgniteLogger messageLogger(GridCacheSharedContext ctx) {
reader.incrementState();
case 1:
+ lastAffChangedTopVer = reader.readAffinityTopologyVersion("lastAffChangedTopVer");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 2:
msgId = reader.readLong("msgId");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index eb8901065381..24b64d67ebf1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -35,6 +34,7 @@
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;
@@ -109,6 +109,7 @@
import org.apache.ignite.internal.util.typedef.CI2;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -133,6 +134,7 @@
import static org.apache.ignite.internal.GridTopic.TOPIC_CACHE;
import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
+import static org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion.NONE;
import static org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture.nextDumpTimeout;
import static org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader.DFLT_PRELOAD_RESEND_TIMEOUT;
@@ -175,19 +177,23 @@
@Nullable private volatile GridDhtPartitionsExchangeFuture lastInitializedFut;
/** */
- private final AtomicReference<GridDhtTopologyFuture> lastFinishedFut = new AtomicReference<>();
+ private final AtomicReference<GridDhtPartitionsExchangeFuture> lastFinishedFut = new AtomicReference<>();
/** */
private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts =
new ConcurrentSkipListMap<>();
+ /** */
+ private final ConcurrentNavigableMap<AffinityTopologyVersion, AffinityTopologyVersion> lastAffTopVers =
+ new ConcurrentSkipListMap<>();
+
/**
* Latest started rebalance topology version but possibly not finished yet. Value {@code NONE}
* means that previous rebalance is undefined and the new one should be initiated.
*
* Should not be used to determine latest rebalanced topology.
*/
- private volatile AffinityTopologyVersion rebTopVer = AffinityTopologyVersion.NONE;
+ private volatile AffinityTopologyVersion rebTopVer = NONE;
/** */
private GridFutureAdapter<?> reconnectExchangeFut;
@@ -893,11 +899,11 @@ public GridDhtPartitionsExchangeFuture lastTopologyFuture() {
/**
* @param fut Finished future.
*/
- public void lastFinishedFuture(GridDhtTopologyFuture fut) {
+ public void lastFinishedFuture(GridDhtPartitionsExchangeFuture fut) {
assert fut != null && fut.isDone() : fut;
while (true) {
- GridDhtTopologyFuture cur = lastFinishedFut.get();
+ GridDhtPartitionsExchangeFuture cur = lastFinishedFut.get();
if (fut.topologyVersion() != null && (cur == null || fut.topologyVersion().compareTo(cur.topologyVersion()) > 0)) {
if (lastFinishedFut.compareAndSet(cur, fut))
@@ -913,6 +919,17 @@ public void lastFinishedFuture(GridDhtTopologyFuture fut) {
* @return Future or {@code null} is future is already completed.
*/
@Nullable public IgniteInternalFuture<AffinityTopologyVersion> affinityReadyFuture(AffinityTopologyVersion ver) {
+ GridDhtPartitionsExchangeFuture lastInitializedFut0 = lastInitializedFut;
+
+ if (lastInitializedFut0 != null && lastInitializedFut0.initialVersion().compareTo(ver) == 0
+ && lastInitializedFut0.changedAffinity()) {
+ if (log.isTraceEnabled())
+ log.trace("Return lastInitializedFut for topology ready future " +
+ "[ver=" + ver + ", fut=" + lastInitializedFut0 + ']');
+
+ return lastInitializedFut0;
+ }
+
AffinityTopologyVersion topVer = exchFuts.readyTopVer();
if (topVer.compareTo(ver) >= 0) {
@@ -977,6 +994,48 @@ public boolean hasPendingExchange() {
return exchWorker.hasPendingExchange();
}
+ /**
+ *
+ * @param topVer Topology version.
+ * @return Last topology version before the provided one when affinity was modified.
+ */
+ public AffinityTopologyVersion lastAffinityChangedTopologyVersion(AffinityTopologyVersion topVer) {
+ if (topVer.topologyVersion() <= 0)
+ return topVer;
+
+ AffinityTopologyVersion lastAffTopVer = lastAffTopVers.get(topVer);
+
+ return lastAffTopVer != null ? lastAffTopVer : topVer;
+ }
+
+ /**
+ *
+ * @param topVer Topology version.
+ * @param lastAffTopVer Last topology version before the provided one when affinity was modified.
+ * @return {@code True} if data was modified.
+ */
+ public boolean lastAffinityChangedTopologyVersion(AffinityTopologyVersion topVer, AffinityTopologyVersion lastAffTopVer) {
+ assert lastAffTopVer.compareTo(topVer) <= 0;
+
+ if (lastAffTopVer.topologyVersion() <= 0 || lastAffTopVer.equals(topVer))
+ return false;
+
+ while (true) {
+ AffinityTopologyVersion old = lastAffTopVers.putIfAbsent(topVer, lastAffTopVer);
+
+ if (old == null)
+ return true;
+
+ if (lastAffTopVer.compareTo(old) < 0) {
+ if (lastAffTopVers.replace(topVer, old, lastAffTopVer))
+ return true;
+ }
+ else
+ return false;
+ }
+
+ }
+
/**
* @param evt Discovery event.
* @return Affinity topology version.
@@ -1028,11 +1087,13 @@ public void scheduleResendPartitions() {
}
/**
- * Partition refresh callback.
+ * Partition refresh callback for selected cache groups.
* For coordinator causes {@link GridDhtPartitionsFullMessage FullMessages} send,
* for non coordinator - {@link GridDhtPartitionsSingleMessage SingleMessages} send
+ *
+ * @param grps Cache groups for partitions refresh.
*/
- public void refreshPartitions() {
+ public void refreshPartitions(@NotNull Collection<CacheGroupContext> grps) {
// TODO https://issues.apache.org/jira/browse/IGNITE-6857
if (cctx.snapshot().snapshotOperationInProgress()) {
scheduleResendPartitions();
@@ -1040,7 +1101,14 @@ public void refreshPartitions() {
return;
}
- ClusterNode oldest = cctx.discovery().oldestAliveServerNode(AffinityTopologyVersion.NONE);
+ if (grps.isEmpty()) {
+ if (log.isDebugEnabled())
+ log.debug("Skip partitions refresh, there are no cache groups for partition refresh.");
+
+ return;
+ }
+
+ ClusterNode oldest = cctx.discovery().oldestAliveServerNode(NONE);
if (oldest == null) {
if (log.isDebugEnabled())
@@ -1049,8 +1117,10 @@ public void refreshPartitions() {
return;
}
- if (log.isDebugEnabled())
- log.debug("Refreshing partitions [oldest=" + oldest.id() + ", loc=" + cctx.localNodeId() + ']');
+ if (log.isDebugEnabled()) {
+ log.debug("Refreshing partitions [oldest=" + oldest.id() + ", loc=" + cctx.localNodeId() +
+ ", cacheGroups= " + grps + ']');
+ }
// If this is the oldest node.
if (oldest.id().equals(cctx.localNodeId())) {
@@ -1068,50 +1138,66 @@ public void refreshPartitions() {
// No need to send to nodes which did not finish their first exchange.
AffinityTopologyVersion rmtTopVer =
- lastFut != null ? (lastFut.isDone() ? lastFut.topologyVersion() : lastFut.initialVersion()) : AffinityTopologyVersion.NONE;
+ lastFut != null ?
+ (lastFut.isDone() ? lastFut.topologyVersion() : lastFut.initialVersion())
+ : AffinityTopologyVersion.NONE;
Collection<ClusterNode> rmts = cctx.discovery().remoteAliveNodesWithCaches(rmtTopVer);
if (log.isDebugEnabled())
log.debug("Refreshing partitions from oldest node: " + cctx.localNodeId());
- sendAllPartitions(rmts, rmtTopVer);
+ sendAllPartitions(rmts, rmtTopVer, grps);
}
else {
if (log.isDebugEnabled())
log.debug("Refreshing local partitions from non-oldest node: " +
cctx.localNodeId());
- sendLocalPartitions(oldest, null);
+ sendLocalPartitions(oldest, null, grps);
}
}
+ /**
+ * Partition refresh callback.
+ * For coordinator causes {@link GridDhtPartitionsFullMessage FullMessages} send,
+ * for non coordinator - {@link GridDhtPartitionsSingleMessage SingleMessages} send
+ */
+ public void refreshPartitions() { refreshPartitions(cctx.cache().cacheGroups()); }
+
/**
* @param nodes Nodes.
* @param msgTopVer Topology version. Will be added to full message.
+ * @param grps Selected cache groups.
*/
private void sendAllPartitions(
Collection<ClusterNode> nodes,
- AffinityTopologyVersion msgTopVer
+ AffinityTopologyVersion msgTopVer,
+ Collection<CacheGroupContext> grps
) {
long time = System.currentTimeMillis();
- GridDhtPartitionsFullMessage m = createPartitionsFullMessage(true, false, null, null, null, null);
+ GridDhtPartitionsFullMessage m = createPartitionsFullMessage(true, false, null, null, null, null, grps);
m.topologyVersion(msgTopVer);
if (log.isInfoEnabled()) {
long latency = System.currentTimeMillis() - time;
- if (latency > 100 || log.isDebugEnabled())
- log.info("Full Message creating for " + msgTopVer + " performed in " + latency + " ms.");
+ if (latency > 50 || log.isDebugEnabled()) {
+ log.info("Finished full message creation [msgTopVer=" + msgTopVer + ", groups=" + grps +
+ ", latency=" + latency + "ms]");
+ }
}
if (log.isTraceEnabled())
- log.trace("Sending all partitions [nodeIds=" + U.nodeIds(nodes) + ", msg=" + m + ']');
+ log.trace("Sending all partitions [nodeIds=" + U.nodeIds(nodes) + ", cacheGroups=" + grps +
+ ", msg=" + m + ']');
time = System.currentTimeMillis();
+ Collection<ClusterNode> failedNodes = U.newHashSet(nodes.size());
+
for (ClusterNode node : nodes) {
try {
assert !node.equals(cctx.localNode());
@@ -1119,22 +1205,34 @@ private void sendAllPartitions(
cctx.io().sendNoRetry(node, m, SYSTEM_POOL);
}
catch (ClusterTopologyCheckedException ignore) {
- if (log.isDebugEnabled())
- log.debug("Failed to send partition update to node because it left grid (will ignore) [node=" +
- node.id() + ", msg=" + m + ']');
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to send partition update to node because it left grid (will ignore) " +
+ "[node=" + node.id() + ", msg=" + m + ']');
+ }
}
catch (IgniteCheckedException e) {
- U.warn(log, "Failed to send partitions full message [node=" + node + ", err=" + e + ']');
+ failedNodes.add(node);
+
+ U.warn(log, "Failed to send partitions full message [node=" + node + ", err=" + e + ']', e);
}
}
- if (log.isInfoEnabled())
- log.info("Sending Full Message for " + msgTopVer + " performed in " + (System.currentTimeMillis() - time) + " ms.");
+ if (log.isInfoEnabled()) {
+ long latency = System.currentTimeMillis() - time;
+
+ if (latency > 50 || log.isDebugEnabled()) {
+ log.info("Finished sending full message [msgTopVer=" + msgTopVer + ", groups=" + grps +
+ (failedNodes.isEmpty() ? "" : (", skipped=" + U.nodeIds(failedNodes))) +
+ ", latency=" + latency + "ms]");
+ }
+ }
}
/**
+ * Creates partitions full message for all cache groups.
+ *
* @param compress {@code True} if possible to compress message (properly work only if prepareMarshall/
- * finishUnmarshall methods are called).
+ * finishUnmarshall methods are called).
* @param newCntrMap {@code True} if possible to use {@link CachePartitionFullCountersMap}.
* @param exchId Non-null exchange ID if message is created for exchange.
* @param lastVer Last version.
@@ -1150,18 +1248,43 @@ public GridDhtPartitionsFullMessage createPartitionsFullMessage(
@Nullable IgniteDhtPartitionHistorySuppliersMap partHistSuppliers,
@Nullable IgniteDhtPartitionsToReloadMap partsToReload
) {
- final GridDhtPartitionsFullMessage m = new GridDhtPartitionsFullMessage(exchId,
- lastVer,
- exchId != null ? exchId.topologyVersion() : AffinityTopologyVersion.NONE,
- partHistSuppliers,
- partsToReload
- );
+ Collection<CacheGroupContext> grps = cctx.cache().cacheGroups();
+
+ return createPartitionsFullMessage(compress, newCntrMap, exchId, lastVer, partHistSuppliers, partsToReload, grps);
+ }
+
+ /**
+ * Creates partitions full message for selected cache groups.
+ *
+ * @param compress {@code True} if possible to compress message (properly work only if prepareMarshall/
+ * finishUnmarshall methods are called).
+ * @param newCntrMap {@code True} if possible to use {@link CachePartitionFullCountersMap}.
+ * @param exchId Non-null exchange ID if message is created for exchange.
+ * @param lastVer Last version.
+ * @param partHistSuppliers Partition history suppliers map.
+ * @param partsToReload Partitions to reload map.
+ * @param grps Selected cache groups.
+ * @return Message.
+ */
+ public GridDhtPartitionsFullMessage createPartitionsFullMessage(
+ boolean compress,
+ boolean newCntrMap,
+ @Nullable final GridDhtPartitionExchangeId exchId,
+ @Nullable GridCacheVersion lastVer,
+ @Nullable IgniteDhtPartitionHistorySuppliersMap partHistSuppliers,
+ @Nullable IgniteDhtPartitionsToReloadMap partsToReload,
+ Collection<CacheGroupContext> grps
+ ) {
+ AffinityTopologyVersion ver = exchId != null ? exchId.topologyVersion() : AffinityTopologyVersion.NONE;
+
+ final GridDhtPartitionsFullMessage m =
+ new GridDhtPartitionsFullMessage(exchId, lastVer, ver, partHistSuppliers, partsToReload);
m.compress(compress);
final Map<Object, T2<Integer, GridDhtPartitionFullMap>> dupData = new HashMap<>();
- for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
+ for (CacheGroupContext grp : grps) {
if (!grp.isLocal()) {
if (exchId != null) {
AffinityTopologyVersion startTopVer = grp.localStartVersion();
@@ -1174,14 +1297,8 @@ public GridDhtPartitionsFullMessage createPartitionsFullMessage(
GridDhtPartitionFullMap locMap = grp.topology().partitionMap(true);
- if (locMap != null) {
- addFullPartitionsMap(m,
- dupData,
- compress,
- grp.groupId(),
- locMap,
- affCache.similarAffinityKey());
- }
+ if (locMap != null)
+ addFullPartitionsMap(m, dupData, compress, grp.groupId(), locMap, affCache.similarAffinityKey());
m.addPartitionSizes(grp.groupId(), grp.topology().globalPartSizes());
@@ -1202,14 +1319,8 @@ public GridDhtPartitionsFullMessage createPartitionsFullMessage(
for (GridClientPartitionTopology top : cctx.exchange().clientTopologies()) {
GridDhtPartitionFullMap map = top.partitionMap(true);
- if (map != null) {
- addFullPartitionsMap(m,
- dupData,
- compress,
- top.groupId(),
- map,
- top.similarAffinityKey());
- }
+ if (map != null)
+ addFullPartitionsMap(m, dupData, compress, top.groupId(), map, top.similarAffinityKey());
if (exchId != null) {
CachePartitionFullCountersMap cntrsMap = top.fullUpdateCounters();
@@ -1269,13 +1380,15 @@ private void addFullPartitionsMap(GridDhtPartitionsFullMessage m,
/**
* @param node Destination cluster node.
* @param id Exchange ID.
+ * @param grps Cache groups for send partitions.
*/
- private void sendLocalPartitions(ClusterNode node, @Nullable GridDhtPartitionExchangeId id) {
- GridDhtPartitionsSingleMessage m = createPartitionsSingleMessage(id,
- cctx.kernalContext().clientNode(),
- false,
- false,
- null);
+ private void sendLocalPartitions(
+ ClusterNode node,
+ @Nullable GridDhtPartitionExchangeId id,
+ @NotNull Collection<CacheGroupContext> grps
+ ) {
+ GridDhtPartitionsSingleMessage m =
+ createPartitionsSingleMessage(id, cctx.kernalContext().clientNode(), false, false, null, grps);
if (log.isTraceEnabled())
log.trace("Sending local partitions [nodeId=" + node.id() + ", msg=" + m + ']');
@@ -1294,6 +1407,8 @@ private void sendLocalPartitions(ClusterNode node, @Nullable GridDhtPartitionExc
}
/**
+ * Creates partitions single message for all cache groups.
+ *
* @param exchangeId Exchange ID.
* @param clientOnlyExchange Client exchange flag.
* @param sndCounters {@code True} if need send partition update counters.
@@ -1306,6 +1421,29 @@ public GridDhtPartitionsSingleMessage createPartitionsSingleMessage(
boolean sndCounters,
boolean newCntrMap,
ExchangeActions exchActions
+ ) {
+ Collection<CacheGroupContext> grps = cctx.cache().cacheGroups();
+
+ return createPartitionsSingleMessage(exchangeId, clientOnlyExchange, sndCounters, newCntrMap, exchActions, grps);
+ }
+
+ /**
+ * Creates partitions single message for selected cache groups.
+ *
+ * @param exchangeId Exchange ID.
+ * @param clientOnlyExchange Client exchange flag.
+ * @param sndCounters {@code True} if need send partition update counters.
+ * @param newCntrMap {@code True} if possible to use {@link CachePartitionPartialCountersMap}.
+ * @param grps Selected cache groups.
+ * @return Message.
+ */
+ public GridDhtPartitionsSingleMessage createPartitionsSingleMessage(
+ @Nullable GridDhtPartitionExchangeId exchangeId,
+ boolean clientOnlyExchange,
+ boolean sndCounters,
+ boolean newCntrMap,
+ ExchangeActions exchActions,
+ Collection<CacheGroupContext> grps
) {
GridDhtPartitionsSingleMessage m = new GridDhtPartitionsSingleMessage(exchangeId,
clientOnlyExchange,
@@ -1314,7 +1452,7 @@ public GridDhtPartitionsSingleMessage createPartitionsSingleMessage(
Map<Object, T2<Integer, GridPartitionStateMap>> dupData = new HashMap<>();
- for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
+ for (CacheGroupContext grp : grps) {
if (!grp.isLocal() && (exchActions == null || !exchActions.cacheGroupStopping(grp.groupId()))) {
GridDhtPartitionMap locMap = grp.topology().localPartitionMap();
@@ -1463,30 +1601,10 @@ public void onExchangeDone(AffinityTopologyVersion topVer, AffinityTopologyVersi
if (log.isDebugEnabled())
log.debug("Exchange done [topVer=" + topVer + ", err=" + err + ']');
- if (err == null) {
+ if (err == null)
exchFuts.readyTopVer(topVer);
- for (Map.Entry<AffinityTopologyVersion, AffinityReadyFuture> entry : readyFuts.entrySet()) {
- if (entry.getKey().compareTo(topVer) <= 0) {
- if (log.isDebugEnabled())
- log.debug("Completing created topology ready future " +
- "[ver=" + topVer + ", fut=" + entry.getValue() + ']');
-
- entry.getValue().onDone(topVer);
- }
- }
- }
- else {
- for (Map.Entry<AffinityTopologyVersion, AffinityReadyFuture> entry : readyFuts.entrySet()) {
- if (entry.getKey().compareTo(initTopVer) <= 0) {
- if (log.isDebugEnabled())
- log.debug("Completing created topology ready future with error " +
- "[ver=" + entry.getKey() + ", fut=" + entry.getValue() + ']');
-
- entry.getValue().onDone(err);
- }
- }
- }
+ completeAffReadyFuts(err == null ? topVer : initTopVer, err);
ExchangeFutureSet exchFuts0 = exchFuts;
@@ -1505,6 +1623,28 @@ public void onExchangeDone(AffinityTopologyVersion topVer, AffinityTopologyVersi
}
}
+ /** */
+ private void completeAffReadyFuts(AffinityTopologyVersion topVer, @Nullable Throwable err) {
+ for (Map.Entry<AffinityTopologyVersion, AffinityReadyFuture> entry : readyFuts.entrySet()) {
+ if (entry.getKey().compareTo(topVer) <= 0) {
+ if (err == null) {
+ if (log.isDebugEnabled())
+ log.debug("Completing created topology ready future " +
+ "[ver=" + topVer + ", fut=" + entry.getValue() + ']');
+
+ entry.getValue().onDone(topVer);
+ }
+ else {
+ if (log.isDebugEnabled())
+ log.debug("Completing created topology ready future with error " +
+ "[ver=" + entry.getKey() + ", fut=" + entry.getValue() + ']');
+
+ entry.getValue().onDone(err);
+ }
+ }
+ }
+ }
+
/**
* @param fut Future.
* @return {@code True} if added.
@@ -2139,6 +2279,13 @@ public boolean mergeExchangesOnCoordinator(GridDhtPartitionsExchangeFuture curFu
break;
}
+ if (!fut.changedAffinity()) {
+ if (log.isInfoEnabled())
+ log.info("Stop merge, no-affinity exchange found: " + evt);
+
+ break;
+ }
+
ClusterNode node = evt.eventNode();
if ((evt.type() == EVT_NODE_FAILED || evt.type() == EVT_NODE_LEFT) &&
@@ -2311,6 +2458,38 @@ private boolean exchangeInProgress() {
return false;
}
+ /** */
+ public boolean affinityChanged(AffinityTopologyVersion from, AffinityTopologyVersion to) {
+ if (lastAffinityChangedTopologyVersion(to).compareTo(from) >= 0)
+ return false;
+
+ Collection<GridDhtPartitionsExchangeFuture> history = exchFuts.values();
+
+ boolean fromFound = false;
+
+ for (GridDhtPartitionsExchangeFuture fut : history) {
+ if (!fromFound) {
+ int cmp = fut.initialVersion().compareTo(from);
+
+ if (cmp > 0) // We don't have history, so return true for safety
+ return true;
+ else if (cmp == 0)
+ fromFound = true;
+ else if (fut.isDone() && fut.topologyVersion().compareTo(from) >= 0)
+ return true; // Temporary solution for merge exchange case
+ }
+ else {
+ if (fut.changedAffinity())
+ return true;
+
+ if (fut.initialVersion().compareTo(to) >= 0)
+ return false;
+ }
+ }
+
+ return true;
+ }
+
/**
* Exchange future thread. All exchanges happen only by one thread and next
* exchange will not start until previous one completes.
@@ -2543,7 +2722,8 @@ void dumpExchangeDebugInfo() {
err = e;
}
catch (Throwable e) {
- err = e;
+ if (!(stop && X.hasCause(e, IgniteInterruptedCheckedException.class)))
+ err = e;
}
finally {
if (err == null && !stop && !reconnectNeeded)
@@ -2664,6 +2844,20 @@ else if (task instanceof ForceRebalanceExchangeTask) {
crd = newCrd = !srvNodes.isEmpty() && srvNodes.get(0).isLocal();
}
+ if (!exchFut.changedAffinity()) {
+ GridDhtPartitionsExchangeFuture lastFut = lastFinishedFut.get();
+
+ if (lastFut != null) {
+ if (!lastFut.changedAffinity()) {
+ AffinityTopologyVersion lastAffVer = cctx.exchange().lastAffinityChangedTopologyVersion(lastFut.initialVersion());
+
+ cctx.exchange().lastAffinityChangedTopologyVersion(exchFut.initialVersion(), lastAffVer);
+ }
+ else
+ cctx.exchange().lastAffinityChangedTopologyVersion(exchFut.initialVersion(), lastFut.initialVersion());
+ }
+ }
+
exchFut.init(newCrd);
int dumpCnt = 0;
@@ -2757,7 +2951,7 @@ else if (task instanceof ForceRebalanceExchangeTask) {
continue;
if (grp.preloader().rebalanceRequired(rebTopVer, exchFut))
- rebTopVer = AffinityTopologyVersion.NONE;
+ rebTopVer = NONE;
changed |= grp.topology().afterExchange(exchFut);
}
@@ -2768,9 +2962,9 @@ else if (task instanceof ForceRebalanceExchangeTask) {
// Schedule rebalance if force rebalance or force reassign occurs.
if (exchFut == null)
- rebTopVer = AffinityTopologyVersion.NONE;
+ rebTopVer = NONE;
- if (!cctx.kernalContext().clientNode() && rebTopVer.equals(AffinityTopologyVersion.NONE)) {
+ if (!cctx.kernalContext().clientNode() && rebTopVer.equals(NONE)) {
assignsMap = new HashMap<>();
IgniteCacheSnapshotManager snp = cctx.snapshot();
@@ -2801,7 +2995,7 @@ else if (task instanceof ForceRebalanceExchangeTask) {
busy = false;
}
- if (assignsMap != null && rebTopVer.equals(AffinityTopologyVersion.NONE)) {
+ if (assignsMap != null && rebTopVer.equals(NONE)) {
int size = assignsMap.size();
NavigableMap<Integer, List<Integer>> orderMap = new TreeMap<>();
@@ -2984,7 +3178,7 @@ public boolean started() {
/** */
private final AtomicReference<AffinityTopologyVersion> readyTopVer =
- new AtomicReference<>(AffinityTopologyVersion.NONE);
+ new AtomicReference<>(NONE);
/**
* Creates ordered, not strict list set.
@@ -2992,20 +3186,15 @@ public boolean started() {
* @param histSize Max history size.
*/
private ExchangeFutureSet(int histSize) {
- super(new Comparator<GridDhtPartitionsExchangeFuture>() {
- @Override public int compare(
- GridDhtPartitionsExchangeFuture f1,
- GridDhtPartitionsExchangeFuture f2
- ) {
- AffinityTopologyVersion t1 = f1.exchangeId().topologyVersion();
- AffinityTopologyVersion t2 = f2.exchangeId().topologyVersion();
-
- assert t1.topologyVersion() > 0;
- assert t2.topologyVersion() > 0;
-
- // Reverse order.
- return t2.compareTo(t1);
- }
+ super((f1, f2) -> {
+ AffinityTopologyVersion t1 = f1.exchangeId().topologyVersion();
+ AffinityTopologyVersion t2 = f2.exchangeId().topologyVersion();
+
+ assert t1.topologyVersion() > 0;
+ assert t2.topologyVersion() > 0;
+
+ // Reverse order.
+ return t2.compareTo(t1);
}, /*not strict*/false);
this.histSize = histSize;
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 ec88a938893c..9864b83f8d7f 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
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache;
+import javax.management.MBeanServer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -68,6 +69,7 @@
import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
import org.apache.ignite.internal.IgniteComponentType;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.IgniteNodeAttributes;
import org.apache.ignite.internal.IgniteTransactionsEx;
import org.apache.ignite.internal.binary.BinaryContext;
@@ -98,6 +100,7 @@
import org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache;
import org.apache.ignite.internal.processors.cache.mvcc.MvccCachingManager;
import org.apache.ignite.internal.processors.cache.persistence.DataRegion;
+import org.apache.ignite.internal.processors.cache.persistence.DatabaseLifecycleListener;
import org.apache.ignite.internal.processors.cache.persistence.DbCheckpointListener;
import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager;
import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager;
@@ -105,7 +108,8 @@
import org.apache.ignite.internal.processors.cache.persistence.freelist.FreeList;
import org.apache.ignite.internal.processors.cache.persistence.metastorage.MetastorageLifecycleListener;
import org.apache.ignite.internal.processors.cache.persistence.metastorage.ReadOnlyMetastorage;
-import org.apache.ignite.internal.processors.cache.persistence.metastorage.ReadWriteMetastorage;
+import org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
+import org.apache.ignite.internal.processors.cache.persistence.partstate.PartitionRecoverState;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteCacheSnapshotManager;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotDiscoveryMessage;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
@@ -136,15 +140,16 @@
import org.apache.ignite.internal.processors.timeout.GridTimeoutObject;
import org.apache.ignite.internal.suggestions.GridPerformanceSuggestions;
import org.apache.ignite.internal.util.F0;
+import org.apache.ignite.internal.util.InitializationProtector;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.lang.GridPlainClosure;
import org.apache.ignite.internal.util.lang.IgniteOutClosureX;
+import org.apache.ignite.internal.util.lang.IgniteThrowableConsumer;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.CIX1;
import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.CU;
@@ -193,12 +198,13 @@
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_TX_CONFIG;
import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isNearEnabled;
import static org.apache.ignite.internal.processors.cache.GridCacheUtils.isPersistentCache;
+import static org.apache.ignite.internal.util.IgniteUtils.doInParallel;
/**
* Cache processor.
*/
@SuppressWarnings({"unchecked", "TypeMayBeWeakened", "deprecation"})
-public class GridCacheProcessor extends GridProcessorAdapter implements MetastorageLifecycleListener {
+public class GridCacheProcessor extends GridProcessorAdapter {
/** Template of message of conflicts during configuration merge*/
private static final String MERGE_OF_CONFIG_CONFLICTS_MESSAGE =
"Conflicts during configuration merge for cache '%s' : \n%s";
@@ -214,6 +220,10 @@
private final boolean walFsyncWithDedicatedWorker =
IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_WAL_FSYNC_WITH_DEDICATED_WORKER, false);
+ /** Enables start caches in parallel. */
+ private final boolean IGNITE_ALLOW_START_CACHES_IN_PARALLEL =
+ IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_ALLOW_START_CACHES_IN_PARALLEL, true);
+
/** Shared cache context. */
private GridCacheSharedContext<?, ?> sharedCtx;
@@ -266,6 +276,12 @@
/** MBean group for cache group metrics */
private final String CACHE_GRP_METRICS_MBEAN_GRP = "Cache groups";
+ /** Protector of initialization of specific value. */
+ private final InitializationProtector initializationProtector = new InitializationProtector();
+
+ /** Cache recovery lifecycle state and actions. */
+ private final CacheRecoveryLifecycle recovery = new CacheRecoveryLifecycle();
+
/**
* @param ctx Kernal context.
*/
@@ -732,41 +748,34 @@ private void cleanup(CacheConfiguration cfg, @Nullable Object rsrc, boolean near
}
}
- /** {@inheritDoc} */
- @Override public void onReadyForRead(ReadOnlyMetastorage metastorage) throws IgniteCheckedException {
- startCachesOnStart();
- }
-
- /** {@inheritDoc} */
- @Override public void onReadyForReadWrite(ReadWriteMetastorage metastorage) throws IgniteCheckedException {
- }
-
/**
* @throws IgniteCheckedException If failed.
*/
- private void startCachesOnStart() throws IgniteCheckedException {
- if (!ctx.isDaemon()) {
- Map<String, CacheInfo> caches = new HashMap<>();
+ private void restoreCacheConfigurations() throws IgniteCheckedException {
+ if (ctx.isDaemon())
+ return;
+
+ Map<String, CacheInfo> caches = new HashMap<>();
- Map<String, CacheInfo> templates = new HashMap<>();
+ Map<String, CacheInfo> templates = new HashMap<>();
- addCacheOnJoinFromConfig(caches, templates);
+ addCacheOnJoinFromConfig(caches, templates);
- CacheJoinNodeDiscoveryData discoData = new CacheJoinNodeDiscoveryData(
+ CacheJoinNodeDiscoveryData discoData = new CacheJoinNodeDiscoveryData(
IgniteUuid.randomUuid(),
caches,
templates,
startAllCachesOnClientStart()
- );
+ );
- cachesInfo.onStart(discoData);
- }
+ cachesInfo.onStart(discoData);
}
/** {@inheritDoc} */
@SuppressWarnings({"unchecked"})
@Override public void start() throws IgniteCheckedException {
- ctx.internalSubscriptionProcessor().registerMetastorageListener(this);
+ ctx.internalSubscriptionProcessor().registerMetastorageListener(recovery);
+ ctx.internalSubscriptionProcessor().registerDatabaseListener(recovery);
cachesInfo = new ClusterCachesInfo(ctx);
@@ -792,7 +801,7 @@ private void startCachesOnStart() throws IgniteCheckedException {
mgr.start(sharedCtx);
if (!ctx.isDaemon() && (!CU.isPersistenceEnabled(ctx.config())) || ctx.config().isClientMode())
- startCachesOnStart();
+ restoreCacheConfigurations();
if (log.isDebugEnabled())
log.debug("Started cache processor.");
@@ -1284,71 +1293,6 @@ private void stopCacheOnReconnect(GridCacheContext cctx, List<GridCacheAdapter>
return null;
}
- /**
- * @param cache Cache to start.
- * @param schema Cache schema.
- * @throws IgniteCheckedException If failed to start cache.
- */
- @SuppressWarnings({"TypeMayBeWeakened", "unchecked"})
- private void startCache(GridCacheAdapter<?, ?> cache, QuerySchema schema) throws IgniteCheckedException {
- GridCacheContext<?, ?> cacheCtx = cache.context();
-
- CacheConfiguration cfg = cacheCtx.config();
-
- // Intentionally compare Boolean references using '!=' below to check if the flag has been explicitly set.
- if (cfg.isStoreKeepBinary() && cfg.isStoreKeepBinary() != CacheConfiguration.DFLT_STORE_KEEP_BINARY
- && !(ctx.config().getMarshaller() instanceof BinaryMarshaller))
- U.warn(log, "CacheConfiguration.isStoreKeepBinary() configuration property will be ignored because " +
- "BinaryMarshaller is not used");
-
- // Start managers.
- for (GridCacheManager mgr : F.view(cacheCtx.managers(), F.notContains(dhtExcludes(cacheCtx))))
- mgr.start(cacheCtx);
-
- cacheCtx.initConflictResolver();
-
- if (cfg.getCacheMode() != LOCAL && GridCacheUtils.isNearEnabled(cfg)) {
- GridCacheContext<?, ?> dhtCtx = cacheCtx.near().dht().context();
-
- // Start DHT managers.
- for (GridCacheManager mgr : dhtManagers(dhtCtx))
- mgr.start(dhtCtx);
-
- dhtCtx.initConflictResolver();
-
- // Start DHT cache.
- dhtCtx.cache().start();
-
- if (log.isDebugEnabled())
- log.debug("Started DHT cache: " + dhtCtx.cache().name());
- }
-
- ctx.continuous().onCacheStart(cacheCtx);
-
- cacheCtx.cache().start();
-
- ctx.query().onCacheStart(cacheCtx, schema);
-
- cacheCtx.onStarted();
-
- String memPlcName = cfg.getDataRegionName();
-
- if (memPlcName == null && ctx.config().getDataStorageConfiguration() != null)
- memPlcName = ctx.config().getDataStorageConfiguration().getDefaultDataRegionConfiguration().getName();
-
- if (log.isInfoEnabled()) {
- log.info("Started cache [name=" + cfg.getName() +
- ", id=" + cacheCtx.cacheId() +
- (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
- ", memoryPolicyName=" + memPlcName +
- ", mode=" + cfg.getCacheMode() +
- ", atomicity=" + cfg.getAtomicityMode() +
- ", backups=" + cfg.getBackups() +
- ", mvcc=" + cacheCtx.mvccEnabled() +']' +
- ", encryptionEnabled=" + cfg.isEncryptionEnabled() +']');
- }
- }
-
/**
* @param cache Cache to stop.
* @param cancel Cancel flag.
@@ -1516,7 +1460,7 @@ private void onKernalStop(GridCacheAdapter<?, ?> cache, boolean cancel) {
cache.onKernalStop();
- if (ctx.events().isRecordable(EventType.EVT_CACHE_STOPPED))
+ if (!ctx.isRecoveryMode() && ctx.events().isRecordable(EventType.EVT_CACHE_STOPPED))
ctx.events().addEvent(EventType.EVT_CACHE_STOPPED);
}
@@ -1534,7 +1478,8 @@ private void onKernalStop(GridCacheAdapter<?, ?> cache, boolean cancel) {
* @return Cache context.
* @throws IgniteCheckedException If failed to create cache.
*/
- private GridCacheContext createCache(CacheConfiguration<?, ?> cfg,
+ private GridCacheContext<?, ?> createCacheContext(
+ CacheConfiguration<?, ?> cfg,
CacheGroupContext grp,
@Nullable CachePluginManager pluginMgr,
DynamicCacheDescriptor desc,
@@ -1542,8 +1487,9 @@ private GridCacheContext createCache(CacheConfiguration<?, ?> cfg,
CacheObjectContext cacheObjCtx,
boolean affNode,
boolean updatesAllowed,
- boolean disabledAfterStart)
- throws IgniteCheckedException {
+ boolean disabledAfterStart,
+ boolean recoveryMode
+ ) throws IgniteCheckedException {
assert cfg != null;
if (cfg.getCacheStoreFactory() instanceof GridCacheLoaderWriterStoreFactory) {
@@ -1600,7 +1546,13 @@ private GridCacheContext createCache(CacheConfiguration<?, ?> cfg,
GridCacheDrManager drMgr = pluginMgr.createComponent(GridCacheDrManager.class);
CacheStoreManager storeMgr = pluginMgr.createComponent(CacheStoreManager.class);
- storeMgr.initialize(cfgStore, sesHolders);
+ if (cfgStore == null)
+ storeMgr.initialize(cfgStore, sesHolders);
+ else
+ initializationProtector.protect(
+ cfgStore,
+ () -> storeMgr.initialize(cfgStore, sesHolders)
+ );
GridCacheContext<?, ?> cacheCtx = new GridCacheContext(
ctx,
@@ -1611,6 +1563,7 @@ private GridCacheContext createCache(CacheConfiguration<?, ?> cfg,
locStartTopVer,
affNode,
updatesAllowed,
+ recoveryMode,
/*
* Managers in starting order!
* ===========================
@@ -1746,6 +1699,7 @@ private GridCacheContext createCache(CacheConfiguration<?, ?> cfg,
locStartTopVer,
affNode,
true,
+ recoveryMode,
/*
* Managers in starting order!
* ===========================
@@ -2017,18 +1971,13 @@ public CacheMode cacheMode(String cacheName) {
IgniteInternalFuture<?> res = sharedCtx.affinity().initCachesOnLocalJoin(
locJoinCtx.cacheGroupDescriptors(), locJoinCtx.cacheDescriptors());
- for (T2<DynamicCacheDescriptor, NearCacheConfiguration> t : locJoinCtx.caches()) {
- DynamicCacheDescriptor desc = t.get1();
+ List<StartCacheInfo> startCacheInfos = locJoinCtx.caches().stream()
+ .map(cacheInfo -> new StartCacheInfo(cacheInfo.get1(), cacheInfo.get2(), exchTopVer, false))
+ .collect(Collectors.toList());
- prepareCacheStart(
- desc.cacheConfiguration(),
- desc,
- t.get2(),
- exchTopVer,
- false);
+ prepareStartCaches(startCacheInfos);
- context().exchange().exchangerUpdateHeartbeat();
- }
+ context().exchange().exchangerUpdateHeartbeat();
if (log.isInfoEnabled())
log.info("Starting caches on local join performed in " + (System.currentTimeMillis() - time) + " ms.");
@@ -2054,24 +2003,173 @@ boolean hasCachesReceivedFromJoin(ClusterNode node) {
*/
public Collection<DynamicCacheDescriptor> startReceivedCaches(UUID nodeId, AffinityTopologyVersion exchTopVer)
throws IgniteCheckedException {
- List<DynamicCacheDescriptor> started = cachesInfo.cachesReceivedFromJoin(nodeId);
+ List<DynamicCacheDescriptor> receivedCaches = cachesInfo.cachesReceivedFromJoin(nodeId);
- for (DynamicCacheDescriptor desc : started) {
- IgnitePredicate<ClusterNode> filter = desc.groupDescriptor().config().getNodeFilter();
+ List<StartCacheInfo> startCacheInfos = receivedCaches.stream()
+ .filter(desc -> isLocalAffinity(desc.groupDescriptor().config()))
+ .map(desc -> new StartCacheInfo(desc, null, exchTopVer, false))
+ .collect(Collectors.toList());
- if (CU.affinityNode(ctx.discovery().localNode(), filter)) {
- prepareCacheStart(
- desc.cacheConfiguration(),
- desc,
- null,
- exchTopVer,
- false);
+ prepareStartCaches(startCacheInfos);
+
+ return receivedCaches;
+ }
+
+ /**
+ * @param cacheConfiguration Checked configuration.
+ * @return {@code true} if local node is affinity node for cache.
+ */
+ private boolean isLocalAffinity(CacheConfiguration cacheConfiguration) {
+ return CU.affinityNode(ctx.discovery().localNode(), cacheConfiguration.getNodeFilter());
+ }
+
+ /**
+ * Start all input caches in parallel.
+ *
+ * @param startCacheInfos All caches information for start.
+ */
+ void prepareStartCaches(Collection<StartCacheInfo> startCacheInfos) throws IgniteCheckedException {
+ prepareStartCaches(startCacheInfos, (data, operation) -> {
+ operation.accept(data);// PROXY
+ });
+ }
+
+ /**
+ * Trying to start all input caches in parallel and skip failed caches.
+ *
+ * @param startCacheInfos Caches info for start.
+ * @return Caches which was failed.
+ * @throws IgniteCheckedException if failed.
+ */
+ Map<StartCacheInfo, IgniteCheckedException> prepareStartCachesIfPossible(Collection<StartCacheInfo> startCacheInfos) throws IgniteCheckedException {
+ HashMap<StartCacheInfo, IgniteCheckedException> failedCaches = new HashMap<>();
+
+ prepareStartCaches(startCacheInfos, (data, operation) -> {
+ try {
+ operation.accept(data);
+ }
+ catch (IgniteInterruptedCheckedException e) {
+ throw e;
+ }
+ catch (IgniteCheckedException e) {
+ log.warning("Cache can not be started : cache=" + data.getStartedConfiguration().getName());
+
+ failedCaches.put(data, e);
+ }
+ });
+
+ return failedCaches;
+ }
+
+ /**
+ * Start all input caches in parallel.
+ *
+ * @param startCacheInfos All caches information for start.
+ * @param cacheStartFailHandler Fail handler for one cache start.
+ */
+ private void prepareStartCaches(
+ Collection<StartCacheInfo> startCacheInfos,
+ StartCacheFailHandler<StartCacheInfo> cacheStartFailHandler
+ ) throws IgniteCheckedException {
+ if (!IGNITE_ALLOW_START_CACHES_IN_PARALLEL || startCacheInfos.size() <= 1) {
+ for (StartCacheInfo startCacheInfo : startCacheInfos) {
+ cacheStartFailHandler.handle(
+ startCacheInfo,
+ cacheInfo -> prepareCacheStart(
+ cacheInfo.getCacheDescriptor().cacheConfiguration(),
+ cacheInfo.getCacheDescriptor(),
+ cacheInfo.getReqNearCfg(),
+ cacheInfo.getExchangeTopVer(),
+ cacheInfo.isDisabledAfterStart()
+ )
+ );
context().exchange().exchangerUpdateHeartbeat();
}
}
+ else {
+ Map<StartCacheInfo, GridCacheContext> cacheContexts = new ConcurrentHashMap<>();
+
+ int parallelismLvl = sharedCtx.kernalContext().config().getSystemThreadPoolSize();
+
+ // Reserve at least 2 threads for system operations.
+ parallelismLvl = Math.max(1, parallelismLvl - 2);
+
+ doInParallel(
+ parallelismLvl,
+ sharedCtx.kernalContext().getSystemExecutorService(),
+ startCacheInfos,
+ startCacheInfo ->
+ cacheStartFailHandler.handle(
+ startCacheInfo,
+ cacheInfo -> {
+ GridCacheContext cacheCtx = prepareCacheContext(
+ cacheInfo.getCacheDescriptor().cacheConfiguration(),
+ cacheInfo.getCacheDescriptor(),
+ cacheInfo.getReqNearCfg(),
+ cacheInfo.getExchangeTopVer(),
+ cacheInfo.isDisabledAfterStart()
+ );
+ cacheContexts.put(cacheInfo, cacheCtx);
+
+ context().exchange().exchangerUpdateHeartbeat();
+ }
+ )
+ );
- return started;
+ /*
+ * This hack required because we can't start sql schema in parallel by folowing reasons:
+ * * checking index to duplicate(and other checking) require one order on every nodes.
+ * * onCacheStart and createSchema contains a lot of mutex.
+ *
+ * TODO IGNITE-9729
+ */
+ Set<StartCacheInfo> successfullyPreparedCaches = cacheContexts.keySet();
+
+ List<StartCacheInfo> cacheInfosInOriginalOrder = startCacheInfos.stream()
+ .filter(successfullyPreparedCaches::contains)
+ .collect(Collectors.toList());
+
+ for (StartCacheInfo startCacheInfo : cacheInfosInOriginalOrder) {
+ cacheStartFailHandler.handle(
+ startCacheInfo,
+ cacheInfo -> {
+ GridCacheContext<?, ?> cctx = cacheContexts.get(cacheInfo);
+
+ if (!cctx.isRecoveryMode()) {
+ ctx.query().onCacheStart(
+ cctx,
+ cacheInfo.getCacheDescriptor().schema() != null
+ ? cacheInfo.getCacheDescriptor().schema()
+ : new QuerySchema()
+ );
+ }
+
+ context().exchange().exchangerUpdateHeartbeat();
+ }
+ );
+ }
+
+ doInParallel(
+ parallelismLvl,
+ sharedCtx.kernalContext().getSystemExecutorService(),
+ cacheContexts.entrySet(),
+ cacheCtxEntry ->
+ cacheStartFailHandler.handle(
+ cacheCtxEntry.getKey(),
+ cacheInfo -> {
+ GridCacheContext<?, ?> cacheContext = cacheCtxEntry.getValue();
+
+ if (cacheContext.isRecoveryMode())
+ finishRecovery(cacheInfo.getExchangeTopVer(), cacheContext);
+ else
+ onCacheStarted(cacheCtxEntry.getValue());
+
+ context().exchange().exchangerUpdateHeartbeat();
+ }
+ )
+ );
+ }
}
/**
@@ -2083,78 +2181,255 @@ boolean hasCachesReceivedFromJoin(ClusterNode node) {
* change state of proxies to restarting
* @throws IgniteCheckedException If failed.
*/
- void prepareCacheStart(
+ public void prepareCacheStart(
CacheConfiguration startCfg,
DynamicCacheDescriptor desc,
@Nullable NearCacheConfiguration reqNearCfg,
AffinityTopologyVersion exchTopVer,
boolean disabledAfterStart
) throws IgniteCheckedException {
+ GridCacheContext cacheCtx = prepareCacheContext(startCfg, desc, reqNearCfg, exchTopVer, disabledAfterStart);
+
+ ctx.query().onCacheStart(cacheCtx, desc.schema() != null ? desc.schema() : new QuerySchema());
+
+ if (cacheCtx.isRecoveryMode())
+ finishRecovery(exchTopVer, cacheCtx);
+ else
+ onCacheStarted(cacheCtx);
+ }
+
+ /**
+ * Preparing cache context to start.
+ *
+ * @param startCfg Cache configuration to use.
+ * @param desc Cache descriptor.
+ * @param reqNearCfg Near configuration if specified for client cache start request.
+ * @param exchTopVer Current exchange version.
+ * @param disabledAfterStart If true, then we will discard restarting state from proxies. If false then we will change
+ * state of proxies to restarting
+ * @return Created {@link GridCacheContext}.
+ * @throws IgniteCheckedException if failed.
+ */
+ private GridCacheContext prepareCacheContext(
+ CacheConfiguration startCfg,
+ DynamicCacheDescriptor desc,
+ @Nullable NearCacheConfiguration reqNearCfg,
+ AffinityTopologyVersion exchTopVer,
+ boolean disabledAfterStart
+ ) throws IgniteCheckedException {
+ if (caches.containsKey(startCfg.getName())) {
+ GridCacheAdapter<?, ?> existingCache = caches.get(startCfg.getName());
+
+ GridCacheContext<?, ?> cctx = existingCache.context();
+
+ assert cctx.isRecoveryMode();
+
+ QuerySchema localSchema = recovery.querySchemas.get(desc.cacheId());
+
+ QuerySchemaPatch localSchemaPatch = localSchema.makePatch(desc.schema().entities());
+
+ // Cache schema is changed after restart, workaround is stop existing cache and start new.
+ if (!localSchemaPatch.isEmpty() || localSchemaPatch.hasConflicts())
+ stopCacheSafely(cctx);
+ else
+ return existingCache.context();
+ }
+
assert !caches.containsKey(startCfg.getName()) : startCfg.getName();
CacheConfiguration ccfg = new CacheConfiguration(startCfg);
CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(ccfg);
- boolean affNode;
+ boolean affNode = checkForAffinityNode(desc, reqNearCfg, ccfg);
- if (ccfg.getCacheMode() == LOCAL) {
- affNode = true;
+ CacheGroupContext grp = getOrCreateCacheGroupContext(desc, exchTopVer, cacheObjCtx, affNode, startCfg.getGroupName(), false);
- ccfg.setNearConfiguration(null);
- }
- else if (CU.affinityNode(ctx.discovery().localNode(), desc.groupDescriptor().config().getNodeFilter()))
- affNode = true;
- else {
- affNode = false;
+ GridCacheContext cacheCtx = createCacheContext(ccfg,
+ grp,
+ null,
+ desc,
+ exchTopVer,
+ cacheObjCtx,
+ affNode,
+ true,
+ disabledAfterStart,
+ false
+ );
+
+ initCacheContext(cacheCtx, ccfg, desc.deploymentId());
+
+
+ return cacheCtx;
+ }
+
+ /**
+ * Stops cache under checkpoint lock.
+ * @param cctx Cache context.
+ */
+ private void stopCacheSafely(GridCacheContext<?, ?> cctx) {
+ sharedCtx.database().checkpointReadLock();
+
+ try {
+ prepareCacheStop(cctx.name(), false);
- ccfg.setNearConfiguration(reqNearCfg);
+ if (!cctx.group().hasCaches())
+ stopCacheGroup(cctx.group().groupId());
+ }
+ finally {
+ sharedCtx.database().checkpointReadUnlock();
}
- if (sharedCtx.pageStore() != null && affNode)
- sharedCtx.pageStore().initializeForCache(desc.groupDescriptor(), desc.toStoredData());
+ }
- String grpName = startCfg.getGroupName();
+ /**
+ * Finishes recovery for given cache context.
+ *
+ * @param cacheStartVer Cache join to topology version.
+ * @param cacheContext Cache context.
+ * @throws IgniteCheckedException If failed.
+ */
+ private void finishRecovery(AffinityTopologyVersion cacheStartVer, GridCacheContext<?, ?> cacheContext) throws IgniteCheckedException {
+ CacheGroupContext groupContext = cacheContext.group();
- CacheGroupContext grp = null;
+ // Take cluster-wide cache descriptor and try to update local cache and cache group parameters.
+ DynamicCacheDescriptor updatedDescriptor = cacheDescriptor(cacheContext.cacheId());
- if (grpName != null) {
- for (CacheGroupContext grp0 : cacheGrps.values()) {
- if (grp0.sharedGroup() && grpName.equals(grp0.name())) {
- grp = grp0;
+ groupContext.finishRecovery(
+ cacheStartVer,
+ updatedDescriptor.receivedFrom(),
+ isLocalAffinity(updatedDescriptor.cacheConfiguration())
+ );
- break;
- }
+ cacheContext.finishRecovery(cacheStartVer, updatedDescriptor.cacheConfiguration().isStatisticsEnabled());
+
+ onKernalStart(cacheContext.cache());
+
+ if (log.isInfoEnabled())
+ log.info("Finished recovery for cache [cache=" + cacheContext.name()
+ + ", grp=" + groupContext.cacheOrGroupName() + ", startVer=" + cacheStartVer + "]");
+ }
+
+ /**
+ * Stops all caches and groups, that was recovered, but not activated on node join.
+ * Such caches can remain only if it was filtered by node filter on current node.
+ * It's impossible to check whether current node is affinity node for given cache before join to topology.
+ */
+ public void shutdownNotFinishedRecoveryCaches() {
+ for (GridCacheAdapter cacheAdapter : caches.values()) {
+ GridCacheContext cacheContext = cacheAdapter.context();
+
+ if (cacheContext.isLocal())
+ continue;
+
+ if (cacheContext.isRecoveryMode()) {
+ assert !isLocalAffinity(cacheContext.config())
+ : "Cache " + cacheAdapter.context() + " is still in recovery mode after start, but not activated.";
+
+ stopCacheSafely(cacheContext);
}
+ }
+ }
+
+ /**
+ * Check for affinity node and customize near configuration if needed.
+ *
+ * @param desc Cache descriptor.
+ * @param reqNearCfg Near configuration if specified for client cache start request.
+ * @param ccfg Cache configuration to use.
+ * @return {@code true} if it is affinity node for cache.
+ */
+ private boolean checkForAffinityNode(
+ DynamicCacheDescriptor desc,
+ @Nullable NearCacheConfiguration reqNearCfg,
+ CacheConfiguration ccfg
+ ) {
+ if (ccfg.getCacheMode() == LOCAL) {
+ ccfg.setNearConfiguration(null);
+
+ return true;
+ }
+
+ if (isLocalAffinity(desc.groupDescriptor().config()))
+ return true;
- if (grp == null) {
- grp = startCacheGroup(desc.groupDescriptor(),
+ ccfg.setNearConfiguration(reqNearCfg);
+
+ return false;
+ }
+
+ /**
+ * Prepare page store for start cache.
+ *
+ * @param desc Cache descriptor.
+ * @param affNode {@code true} if it is affinity node for cache.
+ * @throws IgniteCheckedException if failed.
+ */
+ private void preparePageStore(DynamicCacheDescriptor desc, boolean affNode) throws IgniteCheckedException {
+ if (sharedCtx.pageStore() != null && affNode)
+ initializationProtector.protect(
+ desc.groupDescriptor().groupId(),
+ () -> sharedCtx.pageStore().initializeForCache(desc.groupDescriptor(), desc.toStoredData())
+ );
+ }
+
+ /**
+ * Prepare cache group to start cache.
+ *
+ * @param desc Cache descriptor.
+ * @param exchTopVer Current exchange version.
+ * @param cacheObjCtx Cache object context.
+ * @param affNode {@code true} if it is affinity node for cache.
+ * @param grpName Group name.
+ * @return Prepared cache group context.
+ * @throws IgniteCheckedException if failed.
+ */
+ private CacheGroupContext getOrCreateCacheGroupContext(
+ DynamicCacheDescriptor desc,
+ AffinityTopologyVersion exchTopVer,
+ CacheObjectContext cacheObjCtx,
+ boolean affNode,
+ String grpName,
+ boolean recoveryMode
+ ) throws IgniteCheckedException {
+ if (grpName != null) {
+ return initializationProtector.protect(
+ desc.groupId(),
+ () -> findCacheGroup(grpName),
+ () -> startCacheGroup(
+ desc.groupDescriptor(),
desc.cacheType(),
affNode,
cacheObjCtx,
- exchTopVer);
- }
- }
- else {
- grp = startCacheGroup(desc.groupDescriptor(),
- desc.cacheType(),
- affNode,
- cacheObjCtx,
- exchTopVer);
+ exchTopVer,
+ recoveryMode
+ )
+ );
}
- GridCacheContext cacheCtx = createCache(ccfg,
- grp,
- null,
- desc,
- exchTopVer,
- cacheObjCtx,
+ return startCacheGroup(desc.groupDescriptor(),
+ desc.cacheType(),
affNode,
- true,
- disabledAfterStart
+ cacheObjCtx,
+ exchTopVer,
+ recoveryMode
);
+ }
- cacheCtx.dynamicDeploymentId(desc.deploymentId());
+ /**
+ * Initialize created cache context.
+ *
+ * @param cacheCtx Cache context to initializtion.
+ * @param cfg Cache configuration.
+ * @param deploymentId Dynamic deployment ID.
+ * @throws IgniteCheckedException if failed.
+ */
+ private void initCacheContext(
+ GridCacheContext<?, ?> cacheCtx,
+ CacheConfiguration cfg,
+ IgniteUuid deploymentId
+ ) throws IgniteCheckedException {
+ cacheCtx.dynamicDeploymentId(deploymentId);
GridCacheAdapter cache = cacheCtx.cache();
@@ -2162,13 +2437,145 @@ else if (CU.affinityNode(ctx.discovery().localNode(), desc.groupDescriptor().con
caches.put(cacheCtx.name(), cache);
- startCache(cache, desc.schema() != null ? desc.schema() : new QuerySchema());
+ // Intentionally compare Boolean references using '!=' below to check if the flag has been explicitly set.
+ if (cfg.isStoreKeepBinary() && cfg.isStoreKeepBinary() != CacheConfiguration.DFLT_STORE_KEEP_BINARY
+ && !(ctx.config().getMarshaller() instanceof BinaryMarshaller))
+ U.warn(log, "CacheConfiguration.isStoreKeepBinary() configuration property will be ignored because " +
+ "BinaryMarshaller is not used");
+
+ // Start managers.
+ for (GridCacheManager mgr : F.view(cacheCtx.managers(), F.notContains(dhtExcludes(cacheCtx))))
+ mgr.start(cacheCtx);
+
+ cacheCtx.initConflictResolver();
+
+ if (cfg.getCacheMode() != LOCAL && GridCacheUtils.isNearEnabled(cfg)) {
+ GridCacheContext<?, ?> dhtCtx = cacheCtx.near().dht().context();
+
+ // Start DHT managers.
+ for (GridCacheManager mgr : dhtManagers(dhtCtx))
+ mgr.start(dhtCtx);
+
+ dhtCtx.initConflictResolver();
+
+ // Start DHT cache.
+ dhtCtx.cache().start();
+
+ if (log.isDebugEnabled())
+ log.debug("Started DHT cache: " + dhtCtx.cache().name());
+ }
+
+ ctx.continuous().onCacheStart(cacheCtx);
+
+ cacheCtx.cache().start();
+ }
+
+ /**
+ * Handle of cache context which was fully prepared.
+ *
+ * @param cacheCtx Fully prepared context.
+ * @throws IgniteCheckedException if failed.
+ */
+ private void onCacheStarted(GridCacheContext cacheCtx) throws IgniteCheckedException {
+ GridCacheAdapter cache = cacheCtx.cache();
+ CacheConfiguration cfg = cacheCtx.config();
+ CacheGroupContext grp = cacheGrps.get(cacheCtx.groupId());
+
+ cacheCtx.onStarted();
+
+ String dataRegion = cfg.getDataRegionName();
+
+ if (dataRegion == null && ctx.config().getDataStorageConfiguration() != null)
+ dataRegion = ctx.config().getDataStorageConfiguration().getDefaultDataRegionConfiguration().getName();
+
+ if (log.isInfoEnabled()) {
+ log.info("Started cache [name=" + cfg.getName() +
+ ", id=" + cacheCtx.cacheId() +
+ (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
+ ", dataRegionName=" + dataRegion +
+ ", mode=" + cfg.getCacheMode() +
+ ", atomicity=" + cfg.getAtomicityMode() +
+ ", backups=" + cfg.getBackups() +
+ ", mvcc=" + cacheCtx.mvccEnabled() + ']');
+ }
grp.onCacheStarted(cacheCtx);
onKernalStart(cache);
}
+ /**
+ * @param desc Cache descriptor.
+ * @throws IgniteCheckedException If failed.
+ */
+ private GridCacheContext<?, ?> startCacheInRecoveryMode(
+ DynamicCacheDescriptor desc
+ ) throws IgniteCheckedException {
+ CacheConfiguration cfg = desc.cacheConfiguration();
+
+ CacheObjectContext cacheObjCtx = ctx.cacheObjects().contextForCache(cfg);
+
+ preparePageStore(desc, true);
+
+ CacheGroupContext grp = getOrCreateCacheGroupContext(
+ desc,
+ AffinityTopologyVersion.NONE,
+ cacheObjCtx,
+ true,
+ cfg.getGroupName(),
+ true
+ );
+
+ GridCacheContext cacheCtx = createCacheContext(cfg,
+ grp,
+ null,
+ desc,
+ AffinityTopologyVersion.NONE,
+ cacheObjCtx,
+ true,
+ true,
+ false,
+ true
+ );
+
+ initCacheContext(cacheCtx, cfg, desc.deploymentId());
+
+ cacheCtx.onStarted();
+
+ String dataRegion = cfg.getDataRegionName();
+
+ if (dataRegion == null && ctx.config().getDataStorageConfiguration() != null)
+ dataRegion = ctx.config().getDataStorageConfiguration().getDefaultDataRegionConfiguration().getName();
+
+ grp.onCacheStarted(cacheCtx);
+
+ ctx.query().onCacheStart(cacheCtx, desc.schema() != null ? desc.schema() : new QuerySchema());
+
+ if (log.isInfoEnabled()) {
+ log.info("Started cache in recovery mode [name=" + cfg.getName() +
+ ", id=" + cacheCtx.cacheId() +
+ (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
+ ", dataRegionName=" + dataRegion +
+ ", mode=" + cfg.getCacheMode() +
+ ", atomicity=" + cfg.getAtomicityMode() +
+ ", backups=" + cfg.getBackups() +
+ ", mvcc=" + cacheCtx.mvccEnabled() + ']');
+ }
+
+ return cacheCtx;
+ }
+
+ /**
+ * @param grpName Group name.
+ * @return Found group or null.
+ */
+ private CacheGroupContext findCacheGroup(String grpName) {
+ return cacheGrps.values().stream()
+ .filter(grp -> grp.sharedGroup() && grpName.equals(grp.name()))
+ .findAny()
+ .orElse(null);
+ }
+
/**
* Restarts proxies of caches if they was marked as restarting. Requires external synchronization - shouldn't be
* called concurrently with another caches restart.
@@ -2208,8 +2615,9 @@ private CacheGroupContext startCacheGroup(
CacheType cacheType,
boolean affNode,
CacheObjectContext cacheObjCtx,
- AffinityTopologyVersion exchTopVer)
- throws IgniteCheckedException {
+ AffinityTopologyVersion exchTopVer,
+ boolean recoveryMode
+ ) throws IgniteCheckedException {
CacheConfiguration cfg = new CacheConfiguration(desc.config());
String memPlcName = cfg.getDataRegionName();
@@ -2218,7 +2626,7 @@ private CacheGroupContext startCacheGroup(
FreeList freeList = sharedCtx.database().freeList(memPlcName);
ReuseList reuseList = sharedCtx.database().reuseList(memPlcName);
- boolean persistenceEnabled = sharedCtx.localNode().isClient() ? desc.persistenceEnabled() :
+ boolean persistenceEnabled = recoveryMode || sharedCtx.localNode().isClient() ? desc.persistenceEnabled() :
dataRegion != null && dataRegion.config().isPersistenceEnabled();
CacheGroupContext grp = new CacheGroupContext(sharedCtx,
@@ -2233,7 +2641,8 @@ private CacheGroupContext startCacheGroup(
reuseList,
exchTopVer,
persistenceEnabled,
- desc.walEnabled()
+ desc.walEnabled(),
+ recoveryMode
);
for (Object obj : grp.configuredUserObjects())
@@ -2326,7 +2735,7 @@ private void stopGateway(DynamicCacheChangeRequest req) {
* @param destroy Cache data destroy flag. Setting to <code>true</code> will remove all cache data.
* @return Stopped cache context.
*/
- private GridCacheContext<?, ?> prepareCacheStop(String cacheName, boolean destroy) {
+ public GridCacheContext<?, ?> prepareCacheStop(String cacheName, boolean destroy) {
assert sharedCtx.database().checkpointLockIsHeldByThread();
GridCacheAdapter<?, ?> cache = caches.remove(cacheName);
@@ -2428,17 +2837,7 @@ private void closeCache(GridCacheContext cctx) {
jCacheProxies.remove(cctx.name());
- sharedCtx.database().checkpointReadLock();
-
- try {
- prepareCacheStop(cctx.name(), false);
- }
- finally {
- sharedCtx.database().checkpointReadUnlock();
- }
-
- if (!cctx.group().hasCaches())
- stopCacheGroup(cctx.group().groupId());
+ stopCacheSafely(cctx);
}
finally {
sharedCtx.io().writeUnlock();
@@ -4331,6 +4730,26 @@ public DynamicCacheDescriptor cacheDescriptor(String name) {
return cachesInfo.registeredCaches();
}
+ /**
+ * @return Collection of persistent cache descriptors.
+ */
+ public Collection<DynamicCacheDescriptor> persistentCaches() {
+ return cachesInfo.registeredCaches().values()
+ .stream()
+ .filter(desc -> isPersistentCache(desc.cacheConfiguration(), ctx.config().getDataStorageConfiguration()))
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * @return Collection of persistent cache group descriptors.
+ */
+ public Collection<CacheGroupDescriptor> persistentGroups() {
+ return cachesInfo.registeredCacheGroups().values()
+ .stream()
+ .filter(CacheGroupDescriptor::persistenceEnabled)
+ .collect(Collectors.toList());
+ }
+
/**
* @return Cache group descriptors.
*/
@@ -4834,7 +5253,7 @@ private DynamicCacheChangeRequest prepareCacheChangeRequest(
// Check if we were asked to start a near cache.
if (nearCfg != null) {
- if (CU.affinityNode(ctx.discovery().localNode(), descCfg.getNodeFilter())) {
+ if (isLocalAffinity(descCfg)) {
// If we are on a data node and near cache was enabled, return success, else - fail.
if (descCfg.getNearConfiguration() != null)
return null;
@@ -4846,7 +5265,7 @@ private DynamicCacheChangeRequest prepareCacheChangeRequest(
// If local node has near cache, return success.
req.clientStartOnly(true);
}
- else if (!CU.affinityNode(ctx.discovery().localNode(), descCfg.getNodeFilter()))
+ else if (!isLocalAffinity(descCfg))
req.clientStartOnly(true);
req.deploymentId(desc.deploymentId());
@@ -5014,6 +5433,97 @@ public void setTxTimeoutOnPartitionMapExchange(long timeout) throws IgniteChecke
});
}
+ /**
+ * Recovery lifecycle for caches.
+ */
+ private class CacheRecoveryLifecycle implements MetastorageLifecycleListener, DatabaseLifecycleListener {
+ /** Set of QuerySchema's saved on recovery. It's needed if cache query schema has changed after node joined to topology.*/
+ private final Map<Integer, QuerySchema> querySchemas = new ConcurrentHashMap<>();
+
+ /** {@inheritDoc} */
+ @Override public void onBaselineChange() {
+ onKernalStopCaches(true);
+
+ stopCaches(true);
+
+ sharedCtx.database().cleanupRestoredCaches();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void onReadyForRead(ReadOnlyMetastorage metastorage) throws IgniteCheckedException {
+ restoreCacheConfigurations();
+ }
+
+ /** {@inheritDoc} */
+ @Override public void beforeBinaryMemoryRestore(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {
+ for (DynamicCacheDescriptor cacheDescriptor : persistentCaches())
+ preparePageStore(cacheDescriptor, true);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void afterBinaryMemoryRestore(GridCacheDatabaseSharedManager.RestoreBinaryState binaryState) throws IgniteCheckedException {
+ for (DynamicCacheDescriptor cacheDescriptor : persistentCaches()) {
+ // Skip MVCC caches.
+ // TODO: https://issues.apache.org/jira/browse/IGNITE-10052
+ if (cacheDescriptor.cacheConfiguration().getAtomicityMode() == TRANSACTIONAL_SNAPSHOT)
+ continue;
+
+ startCacheInRecoveryMode(cacheDescriptor);
+
+ querySchemas.put(cacheDescriptor.cacheId(), cacheDescriptor.schema().copy());
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public void afterLogicalUpdatesApplied(GridCacheDatabaseSharedManager.RestoreLogicalState logicalState) throws IgniteCheckedException {
+ restorePartitionStates(cacheGroups(), logicalState.partitionRecoveryStates());
+ }
+
+ /**
+ * @param forGroups Cache groups.
+ * @param partitionStates Partition states.
+ * @throws IgniteCheckedException If failed.
+ */
+ private void restorePartitionStates(
+ Collection<CacheGroupContext> forGroups,
+ Map<GroupPartitionId, PartitionRecoverState> partitionStates
+ ) throws IgniteCheckedException {
+ long startRestorePart = U.currentTimeMillis();
+
+ if (log.isInfoEnabled())
+ log.info("Restoring partition state for local groups.");
+
+ long totalProcessed = 0;
+
+ for (CacheGroupContext grp : forGroups)
+ totalProcessed += grp.offheap().restorePartitionStates(partitionStates);
+
+ if (log.isInfoEnabled())
+ log.info("Finished restoring partition state for local groups [" +
+ "groupsProcessed=" + forGroups.size() +
+ ", partitionsProcessed=" + totalProcessed +
+ ", time=" + (U.currentTimeMillis() - startRestorePart) + "ms]");
+ }
+ }
+
+ /**
+
+ /**
+ * Handle of fail during cache start.
+ *
+ * @param <T> Type of started data.
+ */
+ private static interface StartCacheFailHandler<T> {
+ /**
+ * Handle of fail.
+ *
+ * @param data Start data.
+ * @param startCacheOperation Operation for start cache.
+ * @throws IgniteCheckedException if failed.
+ */
+ void handle(T data, IgniteThrowableConsumer<T> startCacheOperation) throws IgniteCheckedException;
+ }
+
/**
*
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index ebb8b5ea3015..6b3ca568a4c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -238,6 +238,42 @@ public GridCacheProxyImpl(
}
}
+ /** {@inheritDoc} */
+ @Override public void preloadPartition(int part) throws IgniteCheckedException {
+ CacheOperationContext prev = gate.enter(opCtx);
+
+ try {
+ delegate.preloadPartition(part);
+ }
+ finally {
+ gate.leave(prev);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteInternalFuture<?> preloadPartitionAsync(int part) throws IgniteCheckedException {
+ CacheOperationContext prev = gate.enter(opCtx);
+
+ try {
+ return delegate.preloadPartitionAsync(part);
+ }
+ finally {
+ gate.leave(prev);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean localPreloadPartition(int part) throws IgniteCheckedException {
+ CacheOperationContext prev = gate.enter(opCtx);
+
+ try {
+ return delegate.localPreloadPartition(part);
+ }
+ finally {
+ gate.leave(prev);
+ }
+ }
+
/** {@inheritDoc} */
@Override public GridCacheProxyImpl<K, V> forSubjectId(UUID subjId) {
return new GridCacheProxyImpl<>(ctx, delegate,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 431b9a9e9445..94d8c1c6b2aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -175,6 +175,9 @@
/** */
private final List<IgniteChangeGlobalStateSupport> stateAwareMgrs;
+ /** Cluster is in read-only mode. */
+ private volatile boolean readOnlyMode;
+
/**
* @param kernalCtx Context.
* @param txMgr Transaction manager.
@@ -1124,4 +1127,26 @@ public void finishDhtAtomicUpdate(GridCacheVersion ver) {
private int dhtAtomicUpdateIndex(GridCacheVersion ver) {
return U.safeAbs(ver.hashCode()) % dhtAtomicUpdCnt.length();
}
+
+ /**
+ * @return {@code true} if cluster is in read-only mode.
+ */
+ public boolean readOnlyMode() {
+ return readOnlyMode;
+ }
+
+ /**
+ * @param readOnlyMode Read-only flag.
+ */
+ public void readOnlyMode(boolean readOnlyMode) {
+ this.readOnlyMode = readOnlyMode;
+ }
+
+ /**
+ * For test purposes.
+ * @param txMgr Tx manager.
+ */
+ public void setTxManager(IgniteTxManager txMgr) {
+ this.txMgr = txMgr;
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
index 7a543546eb70..ad2342b15110 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedTtlCleanupManager.java
@@ -133,14 +133,17 @@ private void stopCleanupWorker() {
while (!isCancelled()) {
boolean expiredRemains = false;
- for (GridCacheTtlManager mgr : mgrs) {
- updateHeartbeat();
+ // TTL cleanup is allowed only when node joined to topology.
+ if (!cctx.kernalContext().recoveryMode()) {
+ for (GridCacheTtlManager mgr : mgrs) {
+ updateHeartbeat();
- if (mgr.expire(CLEANUP_WORKER_ENTRIES_PROCESS_LIMIT))
- expiredRemains = true;
+ if (mgr.expire(CLEANUP_WORKER_ENTRIES_PROCESS_LIMIT))
+ expiredRemains = true;
- if (isCancelled())
- return;
+ if (isCancelled())
+ return;
+ }
}
updateHeartbeat();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
index e49be4934eeb..4cf9e2388229 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridChangeGlobalStateMessageResponse.java
@@ -116,13 +116,13 @@ public Throwable getError() {
}
switch (writer.state()) {
- case 2:
+ case 3:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 3:
+ case 4:
if (!writer.writeUuid("requestId", requestId))
return false;
@@ -144,7 +144,7 @@ public Throwable getError() {
return false;
switch (reader.state()) {
- case 2:
+ case 3:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -152,7 +152,7 @@ public Throwable getError() {
reader.incrementState();
- case 3:
+ case 4:
requestId = reader.readUuid("requestId");
if (!reader.isLastRead())
@@ -172,7 +172,7 @@ public Throwable getError() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 4;
+ return 5;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
index 1128ae2be4c2..766be453cdb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
@@ -31,6 +31,8 @@
import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
import org.apache.ignite.internal.processors.cache.persistence.RootPage;
import org.apache.ignite.internal.processors.cache.persistence.RowStore;
+import org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
+import org.apache.ignite.internal.processors.cache.persistence.partstate.PartitionRecoverState;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import org.apache.ignite.internal.processors.cache.tree.PendingEntriesTree;
import org.apache.ignite.internal.processors.cache.tree.mvcc.data.MvccUpdateResult;
@@ -81,6 +83,15 @@
*/
public void stop();
+ /**
+ * Pre-create partitions that resides in page memory or WAL and restores their state.
+ *
+ * @param partitionRecoveryStates Partition recovery states.
+ * @return Number of processed partitions.
+ * @throws IgniteCheckedException If failed.
+ */
+ long restorePartitionStates(Map<GroupPartitionId, PartitionRecoverState> partitionRecoveryStates) throws IgniteCheckedException;
+
/**
* Partition counter update callback. May be overridden by plugin-provided subclasses.
*
@@ -608,6 +619,14 @@ public long cacheEntriesCount(int cacheId, boolean primary, boolean backup, Affi
*/
public long totalPartitionEntriesCount(int part);
+ /**
+ * Preload a partition. Must be called under partition reservation for DHT caches.
+ *
+ * @param part Partition.
+ * @throws IgniteCheckedException If failed.
+ */
+ public void preloadPartition(int part) throws IgniteCheckedException;
+
/**
*
*/
@@ -1091,7 +1110,7 @@ public CacheDataRow mvccFind(GridCacheContext cctx, KeyCacheObject key, MvccSnap
/**
* @param cntr Counter.
*/
- void updateInitialCounter(long cntr);
+ public void updateInitialCounter(long cntr);
/**
* Inject rows cache cleaner.
@@ -1105,11 +1124,17 @@ public CacheDataRow mvccFind(GridCacheContext cctx, KeyCacheObject key, MvccSnap
*
* @return PendingTree instance.
*/
- PendingEntriesTree pendingTree();
+ public PendingEntriesTree pendingTree();
/**
* Flushes pending update counters closing all possible gaps.
*/
- void finalizeUpdateCountres();
+ public void finalizeUpdateCountres();
+
+ /**
+ * Preload a store into page memory.
+ * @throws IgniteCheckedException If failed.
+ */
+ public void preload() throws IgniteCheckedException;
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 5ce40b0d859a..bb4dfaee124c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -60,6 +60,8 @@
import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
import org.apache.ignite.internal.processors.cache.persistence.RootPage;
import org.apache.ignite.internal.processors.cache.persistence.RowStore;
+import org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
+import org.apache.ignite.internal.processors.cache.persistence.partstate.PartitionRecoverState;
import org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
@@ -258,6 +260,11 @@ protected void initDataStructures() throws IgniteCheckedException {
}
}
+ /** {@inheritDoc} */
+ @Override public long restorePartitionStates(Map<GroupPartitionId, PartitionRecoverState> partitionRecoveryStates) throws IgniteCheckedException {
+ return 0; // No-op.
+ }
+
/** {@inheritDoc} */
@Override public void onKernalStop() {
busyLock.block();
@@ -338,6 +345,11 @@ public CacheDataStore dataStore(int part) {
}
}
+ /** {@inheritDoc} */
+ @Override public void preloadPartition(int p) throws IgniteCheckedException {
+ throw new IgniteCheckedException("Operation only applicable to caches with enabled persistence");
+ }
+
/**
* @param p Partition.
* @return Partition data.
@@ -3012,6 +3024,11 @@ private void afterRowFound(@Nullable CacheDataRow row, KeyCacheObject key) throw
return pendingEntries;
}
+ /** {@inheritDoc} */
+ @Override public void preload() throws IgniteCheckedException {
+ // No-op.
+ }
+
/**
* @param cctx Cache context.
* @param key Key.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
index 776e1cbeb65d..addd189d32c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyImpl.java
@@ -1826,6 +1826,36 @@ private RuntimeException cacheException(Exception e) {
}
}
+ /** {@inheritDoc} */
+ @Override public void preloadPartition(int part) {
+ try {
+ delegate.preloadPartition(part);
+ }
+ catch (IgniteCheckedException e) {
+ throw cacheException(e);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteFuture<Void> preloadPartitionAsync(int part) {
+ try {
+ return (IgniteFuture<Void>)createFuture(delegate.preloadPartitionAsync(part));
+ }
+ catch (IgniteCheckedException e) {
+ throw cacheException(e);
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean localPreloadPartition(int part) {
+ try {
+ return delegate.localPreloadPartition(part);
+ }
+ catch (IgniteCheckedException e) {
+ throw cacheException(e);
+ }
+ }
+
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(ctx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
index cba2228f0323..9d40190434b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
@@ -1818,4 +1818,27 @@ public void localLoadCache(@Nullable IgniteBiPredicate<K, V> p, @Nullable Object
* @return A collection of lost partitions if a cache is in recovery state.
*/
public Collection<Integer> lostPartitions();
+
+ /**
+ * Preload cache partition.
+ * @param part Partition.
+ * @throws IgniteCheckedException If failed.
+ */
+ public void preloadPartition(int part) throws IgniteCheckedException;
+
+ /**
+ * Preload cache partition.
+ * @param part Partition.
+ * @return Future to be completed whenever preloading completes.
+ * @throws IgniteCheckedException If failed.
+ */
+ public IgniteInternalFuture<?> preloadPartitionAsync(int part) throws IgniteCheckedException;
+
+ /**
+ * Preloads cache partition if it exists on local node.
+ * @param part Partition.
+ * @return {@code True} if partition was preloaded, {@code false} if it doesn't belong to local node.
+ * @throws IgniteCheckedException If failed.
+ */
+ public boolean localPreloadPartition(int part) throws IgniteCheckedException;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
index 8f8ceb6d256f..9c4eeee6cced 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObject.java
@@ -48,4 +48,4 @@
* @return Copy of this object with given partition set.
*/
public KeyCacheObject copy(int part);
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StartCacheInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StartCacheInfo.java
new file mode 100644
index 000000000000..a5aea26453ff
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/StartCacheInfo.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Specific cache information for start.
+ */
+public class StartCacheInfo {
+ /** Cache configuration for start. */
+ private final CacheConfiguration startedConf;
+
+ /** Cache descriptor for start. */
+ private final DynamicCacheDescriptor desc;
+
+ /** Near cache configuration for start. */
+ private final @Nullable NearCacheConfiguration reqNearCfg;
+
+ /** Exchange topology version in which starting happened. */
+ private final AffinityTopologyVersion exchTopVer;
+
+ /** Disable started cache after start or not. */
+ private final boolean disabledAfterStart;
+
+ /**
+ * @param desc Cache configuration for start.
+ * @param reqNearCfg Near cache configuration for start.
+ * @param exchTopVer Exchange topology version in which starting happened.
+ * @param disabledAfterStart Disable started cache after start or not.
+ */
+ public StartCacheInfo(DynamicCacheDescriptor desc,
+ NearCacheConfiguration reqNearCfg,
+ AffinityTopologyVersion exchTopVer, boolean disabledAfterStart) {
+ this(desc.cacheConfiguration(), desc, reqNearCfg, exchTopVer, disabledAfterStart);
+ }
+
+ /**
+ * @param conf Cache configuration for start.
+ * @param desc Cache descriptor for start.
+ * @param reqNearCfg Near cache configuration for start.
+ * @param exchTopVer Exchange topology version in which starting happened.
+ * @param disabledAfterStart Disable started cache after start or not.
+ */
+ public StartCacheInfo(CacheConfiguration conf, DynamicCacheDescriptor desc,
+ NearCacheConfiguration reqNearCfg,
+ AffinityTopologyVersion exchTopVer, boolean disabledAfterStart) {
+ startedConf = conf;
+ this.desc = desc;
+ this.reqNearCfg = reqNearCfg;
+ this.exchTopVer = exchTopVer;
+ this.disabledAfterStart = disabledAfterStart;
+ }
+
+ /**
+ * @return Cache configuration for start.
+ */
+ public CacheConfiguration getStartedConfiguration() {
+ return startedConf;
+ }
+
+ /**
+ * @return Cache descriptor for start.
+ */
+ public DynamicCacheDescriptor getCacheDescriptor() {
+ return desc;
+ }
+
+ /**
+ * @return Near cache configuration for start.
+ */
+ @Nullable public NearCacheConfiguration getReqNearCfg() {
+ return reqNearCfg;
+ }
+
+ /**
+ * @return Exchange topology version in which starting happened.
+ */
+ public AffinityTopologyVersion getExchangeTopVer() {
+ return exchTopVer;
+ }
+
+ /**
+ * @return Disable started cache after start or not.
+ */
+ public boolean isDisabledAfterStart() {
+ return disabledAfterStart;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(StartCacheInfo.class, this);
+ }
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
index 7c241068231b..f8012a7de733 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateAckMessage.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
import org.apache.ignite.internal.processors.query.schema.message.SchemaOperationStatusMessage;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.plugin.extensions.communication.Message;
@@ -31,6 +32,7 @@
/**
* WAL state ack message (sent from participant node to coordinator).
*/
+@IgniteCodeGeneratingFail
public class WalStateAckMessage implements Message {
/** */
private static final long serialVersionUID = 0L;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java
index 38450dfec5c7..1c2f6f0e77f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java
@@ -16,8 +16,12 @@
*/
package org.apache.ignite.internal.processors.cache.binary;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map;
import java.util.Queue;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -42,6 +46,7 @@
import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteInClosure;
import org.jetbrains.annotations.Nullable;
@@ -86,6 +91,9 @@
/** */
private final ConcurrentMap<Integer, ClientMetadataRequestFuture> clientReqSyncMap = new ConcurrentHashMap<>();
+ /** */
+ private final ConcurrentMap<SyncKey, GridFutureAdapter<?>> schemaWaitFuts = new ConcurrentHashMap<>();
+
/** */
private volatile boolean stopping;
@@ -206,6 +214,21 @@ void addBinaryMetadataUpdateListener(BinaryMetadataUpdatedListener lsnr) {
return resFut;
}
+ /**
+ * Await specific schema update.
+ * @param typeId Type id.
+ * @param schemaId Schema id.
+ * @return Future which will be completed when schema is received.
+ */
+ GridFutureAdapter<?> awaitSchemaUpdate(int typeId, int schemaId) {
+ GridFutureAdapter<Object> fut = new GridFutureAdapter<>();
+
+ // Use version for schemaId.
+ GridFutureAdapter<?> oldFut = schemaWaitFuts.putIfAbsent(new SyncKey(typeId, schemaId), fut);
+
+ return oldFut == null ? fut : oldFut;
+ }
+
/**
* Allows client node to request latest version of binary metadata for a given typeId from the cluster
* in case client is able to detect that it has obsolete metadata in its local cache.
@@ -259,6 +282,13 @@ private void cancelFutures(MetadataUpdateResult res) {
/** {@inheritDoc} */
@Override public void onCustomEvent(AffinityTopologyVersion topVer, ClusterNode snd, MetadataUpdateProposedMessage msg) {
+ if (log.isDebugEnabled())
+ log.debug("Received MetadataUpdateProposedListener [typeId=" + msg.typeId() +
+ ", typeName=" + msg.metadata().typeName() +
+ ", pendingVer=" + msg.pendingVersion() +
+ ", acceptedVer=" + msg.acceptedVersion() +
+ ", schemasCnt=" + msg.metadata().schemas().size() + ']');
+
int typeId = msg.typeId();
BinaryMetadataHolder holder = metaLocCache.get(typeId);
@@ -277,20 +307,23 @@ private void cancelFutures(MetadataUpdateResult res) {
acceptedVer = 0;
}
- if (log.isDebugEnabled())
- log.debug("Versions are stamped on coordinator" +
- " [typeId=" + typeId +
- ", pendingVer=" + pendingVer +
- ", acceptedVer=" + acceptedVer + "]"
- );
-
msg.pendingVersion(pendingVer);
msg.acceptedVersion(acceptedVer);
BinaryMetadata locMeta = holder != null ? holder.metadata() : null;
try {
- BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(locMeta, msg.metadata());
+ Set<Integer> changedSchemas = new LinkedHashSet<>();
+
+ BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(locMeta, msg.metadata(), changedSchemas);
+
+ if (log.isDebugEnabled())
+ log.debug("Versions are stamped on coordinator" +
+ " [typeId=" + typeId +
+ ", changedSchemas=" + changedSchemas +
+ ", pendingVer=" + pendingVer +
+ ", acceptedVer=" + acceptedVer + "]"
+ );
msg.metadata(mergedMeta);
}
@@ -358,8 +391,10 @@ private void cancelFutures(MetadataUpdateResult res) {
if (!msg.rejected()) {
BinaryMetadata locMeta = holder != null ? holder.metadata() : null;
+ Set<Integer> changedSchemas = new LinkedHashSet<>();
+
try {
- BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(locMeta, msg.metadata());
+ BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(locMeta, msg.metadata(), changedSchemas);
BinaryMetadataHolder newHolder = new BinaryMetadataHolder(mergedMeta, pendingVer, acceptedVer);
@@ -382,7 +417,8 @@ private void cancelFutures(MetadataUpdateResult res) {
}
else {
if (log.isDebugEnabled())
- log.debug("Updated metadata on server node: " + newHolder);
+ log.debug("Updated metadata on server node [holder=" + newHolder +
+ ", changedSchemas=" + changedSchemas + ']');
metaLocCache.put(typeId, newHolder);
}
@@ -463,7 +499,7 @@ private void initSyncFor(int typeId, int pendingVer, final MetadataUpdateResultF
if (oldAcceptedVer >= newAcceptedVer) {
if (log.isDebugEnabled())
log.debug("Marking ack as duplicate [holder=" + holder +
- ", newAcceptedVer: " + newAcceptedVer + ']');
+ ", newAcceptedVer=" + newAcceptedVer + ']');
//this is duplicate ack
msg.duplicated(true);
@@ -481,8 +517,26 @@ private void initSyncFor(int typeId, int pendingVer, final MetadataUpdateResultF
GridFutureAdapter<MetadataUpdateResult> fut = syncMap.get(new SyncKey(typeId, newAcceptedVer));
+ holder = metaLocCache.get(typeId);
+
if (log.isDebugEnabled())
- log.debug("Completing future " + fut + " for " + metaLocCache.get(typeId));
+ log.debug("Completing future " + fut + " for " + holder);
+
+ if (!schemaWaitFuts.isEmpty()) {
+ Iterator<Map.Entry<SyncKey, GridFutureAdapter<?>>> iter = schemaWaitFuts.entrySet().iterator();
+
+ while (iter.hasNext()) {
+ Map.Entry<SyncKey, GridFutureAdapter<?>> entry = iter.next();
+
+ SyncKey key = entry.getKey();
+
+ if (key.typeId() == typeId && holder.metadata().hasSchema(key.version())) {
+ entry.getValue().onDone();
+
+ iter.remove();
+ }
+ }
+ }
if (fut != null)
fut.onDone(MetadataUpdateResult.createSuccessfulResult());
@@ -527,6 +581,11 @@ private void initSyncFor(int typeId, int pendingVer, final MetadataUpdateResultF
void key(SyncKey key) {
this.key = key;
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(MetadataUpdateResultFuture.class, this);
+ }
}
/**
@@ -580,6 +639,11 @@ int version() {
return (typeId == that.typeId) && (ver == that.ver);
}
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(SyncKey.class, this);
+ }
}
/**
@@ -615,7 +679,7 @@ int version() {
binMetaBytes = U.marshal(ctx, metaHolder);
}
catch (IgniteCheckedException e) {
- U.error(log, "Failed to marshal binary metadata for [typeId: " + typeId + "]", e);
+ U.error(log, "Failed to marshal binary metadata for [typeId=" + typeId + ']', e);
resp.markErrorOnRequest();
}
@@ -670,7 +734,8 @@ int version() {
do {
oldHolder = metaLocCache.get(typeId);
- if (oldHolder != null && obsoleteUpdate(
+ // typeId metadata cannot be removed after initialization.
+ if (obsoleteUpdate(
oldHolder.pendingVersion(),
oldHolder.acceptedVersion(),
newHolder.pendingVersion(),
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 4c101b290fd5..137db9f887dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -19,10 +19,14 @@
import java.io.File;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -30,6 +34,8 @@
import org.apache.ignite.IgniteBinary;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.binary.BinaryField;
import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectBuilder;
@@ -39,8 +45,10 @@
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.BinaryConfiguration;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.Event;
import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
import org.apache.ignite.internal.IgniteNodeAttributes;
import org.apache.ignite.internal.UnregisteredBinaryTypeException;
import org.apache.ignite.internal.binary.BinaryContext;
@@ -65,6 +73,7 @@
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheUtils;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -76,7 +85,9 @@
import org.apache.ignite.internal.util.typedef.T1;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiClosure;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteClosure;
import org.apache.ignite.lang.IgniteFuture;
@@ -88,7 +99,11 @@
import org.apache.ignite.thread.IgniteThread;
import org.jetbrains.annotations.Nullable;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_TEST_FEATURES_ENABLED;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_WAIT_SCHEMA_UPDATE;
import static org.apache.ignite.IgniteSystemProperties.getBoolean;
import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
import static org.apache.ignite.internal.GridComponent.DiscoveryDataExchangeType.BINARY_PROC;
@@ -120,6 +135,12 @@
*/
@Nullable private File binaryMetadataFileStoreDir;
+ /** How long to wait for schema if no updates in progress. */
+ private long waitSchemaTimeout = IgniteSystemProperties.getLong(IGNITE_WAIT_SCHEMA_UPDATE, 30_000);
+
+ /** For tests. */
+ public static boolean useTestBinaryCtx = false;
+
/** */
@GridToStringExclude
private IgniteBinary binaries;
@@ -205,7 +226,9 @@ public CacheObjectBinaryProcessorImpl(GridKernalContext ctx) {
BinaryMarshaller bMarsh0 = (BinaryMarshaller)marsh;
- binaryCtx = new BinaryContext(metaHnd, ctx.config(), ctx.log(BinaryContext.class));
+ binaryCtx = useTestBinaryCtx ?
+ new TestBinaryContext(metaHnd, ctx.config(), ctx.log(BinaryContext.class)) :
+ new BinaryContext(metaHnd, ctx.config(), ctx.log(BinaryContext.class));
IgniteUtils.invoke(BinaryMarshaller.class, bMarsh0, "setBinaryContext", binaryCtx, ctx.config());
@@ -452,11 +475,12 @@ public GridBinaryMarshaller marshaller() {
BinaryMetadata oldMeta = metaHolder != null ? metaHolder.metadata() : null;
- BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(oldMeta, newMeta0);
+ Set<Integer> changedSchemas = new LinkedHashSet<>();
+
+ BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(oldMeta, newMeta0, changedSchemas);
- //metadata requested to be added is exactly the same as already presented in the cache
- if (mergedMeta == oldMeta)
- return;
+ if (oldMeta != null && mergedMeta == oldMeta && metaHolder.pendingVersion() == metaHolder.acceptedVersion())
+ return; // Safe to use existing schemas.
if (failIfUnregistered)
throw new UnregisteredBinaryTypeException(
@@ -466,7 +490,24 @@ public GridBinaryMarshaller marshaller() {
"dev-list.",
typeId, mergedMeta);
- MetadataUpdateResult res = transport.requestMetadataUpdate(mergedMeta).get();
+ long t0 = System.nanoTime();
+
+ GridFutureAdapter<MetadataUpdateResult> fut = transport.requestMetadataUpdate(mergedMeta);
+
+ MetadataUpdateResult res = fut.get();
+
+ if (log.isDebugEnabled()) {
+ IgniteInternalTx tx = ctx.cache().context().tm().tx();
+
+ log.debug("Completed metadata update [typeId=" + typeId +
+ ", typeName=" + newMeta.typeName() +
+ ", changedSchemas=" + changedSchemas +
+ ", waitTime=" + MILLISECONDS.convert(System.nanoTime() - t0, NANOSECONDS) + "ms" +
+ ", holder=" + metaHolder +
+ ", fut=" + fut +
+ ", tx=" + CU.txString(tx) +
+ ']');
+ }
assert res != null;
@@ -541,9 +582,9 @@ public GridBinaryMarshaller marshaller() {
if (log.isDebugEnabled() && !fut.isDone())
log.debug("Waiting for update for" +
- " [typeId=" + typeId +
- ", pendingVer=" + holder.pendingVersion() +
- ", acceptedVer=" + holder.acceptedVersion() + "]");
+ " [typeId=" + typeId +
+ ", pendingVer=" + holder.pendingVersion() +
+ ", acceptedVer=" + holder.acceptedVersion() + "]");
try {
fut.get();
@@ -565,40 +606,99 @@ public GridBinaryMarshaller marshaller() {
if (ctx.clientNode()) {
if (holder == null || !holder.metadata().hasSchema(schemaId)) {
+ if (log.isDebugEnabled())
+ log.debug("Waiting for client metadata update" +
+ " [typeId=" + typeId
+ + ", schemaId=" + schemaId
+ + ", pendingVer=" + (holder == null ? "NA" : holder.pendingVersion())
+ + ", acceptedVer=" + (holder == null ? "NA" :holder.acceptedVersion()) + ']');
+
try {
transport.requestUpToDateMetadata(typeId).get();
-
- holder = metadataLocCache.get(typeId);
}
catch (IgniteCheckedException ignored) {
// No-op.
}
+
+ holder = metadataLocCache.get(typeId);
+
+ if (log.isDebugEnabled())
+ log.debug("Finished waiting for client metadata update" +
+ " [typeId=" + typeId
+ + ", schemaId=" + schemaId
+ + ", pendingVer=" + (holder == null ? "NA" : holder.pendingVersion())
+ + ", acceptedVer=" + (holder == null ? "NA" :holder.acceptedVersion()) + ']');
}
}
- else if (holder != null) {
- if (IgniteThread.current() instanceof IgniteDiscoveryThread)
+ else {
+ if (holder != null && IgniteThread.current() instanceof IgniteDiscoveryThread)
return holder.metadata().wrap(binaryCtx);
+ else if (holder != null && (holder.pendingVersion() - holder.acceptedVersion() > 0)) {
+ if (log.isDebugEnabled())
+ log.debug("Waiting for metadata update" +
+ " [typeId=" + typeId
+ + ", schemaId=" + schemaId
+ + ", pendingVer=" + holder.pendingVersion()
+ + ", acceptedVer=" + holder.acceptedVersion() + ']');
- if (holder.pendingVersion() - holder.acceptedVersion() > 0) {
- GridFutureAdapter<MetadataUpdateResult> fut = transport.awaitMetadataUpdate(
- typeId,
- holder.pendingVersion());
+ long t0 = System.nanoTime();
- if (log.isDebugEnabled() && !fut.isDone())
- log.debug("Waiting for update for" +
- " [typeId=" + typeId
- + ", schemaId=" + schemaId
- + ", pendingVer=" + holder.pendingVersion()
- + ", acceptedVer=" + holder.acceptedVersion() + "]");
+ GridFutureAdapter<MetadataUpdateResult> fut = transport.awaitMetadataUpdate(
+ typeId,
+ holder.pendingVersion());
try {
fut.get();
}
+ catch (IgniteCheckedException e) {
+ log.error("Failed to wait for metadata update [typeId=" + typeId + ", schemaId=" + schemaId + ']', e);
+ }
+
+ if (log.isDebugEnabled())
+ log.debug("Finished waiting for metadata update" +
+ " [typeId=" + typeId
+ + ", waitTime=" + NANOSECONDS.convert(System.nanoTime() - t0, MILLISECONDS) + "ms"
+ + ", schemaId=" + schemaId
+ + ", pendingVer=" + holder.pendingVersion()
+ + ", acceptedVer=" + holder.acceptedVersion() + ']');
+
+ holder = metadataLocCache.get(typeId);
+ }
+ else if (holder == null || !holder.metadata().hasSchema(schemaId)) {
+ // Last resort waiting.
+ U.warn(log,
+ "Schema is missing while no metadata updates are in progress " +
+ "(will wait for schema update within timeout defined by IGNITE_BINARY_META_UPDATE_TIMEOUT system property)" +
+ " [typeId=" + typeId
+ + ", missingSchemaId=" + schemaId
+ + ", pendingVer=" + (holder == null ? "NA" : holder.pendingVersion())
+ + ", acceptedVer=" + (holder == null ? "NA" : holder.acceptedVersion())
+ + ", binMetaUpdateTimeout=" + waitSchemaTimeout +']');
+
+ long t0 = System.nanoTime();
+
+ GridFutureAdapter<?> fut = transport.awaitSchemaUpdate(typeId, schemaId);
+
+ try {
+ fut.get(waitSchemaTimeout);
+ }
+ catch (IgniteFutureTimeoutCheckedException e) {
+ log.error("Timed out while waiting for schema update [typeId=" + typeId + ", schemaId=" +
+ schemaId + ']');
+ }
catch (IgniteCheckedException ignored) {
// No-op.
}
holder = metadataLocCache.get(typeId);
+
+ if (log.isDebugEnabled() && holder != null && holder.metadata().hasSchema(schemaId))
+ log.debug("Found the schema after wait" +
+ " [typeId=" + typeId
+ + ", waitTime=" + NANOSECONDS.convert(System.nanoTime() - t0, MILLISECONDS) + "ms"
+ + ", schemaId=" + schemaId
+ + ", pendingVer=" + holder.pendingVersion()
+ + ", acceptedVer=" + holder.acceptedVersion() + ']');
}
}
@@ -903,7 +1003,7 @@ else if (type == BinaryObjectImpl.TYPE_BINARY_ENUM)
if ((res = validateBinaryConfiguration(rmtNode)) != null)
return res;
- return validateBinaryMetadata(rmtNode.id(), (Map<Integer, BinaryMetadataHolder>) discoData.joiningNodeData());
+ return validateBinaryMetadata(rmtNode.id(), (Map<Integer, BinaryMetadataHolder>)discoData.joiningNodeData());
}
/** */
@@ -1070,4 +1170,75 @@ private IgniteNodeValidationResult validateBinaryMetadata(UUID rmtNodeId, Map<In
public void setBinaryMetadataFileStoreDir(@Nullable File binaryMetadataFileStoreDir) {
this.binaryMetadataFileStoreDir = binaryMetadataFileStoreDir;
}
+
+ /** */
+ public static class TestBinaryContext extends BinaryContext {
+ /** */
+ private List<TestBinaryContextListener> listeners;
+
+ /**
+ * @param metaHnd Meta handler.
+ * @param igniteCfg Ignite config.
+ * @param log Logger.
+ */
+ public TestBinaryContext(BinaryMetadataHandler metaHnd, IgniteConfiguration igniteCfg,
+ IgniteLogger log) {
+ super(metaHnd, igniteCfg, log);
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public BinaryType metadata(int typeId) throws BinaryObjectException {
+ BinaryType metadata = super.metadata(typeId);
+
+ if (listeners != null) {
+ for (TestBinaryContextListener listener : listeners)
+ listener.onAfterMetadataRequest(typeId, metadata);
+ }
+
+ return metadata;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void updateMetadata(int typeId, BinaryMetadata meta,
+ boolean failIfUnregistered) throws BinaryObjectException {
+ if (listeners != null) {
+ for (TestBinaryContextListener listener : listeners)
+ listener.onBeforeMetadataUpdate(typeId, meta);
+ }
+
+ super.updateMetadata(typeId, meta, failIfUnregistered);
+ }
+
+ /** */
+ public interface TestBinaryContextListener {
+ /**
+ * @param typeId Type id.
+ * @param type Type.
+ */
+ void onAfterMetadataRequest(int typeId, BinaryType type);
+
+ /**
+ * @param typeId Type id.
+ * @param metadata Metadata.
+ */
+ void onBeforeMetadataUpdate(int typeId, BinaryMetadata metadata);
+ }
+
+ /**
+ * @param lsnr Listener.
+ */
+ public void addListener(TestBinaryContextListener lsnr) {
+ if (listeners == null)
+ listeners = new ArrayList<>();
+
+ if (!listeners.contains(lsnr))
+ listeners.add(lsnr);
+ }
+
+ /** */
+ public void clearAllListener() {
+ if (listeners != null)
+ listeners.clear();
+ }
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
index c092132192c7..c420aeb4f049 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
@@ -213,37 +213,37 @@ public GridCacheVersion version(int idx) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeCollection("nearVers", nearVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 6:
- if (!writer.writeMessage("topVer", topVer))
+ case 7:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeLong("ttl", ttl))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeCollection("vers", vers, MessageCollectionItemType.MSG))
return false;
@@ -265,7 +265,7 @@ public GridCacheVersion version(int idx) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -273,7 +273,7 @@ public GridCacheVersion version(int idx) {
reader.incrementState();
- case 4:
+ case 5:
nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -281,7 +281,7 @@ public GridCacheVersion version(int idx) {
reader.incrementState();
- case 5:
+ case 6:
nearVers = reader.readCollection("nearVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -289,15 +289,15 @@ public GridCacheVersion version(int idx) {
reader.incrementState();
- case 6:
- topVer = reader.readMessage("topVer");
+ case 7:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 7:
+ case 8:
ttl = reader.readLong("ttl");
if (!reader.isLastRead())
@@ -305,7 +305,7 @@ public GridCacheVersion version(int idx) {
reader.incrementState();
- case 8:
+ case 9:
vers = reader.readCollection("vers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -325,7 +325,7 @@ public GridCacheVersion version(int idx) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 10;
}
/** {@inheritDoc} */
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 45d1f1a31bf5..90ce2344d77a 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
@@ -148,37 +148,37 @@ public boolean system() {
}
switch (writer.state()) {
- case 7:
+ case 8:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeBoolean("nearTxCheck", nearTxCheck))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeBoolean("sys", sys))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeInt("txNum", txNum))
return false;
@@ -200,7 +200,7 @@ public boolean system() {
return false;
switch (reader.state()) {
- case 7:
+ case 8:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -208,7 +208,7 @@ public boolean system() {
reader.incrementState();
- case 8:
+ case 9:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -216,7 +216,7 @@ public boolean system() {
reader.incrementState();
- case 9:
+ case 10:
nearTxCheck = reader.readBoolean("nearTxCheck");
if (!reader.isLastRead())
@@ -224,7 +224,7 @@ public boolean system() {
reader.incrementState();
- case 10:
+ case 11:
nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
@@ -232,7 +232,7 @@ public boolean system() {
reader.incrementState();
- case 11:
+ case 12:
sys = reader.readBoolean("sys");
if (!reader.isLastRead())
@@ -240,7 +240,7 @@ public boolean system() {
reader.incrementState();
- case 12:
+ case 13:
txNum = reader.readInt("txNum");
if (!reader.isLastRead())
@@ -260,7 +260,7 @@ public boolean system() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 13;
+ return 14;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
index a9ac26ba4b49..1ef44a8f21f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
@@ -129,19 +129,19 @@ public boolean success() {
}
switch (writer.state()) {
- case 7:
+ case 8:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeBoolean("success", success))
return false;
@@ -163,7 +163,7 @@ public boolean success() {
return false;
switch (reader.state()) {
- case 7:
+ case 8:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -171,7 +171,7 @@ public boolean success() {
reader.incrementState();
- case 8:
+ case 9:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -179,7 +179,7 @@ public boolean success() {
reader.incrementState();
- case 9:
+ case 10:
success = reader.readBoolean("success");
if (!reader.isLastRead())
@@ -199,7 +199,7 @@ public boolean success() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 11;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
index fc209aaa956f..8536e480489b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
@@ -161,25 +161,25 @@ int keysCount() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByteArray("candsByIdxBytes", candsByIdxBytes))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeCollection("committedVers", committedVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeCollection("rolledbackVers", rolledbackVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeMessage("ver", ver))
return false;
@@ -201,7 +201,7 @@ int keysCount() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
candsByIdxBytes = reader.readByteArray("candsByIdxBytes");
if (!reader.isLastRead())
@@ -209,7 +209,7 @@ int keysCount() {
reader.incrementState();
- case 4:
+ case 5:
committedVers = reader.readCollection("committedVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -217,7 +217,7 @@ int keysCount() {
reader.incrementState();
- case 5:
+ case 6:
rolledbackVers = reader.readCollection("rolledbackVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -225,7 +225,7 @@ int keysCount() {
reader.incrementState();
- case 6:
+ case 7:
ver = reader.readMessage("ver");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 25a557c32481..ca78763fc214 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -366,79 +366,79 @@ public long timeout() {
}
switch (writer.state()) {
- case 7:
+ case 8:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeBoolean("isInTx", isInTx))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeBoolean("isInvalidate", isInvalidate))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeBoolean("isRead", isRead))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeUuid("nodeId", nodeId))
return false;
writer.incrementState();
- case 16:
+ case 17:
if (!writer.writeBooleanArray("retVals", retVals))
return false;
writer.incrementState();
- case 17:
+ case 18:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 18:
+ case 19:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 19:
+ case 20:
if (!writer.writeInt("txSize", txSize))
return false;
@@ -460,7 +460,7 @@ public long timeout() {
return false;
switch (reader.state()) {
- case 7:
+ case 8:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -468,7 +468,7 @@ public long timeout() {
reader.incrementState();
- case 8:
+ case 9:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -476,7 +476,7 @@ public long timeout() {
reader.incrementState();
- case 9:
+ case 10:
isInTx = reader.readBoolean("isInTx");
if (!reader.isLastRead())
@@ -484,7 +484,7 @@ public long timeout() {
reader.incrementState();
- case 10:
+ case 11:
isInvalidate = reader.readBoolean("isInvalidate");
if (!reader.isLastRead())
@@ -492,7 +492,7 @@ public long timeout() {
reader.incrementState();
- case 11:
+ case 12:
isRead = reader.readBoolean("isRead");
if (!reader.isLastRead())
@@ -500,7 +500,7 @@ public long timeout() {
reader.incrementState();
- case 12:
+ case 13:
byte isolationOrd;
isolationOrd = reader.readByte("isolation");
@@ -512,7 +512,7 @@ public long timeout() {
reader.incrementState();
- case 13:
+ case 14:
keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -520,7 +520,7 @@ public long timeout() {
reader.incrementState();
- case 14:
+ case 15:
nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
@@ -528,7 +528,7 @@ public long timeout() {
reader.incrementState();
- case 15:
+ case 16:
nodeId = reader.readUuid("nodeId");
if (!reader.isLastRead())
@@ -536,7 +536,7 @@ public long timeout() {
reader.incrementState();
- case 16:
+ case 17:
retVals = reader.readBooleanArray("retVals");
if (!reader.isLastRead())
@@ -544,7 +544,7 @@ public long timeout() {
reader.incrementState();
- case 17:
+ case 18:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -552,7 +552,7 @@ public long timeout() {
reader.incrementState();
- case 18:
+ case 19:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -560,7 +560,7 @@ public long timeout() {
reader.incrementState();
- case 19:
+ case 20:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -580,7 +580,7 @@ public long timeout() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 20;
+ return 21;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
index 4b21896b1c05..2d4de9c8156e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -221,19 +221,19 @@ protected int valuesSize() {
}
switch (writer.state()) {
- case 7:
+ case 8:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG))
return false;
@@ -255,7 +255,7 @@ protected int valuesSize() {
return false;
switch (reader.state()) {
- case 7:
+ case 8:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -263,7 +263,7 @@ protected int valuesSize() {
reader.incrementState();
- case 8:
+ case 9:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -271,7 +271,7 @@ protected int valuesSize() {
reader.incrementState();
- case 9:
+ case 10:
vals = reader.readCollection("vals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -291,7 +291,7 @@ protected int valuesSize() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 11;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index ea9336b2a55e..a1af470c56de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -325,85 +325,85 @@ public boolean replyRequired() {
}
switch (writer.state()) {
- case 7:
+ case 8:
if (!writer.writeMessage("baseVer", baseVer))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeBoolean("commit", commit))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeMessage("commitVer", commitVer))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeBoolean("invalidate", invalidate))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeByte("plc", plc))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1))
return false;
writer.incrementState();
- case 16:
+ case 17:
if (!writer.writeBoolean("sys", sys))
return false;
writer.incrementState();
- case 17:
+ case 18:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 18:
+ case 19:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 19:
- if (!writer.writeMessage("topVer", topVer))
+ case 20:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 20:
+ case 21:
if (!writer.writeInt("txSize", txSize))
return false;
@@ -425,7 +425,7 @@ public boolean replyRequired() {
return false;
switch (reader.state()) {
- case 7:
+ case 8:
baseVer = reader.readMessage("baseVer");
if (!reader.isLastRead())
@@ -433,7 +433,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 8:
+ case 9:
commit = reader.readBoolean("commit");
if (!reader.isLastRead())
@@ -441,7 +441,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 9:
+ case 10:
commitVer = reader.readMessage("commitVer");
if (!reader.isLastRead())
@@ -449,7 +449,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 10:
+ case 11:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -457,7 +457,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 11:
+ case 12:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -465,7 +465,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 12:
+ case 13:
invalidate = reader.readBoolean("invalidate");
if (!reader.isLastRead())
@@ -473,7 +473,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 13:
+ case 14:
plc = reader.readByte("plc");
if (!reader.isLastRead())
@@ -481,7 +481,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 14:
+ case 15:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -489,7 +489,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 15:
+ case 16:
byte syncModeOrd;
syncModeOrd = reader.readByte("syncMode");
@@ -501,7 +501,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 16:
+ case 17:
sys = reader.readBoolean("sys");
if (!reader.isLastRead())
@@ -509,7 +509,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 17:
+ case 18:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -517,7 +517,7 @@ public boolean replyRequired() {
reader.incrementState();
- case 18:
+ case 19:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -525,15 +525,15 @@ public boolean replyRequired() {
reader.incrementState();
- case 19:
- topVer = reader.readMessage("topVer");
+ case 20:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 20:
+ case 21:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -553,7 +553,7 @@ public boolean replyRequired() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 21;
+ return 22;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
index c36e6336d4f7..5fdf970bc0f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishResponse.java
@@ -145,25 +145,25 @@ public IgniteUuid futureId() {
}
switch (writer.state()) {
- case 2:
+ case 3:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 3:
+ case 4:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeInt("part", part))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeMessage("txId", txId))
return false;
@@ -185,7 +185,7 @@ public IgniteUuid futureId() {
return false;
switch (reader.state()) {
- case 2:
+ case 3:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -193,7 +193,7 @@ public IgniteUuid futureId() {
reader.incrementState();
- case 3:
+ case 4:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -201,7 +201,7 @@ public IgniteUuid futureId() {
reader.incrementState();
- case 4:
+ case 5:
part = reader.readInt("part");
if (!reader.isLastRead())
@@ -209,7 +209,7 @@ public IgniteUuid futureId() {
reader.incrementState();
- case 5:
+ case 6:
txId = reader.readMessage("txId");
if (!reader.isLastRead())
@@ -229,7 +229,7 @@ public IgniteUuid futureId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 6;
+ return 7;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index a5aa0d838935..96eeee20b4b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -505,79 +505,79 @@ private boolean isFlag(int mask) {
}
switch (writer.state()) {
- case 7:
+ case 8:
if (!writer.writeByte("concurrency", concurrency != null ? (byte)concurrency.ordinal() : -1))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeCollection("dhtVerKeys", dhtVerKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeCollection("dhtVerVals", dhtVerVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeByte("plc", plc))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeCollection("reads", reads, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 16:
+ case 17:
if (!writer.writeMap("txNodesMsg", txNodesMsg, MessageCollectionItemType.UUID, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 17:
+ case 18:
if (!writer.writeInt("txSize", txSize))
return false;
writer.incrementState();
- case 18:
+ case 19:
if (!writer.writeMessage("writeVer", writeVer))
return false;
writer.incrementState();
- case 19:
+ case 20:
if (!writer.writeCollection("writes", writes, MessageCollectionItemType.MSG))
return false;
@@ -599,7 +599,7 @@ private boolean isFlag(int mask) {
return false;
switch (reader.state()) {
- case 7:
+ case 8:
byte concurrencyOrd;
concurrencyOrd = reader.readByte("concurrency");
@@ -611,7 +611,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 8:
+ case 9:
dhtVerKeys = reader.readCollection("dhtVerKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -619,7 +619,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 9:
+ case 10:
dhtVerVals = reader.readCollection("dhtVerVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -627,7 +627,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 10:
+ case 11:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -635,7 +635,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 11:
+ case 12:
byte isolationOrd;
isolationOrd = reader.readByte("isolation");
@@ -647,7 +647,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 12:
+ case 13:
plc = reader.readByte("plc");
if (!reader.isLastRead())
@@ -655,7 +655,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 13:
+ case 14:
reads = reader.readCollection("reads", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -663,7 +663,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 14:
+ case 15:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -671,7 +671,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 15:
+ case 16:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -679,7 +679,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 16:
+ case 17:
txNodesMsg = reader.readMap("txNodesMsg", MessageCollectionItemType.UUID, MessageCollectionItemType.MSG, false);
if (!reader.isLastRead())
@@ -687,7 +687,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 17:
+ case 18:
txSize = reader.readInt("txSize");
if (!reader.isLastRead())
@@ -695,7 +695,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 18:
+ case 19:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
@@ -703,7 +703,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 19:
+ case 20:
writes = reader.readCollection("writes", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -723,7 +723,7 @@ private boolean isFlag(int mask) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 20;
+ return 21;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
index 58e94926ca9e..c26880e10fed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
@@ -178,19 +178,19 @@ public boolean isRollback() {
}
switch (writer.state()) {
- case 7:
+ case 8:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeInt("part", part))
return false;
@@ -212,7 +212,7 @@ public boolean isRollback() {
return false;
switch (reader.state()) {
- case 7:
+ case 8:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -220,7 +220,7 @@ public boolean isRollback() {
reader.incrementState();
- case 8:
+ case 9:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -228,7 +228,7 @@ public boolean isRollback() {
reader.incrementState();
- case 9:
+ case 10:
part = reader.readInt("part");
if (!reader.isLastRead())
@@ -248,7 +248,7 @@ public boolean isRollback() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 11;
}
/** {@inheritDoc} */
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 e095c0808706..51e6e66e76f6 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
@@ -52,7 +52,6 @@
import org.apache.ignite.internal.processors.cache.GridCacheUpdateTxResult;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry;
-import org.apache.ignite.internal.processors.cache.persistence.StorageException;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
@@ -509,333 +508,302 @@ private void commitIfLocked() throws IgniteCheckedException {
batchStoreCommit(writeMap().values());
- try {
- // Node that for near transactions we grab all entries.
- for (IgniteTxEntry txEntry : entries) {
- GridCacheContext cacheCtx = txEntry.context();
+ // Node that for near transactions we grab all entries.
+ for (IgniteTxEntry txEntry : entries) {
+ GridCacheContext cacheCtx = txEntry.context();
- boolean replicate = cacheCtx.isDrEnabled();
+ boolean replicate = cacheCtx.isDrEnabled();
+ while (true) {
try {
- while (true) {
- try {
- GridCacheEntryEx cached = txEntry.cached();
+ GridCacheEntryEx cached = txEntry.cached();
- if (cached == null)
- txEntry.cached(cached = cacheCtx.cache().entryEx(txEntry.key(), topologyVersion()));
+ if (cached == null)
+ txEntry.cached(cached = cacheCtx.cache().entryEx(txEntry.key(), topologyVersion()));
- if (near() && cacheCtx.dr().receiveEnabled()) {
- cached.markObsolete(xidVer);
+ if (near() && cacheCtx.dr().receiveEnabled()) {
+ cached.markObsolete(xidVer);
- break;
- }
+ break;
+ }
- GridNearCacheEntry nearCached = null;
+ GridNearCacheEntry nearCached = null;
- if (updateNearCache(cacheCtx, txEntry.key(), topVer))
- nearCached = cacheCtx.dht().near().peekExx(txEntry.key());
+ if (updateNearCache(cacheCtx, txEntry.key(), topVer))
+ nearCached = cacheCtx.dht().near().peekExx(txEntry.key());
- if (!F.isEmpty(txEntry.entryProcessors()))
- txEntry.cached().unswap(false);
+ if (!F.isEmpty(txEntry.entryProcessors()))
+ txEntry.cached().unswap(false);
- IgniteBiTuple<GridCacheOperation, CacheObject> res =
- applyTransformClosures(txEntry, false, ret);
+ IgniteBiTuple<GridCacheOperation, CacheObject> res =
+ applyTransformClosures(txEntry, false, ret);
- GridCacheOperation op = res.get1();
- CacheObject val = res.get2();
+ GridCacheOperation op = res.get1();
+ CacheObject val = res.get2();
- GridCacheVersion explicitVer = txEntry.conflictVersion();
+ GridCacheVersion explicitVer = txEntry.conflictVersion();
- if (explicitVer == null)
- explicitVer = writeVersion();
+ if (explicitVer == null)
+ explicitVer = writeVersion();
- if (txEntry.ttl() == CU.TTL_ZERO)
- op = DELETE;
+ if (txEntry.ttl() == CU.TTL_ZERO)
+ op = DELETE;
- boolean conflictNeedResolve = cacheCtx.conflictNeedResolve();
+ boolean conflictNeedResolve = cacheCtx.conflictNeedResolve();
- GridCacheVersionConflictContext conflictCtx = null;
+ GridCacheVersionConflictContext conflictCtx = null;
- if (conflictNeedResolve) {
- IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContext>
- drRes = conflictResolve(op, txEntry, val, explicitVer, cached);
+ if (conflictNeedResolve) {
+ IgniteBiTuple<GridCacheOperation, GridCacheVersionConflictContext>
+ drRes = conflictResolve(op, txEntry, val, explicitVer, cached);
- assert drRes != null;
+ assert drRes != null;
- conflictCtx = drRes.get2();
+ conflictCtx = drRes.get2();
- if (conflictCtx.isUseOld())
- op = NOOP;
- else if (conflictCtx.isUseNew()) {
- txEntry.ttl(conflictCtx.ttl());
- txEntry.conflictExpireTime(conflictCtx.expireTime());
- }
- else if (conflictCtx.isMerge()) {
- op = drRes.get1();
- val = txEntry.context().toCacheObject(conflictCtx.mergeValue());
- explicitVer = writeVersion();
+ if (conflictCtx.isUseOld())
+ op = NOOP;
+ else if (conflictCtx.isUseNew()) {
+ txEntry.ttl(conflictCtx.ttl());
+ txEntry.conflictExpireTime(conflictCtx.expireTime());
+ }
+ else if (conflictCtx.isMerge()) {
+ op = drRes.get1();
+ val = txEntry.context().toCacheObject(conflictCtx.mergeValue());
+ explicitVer = writeVersion();
- txEntry.ttl(conflictCtx.ttl());
- txEntry.conflictExpireTime(conflictCtx.expireTime());
- }
- }
- else
- // Nullify explicit version so that innerSet/innerRemove will work as usual.
- explicitVer = null;
-
- GridCacheVersion dhtVer = cached.isNear() ? writeVersion() : null;
-
- if (!near() && cacheCtx.group().persistenceEnabled() && cacheCtx.group().walEnabled() &&
- op != NOOP && op != RELOAD && (op != READ || cctx.snapshot().needTxReadLogging())) {
- if (dataEntries == null)
- dataEntries = new ArrayList<>(entries.size());
-
- dataEntries.add(
- new T2<>(
- new DataEntry(
- cacheCtx.cacheId(),
- txEntry.key(),
- val,
- op,
- nearXidVersion(),
- writeVersion(),
- 0,
- txEntry.key().partition(),
- txEntry.updateCounter()
- ),
- txEntry
- )
- );
- }
+ txEntry.ttl(conflictCtx.ttl());
+ txEntry.conflictExpireTime(conflictCtx.expireTime());
+ }
+ }
+ else
+ // Nullify explicit version so that innerSet/innerRemove will work as usual.
+ explicitVer = null;
+
+ GridCacheVersion dhtVer = cached.isNear() ? writeVersion() : null;
+
+ if (!near() && cacheCtx.group().persistenceEnabled() && cacheCtx.group().walEnabled() &&
+ op != NOOP && op != RELOAD && (op != READ || cctx.snapshot().needTxReadLogging())) {
+ if (dataEntries == null)
+ dataEntries = new ArrayList<>(entries.size());
+
+ dataEntries.add(
+ new T2<>(
+ new DataEntry(
+ cacheCtx.cacheId(),
+ txEntry.key(),
+ val,
+ op,
+ nearXidVersion(),
+ writeVersion(),
+ 0,
+ txEntry.key().partition(),
+ txEntry.updateCounter()
+ ),
+ txEntry
+ )
+ );
+ }
- if (op == CREATE || op == UPDATE) {
- // Invalidate only for near nodes (backups cannot be invalidated).
- if (isSystemInvalidate() || (isInvalidate() && cacheCtx.isNear()))
- cached.innerRemove(this,
- eventNodeId(),
- nodeId,
- false,
- true,
- true,
- txEntry.keepBinary(),
- txEntry.hasOldValue(),
- txEntry.oldValue(),
- topVer,
- null,
- replicate ? DR_BACKUP : DR_NONE,
- near() ? null : explicitVer,
- CU.subjectId(this, cctx),
- resolveTaskName(),
- dhtVer,
- txEntry.updateCounter(),
- mvccSnapshot());
- else {
- assert val != null : txEntry;
-
- GridCacheUpdateTxResult updRes = cached.innerSet(this,
- eventNodeId(),
- nodeId,
- val,
- false,
- false,
- txEntry.ttl(),
- true,
- true,
- txEntry.keepBinary(),
- txEntry.hasOldValue(),
- txEntry.oldValue(),
- topVer,
- null,
- replicate ? DR_BACKUP : DR_NONE,
- txEntry.conflictExpireTime(),
- near() ? null : explicitVer,
- CU.subjectId(this, cctx),
- resolveTaskName(),
- dhtVer,
- txEntry.updateCounter(),
- mvccSnapshot());
-
- txEntry.updateCounter(updRes.updateCounter());
-
- if (updRes.loggedPointer() != null)
- ptr = updRes.loggedPointer();
-
- // Keep near entry up to date.
- if (nearCached != null) {
- CacheObject val0 = cached.valueBytes();
-
- nearCached.updateOrEvict(xidVer,
- val0,
- cached.expireTime(),
- cached.ttl(),
- nodeId,
- topVer);
- }
- }
- }
- else if (op == DELETE) {
- GridCacheUpdateTxResult updRes = cached.innerRemove(this,
- eventNodeId(),
+ if (op == CREATE || op == UPDATE) {
+ // Invalidate only for near nodes (backups cannot be invalidated).
+ if (isSystemInvalidate() || (isInvalidate() && cacheCtx.isNear()))
+ cached.innerRemove(this,
+ eventNodeId(),
+ nodeId,
+ false,
+ true,
+ true,
+ txEntry.keepBinary(),
+ txEntry.hasOldValue(),
+ txEntry.oldValue(),
+ topVer,
+ null,
+ replicate ? DR_BACKUP : DR_NONE,
+ near() ? null : explicitVer,
+ CU.subjectId(this, cctx),
+ resolveTaskName(),
+ dhtVer,
+ txEntry.updateCounter(),
+ mvccSnapshot());
+ else {
+ assert val != null : txEntry;
+
+ GridCacheUpdateTxResult updRes = cached.innerSet(this,
+ eventNodeId(),
+ nodeId,
+ val,
+ false,
+ false,
+ txEntry.ttl(),
+ true,
+ true,
+ txEntry.keepBinary(),
+ txEntry.hasOldValue(),
+ txEntry.oldValue(),
+ topVer,
+ null,
+ replicate ? DR_BACKUP : DR_NONE,
+ txEntry.conflictExpireTime(),
+ near() ? null : explicitVer,
+ CU.subjectId(this, cctx),
+ resolveTaskName(),
+ dhtVer,
+ txEntry.updateCounter(),
+ mvccSnapshot());
+
+ txEntry.updateCounter(updRes.updateCounter());
+
+ if (updRes.loggedPointer() != null)
+ ptr = updRes.loggedPointer();
+
+ // Keep near entry up to date.
+ if (nearCached != null) {
+ CacheObject val0 = cached.valueBytes();
+
+ nearCached.updateOrEvict(xidVer,
+ val0,
+ cached.expireTime(),
+ cached.ttl(),
nodeId,
- false,
- true,
- true,
- txEntry.keepBinary(),
- txEntry.hasOldValue(),
- txEntry.oldValue(),
- topVer,
- null,
- replicate ? DR_BACKUP : DR_NONE,
- near() ? null : explicitVer,
- CU.subjectId(this, cctx),
- resolveTaskName(),
- dhtVer,
- txEntry.updateCounter(),
- mvccSnapshot());
-
- txEntry.updateCounter(updRes.updateCounter());
-
- if (updRes.loggedPointer() != null)
- ptr = updRes.loggedPointer();
-
- // Keep near entry up to date.
- if (nearCached != null)
- nearCached.updateOrEvict(xidVer, null, 0, 0, nodeId, topVer);
- }
- else if (op == RELOAD) {
- CacheObject reloaded = cached.innerReload();
-
- if (nearCached != null) {
- nearCached.innerReload();
-
- nearCached.updateOrEvict(cached.version(),
- reloaded,
- cached.expireTime(),
- cached.ttl(),
- nodeId,
- topVer);
- }
+ topVer);
}
- else if (op == READ) {
- assert near();
-
- if (log.isDebugEnabled())
- log.debug("Ignoring READ entry when committing: " + txEntry);
- }
- // No-op.
- else {
- if (conflictCtx == null || !conflictCtx.isUseOld()) {
- if (txEntry.ttl() != CU.TTL_NOT_CHANGED)
- cached.updateTtl(null, txEntry.ttl());
-
- if (nearCached != null) {
- CacheObject val0 = cached.valueBytes();
-
- nearCached.updateOrEvict(xidVer,
- val0,
- cached.expireTime(),
- cached.ttl(),
- nodeId,
- topVer);
- }
- }
- }
-
- // Assert after setting values as we want to make sure
- // that if we replaced removed entries.
- assert
- txEntry.op() == READ || onePhaseCommit() ||
- // If candidate is not there, then lock was explicit
- // and we simply allow the commit to proceed.
- !cached.hasLockCandidateUnsafe(xidVer) || cached.lockedByUnsafe(xidVer) :
- "Transaction does not own lock for commit [entry=" + cached +
- ", tx=" + this + ']';
-
- // Break out of while loop.
- break;
- }
- catch (GridCacheEntryRemovedException ignored) {
- if (log.isDebugEnabled())
- log.debug("Attempting to commit a removed entry (will retry): " + txEntry);
-
- // Renew cached entry.
- txEntry.cached(cacheCtx.cache().entryEx(txEntry.key(), topologyVersion()));
}
}
- }
- catch (Throwable ex) {
- boolean isNodeStopping = X.hasCause(ex, NodeStoppingException.class);
- boolean hasInvalidEnvironmentIssue = X.hasCause(ex, InvalidEnvironmentException.class);
-
- // In case of error, we still make the best effort to commit,
- // as there is no way to rollback at this point.
- err = new IgniteTxHeuristicCheckedException("Commit produced a runtime exception " +
- "(all transaction entries will be invalidated): " + CU.txString(this), ex);
-
- if (isNodeStopping) {
- U.warn(log, "Failed to commit transaction, node is stopping [tx=" + this +
- ", err=" + ex + ']');
- }
- else if (hasInvalidEnvironmentIssue) {
- U.warn(log, "Failed to commit transaction, node is in invalid state and will be stopped [tx=" + this +
- ", err=" + ex + ']');
+ else if (op == DELETE) {
+ GridCacheUpdateTxResult updRes = cached.innerRemove(this,
+ eventNodeId(),
+ nodeId,
+ false,
+ true,
+ true,
+ txEntry.keepBinary(),
+ txEntry.hasOldValue(),
+ txEntry.oldValue(),
+ topVer,
+ null,
+ replicate ? DR_BACKUP : DR_NONE,
+ near() ? null : explicitVer,
+ CU.subjectId(this, cctx),
+ resolveTaskName(),
+ dhtVer,
+ txEntry.updateCounter(),
+ mvccSnapshot());
+
+ txEntry.updateCounter(updRes.updateCounter());
+
+ if (updRes.loggedPointer() != null)
+ ptr = updRes.loggedPointer();
+
+ // Keep near entry up to date.
+ if (nearCached != null)
+ nearCached.updateOrEvict(xidVer, null, 0, 0, nodeId, topVer);
}
- else
- U.error(log, "Commit failed.", err);
-
- state(UNKNOWN);
-
- if (hasInvalidEnvironmentIssue)
- cctx.kernalContext().failure().process(new FailureContext(FailureType.CRITICAL_ERROR, ex));
- else if (!isNodeStopping) { // Skip fair uncommit in case of node stopping or invalidation.
- try {
- // Courtesy to minimize damage.
- uncommit();
+ else if (op == RELOAD) {
+ CacheObject reloaded = cached.innerReload();
+
+ if (nearCached != null) {
+ nearCached.innerReload();
+
+ nearCached.updateOrEvict(cached.version(),
+ reloaded,
+ cached.expireTime(),
+ cached.ttl(),
+ nodeId,
+ topVer);
}
- catch (Throwable ex1) {
- U.error(log, "Failed to uncommit transaction: " + this, ex1);
+ }
+ else if (op == READ) {
+ assert near();
- if (ex1 instanceof Error)
- throw ex1;
+ if (log.isDebugEnabled())
+ log.debug("Ignoring READ entry when committing: " + txEntry);
+ }
+ // No-op.
+ else {
+ if (conflictCtx == null || !conflictCtx.isUseOld()) {
+ if (txEntry.ttl() != CU.TTL_NOT_CHANGED)
+ cached.updateTtl(null, txEntry.ttl());
+
+ if (nearCached != null) {
+ CacheObject val0 = cached.valueBytes();
+
+ nearCached.updateOrEvict(xidVer,
+ val0,
+ cached.expireTime(),
+ cached.ttl(),
+ nodeId,
+ topVer);
+ }
}
}
- if (ex instanceof Error)
- throw (Error) ex;
+ // Assert after setting values as we want to make sure
+ // that if we replaced removed entries.
+ assert
+ txEntry.op() == READ || onePhaseCommit() ||
+ // If candidate is not there, then lock was explicit
+ // and we simply allow the commit to proceed.
+ !cached.hasLockCandidateUnsafe(xidVer) || cached.lockedByUnsafe(xidVer) :
+ "Transaction does not own lock for commit [entry=" + cached +
+ ", tx=" + this + ']';
+
+ // Break out of while loop.
+ break;
+ }
+ catch (GridCacheEntryRemovedException ignored) {
+ if (log.isDebugEnabled())
+ log.debug("Attempting to commit a removed entry (will retry): " + txEntry);
- throw err;
+ // Renew cached entry.
+ txEntry.cached(cacheCtx.cache().entryEx(txEntry.key(), topologyVersion()));
}
}
+ }
- // Apply cache size deltas.
- applyTxSizes();
+ // Apply cache size deltas.
+ applyTxSizes();
- TxCounters txCntrs = txCounters(false);
+ TxCounters txCntrs = txCounters(false);
- // Apply update counters.
- if (txCntrs != null)
- cctx.tm().txHandler().applyPartitionsUpdatesCounters(txCntrs.updateCounters());
+ // Apply update counters.
+ if (txCntrs != null)
+ cctx.tm().txHandler().applyPartitionsUpdatesCounters(txCntrs.updateCounters());
- cctx.mvccCaching().onTxFinished(this, true);
+ cctx.mvccCaching().onTxFinished(this, true);
- if (!near() && !F.isEmpty(dataEntries) && cctx.wal() != null) {
- // Set new update counters for data entries received from persisted tx entries.
- List<DataEntry> entriesWithCounters = dataEntries.stream()
- .map(tuple -> tuple.get1().partitionCounter(tuple.get2().updateCounter()))
- .collect(Collectors.toList());
+ if (!near() && !F.isEmpty(dataEntries) && cctx.wal() != null) {
+ // Set new update counters for data entries received from persisted tx entries.
+ List<DataEntry> entriesWithCounters = dataEntries.stream()
+ .map(tuple -> tuple.get1().partitionCounter(tuple.get2().updateCounter()))
+ .collect(Collectors.toList());
- cctx.wal().log(new DataRecord(entriesWithCounters));
- }
+ cctx.wal().log(new DataRecord(entriesWithCounters));
+ }
+
+ if (ptr != null && !cctx.tm().logTxRecords())
+ cctx.wal().flush(ptr, false);
+ }
+ catch (Throwable ex) {
+ state(UNKNOWN);
- if (ptr != null && !cctx.tm().logTxRecords())
- cctx.wal().flush(ptr, false);
+ if (X.hasCause(ex, NodeStoppingException.class)) {
+ U.warn(log, "Failed to commit transaction, node is stopping [tx=" + CU.txString(this) +
+ ", err=" + ex + ']');
+
+ return;
}
- catch (StorageException e) {
- err = e;
- throw new IgniteCheckedException("Failed to log transaction record " +
- "(transaction will be rolled back): " + this, e);
+ err = heuristicException(ex);
+
+ try {
+ uncommit();
+ }
+ catch (Throwable e) {
+ err.addSuppressed(e);
}
+
+ throw err;
}
finally {
cctx.database().checkpointReadUnlock();
@@ -875,9 +843,19 @@ else if (!isNodeStopping) { // Skip fair uncommit in case of node stopping or in
throw new IgniteCheckedException("Invalid transaction state for commit [state=" + state + ", tx=" + this + ']');
rollbackRemoteTx();
+
+ return;
}
- commitIfLocked();
+ try {
+ commitIfLocked();
+ }
+ catch (IgniteTxHeuristicCheckedException e) {
+ // Treat heuristic exception as critical.
+ cctx.kernalContext().failure().process(new FailureContext(FailureType.CRITICAL_ERROR, e));
+
+ throw e;
+ }
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
index ca2bdab156bf..001eb6158956 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
@@ -122,7 +122,7 @@ public void addKey(KeyCacheObject key, GridCacheContext ctx) throws IgniteChecke
}
switch (writer.state()) {
- case 7:
+ case 8:
if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
return false;
@@ -144,7 +144,7 @@ public void addKey(KeyCacheObject key, GridCacheContext ctx) throws IgniteChecke
return false;
switch (reader.state()) {
- case 7:
+ case 8:
keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -164,7 +164,7 @@ public void addKey(KeyCacheObject key, GridCacheContext ctx) throws IgniteChecke
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 9;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/ClientCacheDhtTopologyFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/ClientCacheDhtTopologyFuture.java
index 4b48f5a59e9f..f468590a2c19 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/ClientCacheDhtTopologyFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/ClientCacheDhtTopologyFuture.java
@@ -80,6 +80,11 @@ public void validate(CacheGroupContext grp, Collection<ClusterNode> topNodes) {
return topVer;
}
+ /** {@inheritDoc} */
+ @Override public boolean changedAffinity() {
+ return true;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return "ClientCacheDhtTopologyFuture [topVer=" + topVer + ']';
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
index 44c7b88c029f..cf7018a15c89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
@@ -109,7 +109,7 @@ public long futureId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 6;
+ return 7;
}
/** {@inheritDoc} */
@@ -127,20 +127,20 @@ public long futureId() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 5:
- if (!writer.writeMessage("topVer", topVer))
+ case 6:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -161,7 +161,7 @@ public long futureId() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -169,7 +169,7 @@ public long futureId() {
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -177,8 +177,8 @@ public long futureId() {
reader.incrementState();
- case 5:
- topVer = reader.readMessage("topVer");
+ case 6:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
index 5b0de08a2ce9..e8b40e9cd8c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
@@ -215,7 +215,7 @@ public void partitionMap(GridDhtPartitionFullMap partMap) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 9;
}
/**
@@ -272,32 +272,32 @@ public void partitionMap(GridDhtPartitionFullMap partMap) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByteArray("affAssignmentIdsBytes", affAssignmentIdsBytes))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeByteArray("idealAffAssignmentBytes", idealAffAssignmentBytes))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeByteArray("partBytes", partBytes))
return false;
writer.incrementState();
- case 7:
- if (!writer.writeMessage("topVer", topVer))
+ case 8:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -318,7 +318,7 @@ public void partitionMap(GridDhtPartitionFullMap partMap) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
affAssignmentIdsBytes = reader.readByteArray("affAssignmentIdsBytes");
if (!reader.isLastRead())
@@ -326,7 +326,7 @@ public void partitionMap(GridDhtPartitionFullMap partMap) {
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -334,7 +334,7 @@ public void partitionMap(GridDhtPartitionFullMap partMap) {
reader.incrementState();
- case 5:
+ case 6:
idealAffAssignmentBytes = reader.readByteArray("idealAffAssignmentBytes");
if (!reader.isLastRead())
@@ -342,7 +342,7 @@ public void partitionMap(GridDhtPartitionFullMap partMap) {
reader.incrementState();
- case 6:
+ case 7:
partBytes = reader.readByteArray("partBytes");
if (!reader.isLastRead())
@@ -350,8 +350,8 @@ public void partitionMap(GridDhtPartitionFullMap partMap) {
reader.incrementState();
- case 7:
- topVer = reader.readMessage("topVer");
+ case 8:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 71ddf3ce189b..f69f8132410a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -1263,6 +1263,11 @@ protected final boolean needRemap(AffinityTopologyVersion expVer, AffinityTopolo
if (expVer.equals(curVer))
return false;
+ AffinityTopologyVersion lastAffChangedTopVer = ctx.shared().exchange().lastAffinityChangedTopologyVersion(expVer);
+
+ if (curVer.compareTo(lastAffChangedTopVer) >= 0 && curVer.compareTo(expVer) <= 0)
+ return false;
+
// TODO IGNITE-7164 check mvcc crd for mvcc enabled txs.
Collection<ClusterNode> cacheNodes0 = ctx.discovery().cacheGroupAffinityNodes(ctx.groupId(), expVer);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 1ac58182ddc5..76c3b163d577 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -363,62 +363,62 @@ public long accessTtl() {
}
switch (writer.state()) {
- case 20:
+ case 21:
if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
- case 21:
+ case 22:
if (!writer.writeBitSet("invalidateEntries", invalidateEntries))
return false;
writer.incrementState();
- case 22:
+ case 23:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 23:
+ case 24:
if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeObjectArray("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 25:
+ case 26:
if (!writer.writeObjectArray("ownedValues", ownedValues, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 26:
+ case 27:
if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
- case 27:
+ case 28:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 28:
+ case 29:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 29:
- if (!writer.writeMessage("topVer", topVer))
+ case 30:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -439,7 +439,7 @@ public long accessTtl() {
return false;
switch (reader.state()) {
- case 20:
+ case 21:
accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
@@ -447,7 +447,7 @@ public long accessTtl() {
reader.incrementState();
- case 21:
+ case 22:
invalidateEntries = reader.readBitSet("invalidateEntries");
if (!reader.isLastRead())
@@ -455,7 +455,7 @@ public long accessTtl() {
reader.incrementState();
- case 22:
+ case 23:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -463,7 +463,7 @@ public long accessTtl() {
reader.incrementState();
- case 23:
+ case 24:
nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -471,7 +471,7 @@ public long accessTtl() {
reader.incrementState();
- case 24:
+ case 25:
ownedKeys = reader.readObjectArray("ownedKeys", MessageCollectionItemType.MSG, KeyCacheObject.class);
if (!reader.isLastRead())
@@ -479,7 +479,7 @@ public long accessTtl() {
reader.incrementState();
- case 25:
+ case 26:
ownedValues = reader.readObjectArray("ownedValues", MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -487,7 +487,7 @@ public long accessTtl() {
reader.incrementState();
- case 26:
+ case 27:
preloadKeys = reader.readBitSet("preloadKeys");
if (!reader.isLastRead())
@@ -495,7 +495,7 @@ public long accessTtl() {
reader.incrementState();
- case 27:
+ case 28:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -503,7 +503,7 @@ public long accessTtl() {
reader.incrementState();
- case 28:
+ case 29:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -511,8 +511,8 @@ public long accessTtl() {
reader.incrementState();
- case 29:
- topVer = reader.readMessage("topVer");
+ case 30:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -531,7 +531,7 @@ public long accessTtl() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 30;
+ return 31;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
index 87abd6c2ce99..63c07e82906f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -207,25 +207,25 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
}
switch (writer.state()) {
- case 10:
+ case 11:
if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG))
return false;
@@ -247,7 +247,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
return false;
switch (reader.state()) {
- case 10:
+ case 11:
invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT);
if (!reader.isLastRead())
@@ -255,7 +255,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
reader.incrementState();
- case 11:
+ case 12:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -263,7 +263,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
reader.incrementState();
- case 12:
+ case 13:
nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -271,7 +271,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
reader.incrementState();
- case 13:
+ case 14:
preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -291,7 +291,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 14;
+ return 15;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
index 489fb63309ea..3cae875f5d9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFuture.java
@@ -86,4 +86,10 @@
boolean read,
@Nullable Object key,
@Nullable Collection<?> keys);
+
+ /**
+ *
+ * @return {@code True} if this exchange changed affinity.
+ */
+ public boolean changedAffinity();
}
\ No newline at end of file
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFutureAdapter.java
index 539fef48bda4..92143080c240 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTopologyFutureAdapter.java
@@ -97,6 +97,9 @@ protected final CacheValidation validateCacheGroup(CacheGroupContext grp, Collec
cctx.name());
}
+ if (cctx.shared().readOnlyMode() && !read)
+ return new IgniteCheckedException("Failed to perform cache operation (cluster is in read only mode)" );
+
if (grp.needsRecovery() || grp.topologyValidator() != null) {
CacheValidation validation = grpValidRes.get(grp.groupId());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index edd28b44a47b..66ba325dd6ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -2124,7 +2124,8 @@ public GridDhtTxLocal initTxTopologyVersion(UUID nodeId,
GridDhtTopologyFuture topFut = top.topologyVersionFuture();
- if (!topFut.isDone() || !topFut.topologyVersion().equals(topVer)) {
+ if (!topFut.isDone() || !(topFut.topologyVersion().compareTo(topVer) >= 0
+ && ctx.shared().exchange().lastAffinityChangedTopologyVersion(topFut.initialVersion()).compareTo(topVer) <= 0)) {
// TODO IGNITE-7164 Wait for topology change, remap client TX in case affinity was changed.
top.readUnlock();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 472aafd724d1..d0fbd90bf03e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -173,10 +173,13 @@ public void rollbackOnError(Throwable e) {
if (ERR_UPD.compareAndSet(this, null, e)) {
tx.setRollbackOnly();
- if (X.hasCause(e, InvalidEnvironmentException.class, NodeStoppingException.class))
+ if (X.hasCause(e, NodeStoppingException.class) || cctx.kernalContext().failure().nodeStopping())
onComplete();
- else
+ else {
+ // Rolling back a remote transaction may result in partial commit.
+ // This is only acceptable in tests with no-op failure handler.
finish(false);
+ }
}
}
@@ -230,9 +233,9 @@ public void onResult(UUID nodeId, GridDhtTxFinishResponse res) {
if (this.tx.onePhaseCommit() && (this.tx.state() == COMMITTING)) {
try {
- boolean hasInvalidEnvironmentIssue = X.hasCause(err, InvalidEnvironmentException.class, NodeStoppingException.class);
+ boolean nodeStopping = X.hasCause(err, NodeStoppingException.class);
- this.tx.tmFinish(err == null, hasInvalidEnvironmentIssue, false);
+ this.tx.tmFinish(err == null, nodeStopping || cctx.kernalContext().failure().nodeStopping(), false);
}
catch (IgniteCheckedException finishErr) {
U.error(log, "Failed to finish tx: " + tx, e);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 61896b59a3d1..04f411d8e3b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -393,44 +393,38 @@ public void needReturnValue(boolean retVal) {
}
switch (writer.state()) {
- case 21:
- if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
- return false;
-
- writer.incrementState();
-
case 22:
- if (!writer.writeInt("miniId", miniId))
+ if (!writer.writeByte("isolation", isolation != null ? (byte)isolation.ordinal() : -1))
return false;
writer.incrementState();
case 23:
- if (!writer.writeUuid("nearNodeId", nearNodeId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
case 24:
- if (!writer.writeMessage("partUpdateCnt", partUpdateCnt))
+ if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
case 25:
- if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
+ if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
case 26:
- if (!writer.writeMessage("writeVer", writeVer))
+ if (!writer.writeMessage("partUpdateCnt", partUpdateCnt))
return false;
writer.incrementState();
case 27:
- if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
+ if (!writer.writeCollection("pendingVers", pendingVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
@@ -441,6 +435,12 @@ public void needReturnValue(boolean retVal) {
writer.incrementState();
+ case 29:
+ if (!writer.writeMessage("writeVer", writeVer))
+ return false;
+
+ writer.incrementState();
+
}
return true;
@@ -457,7 +457,7 @@ public void needReturnValue(boolean retVal) {
return false;
switch (reader.state()) {
- case 21:
+ case 22:
byte isolationOrd;
isolationOrd = reader.readByte("isolation");
@@ -469,16 +469,8 @@ public void needReturnValue(boolean retVal) {
reader.incrementState();
- case 22:
- miniId = reader.readInt("miniId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 23:
- nearNodeId = reader.readUuid("nearNodeId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
@@ -486,7 +478,7 @@ public void needReturnValue(boolean retVal) {
reader.incrementState();
case 24:
- partUpdateCnt = reader.readMessage("partUpdateCnt");
+ mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
return false;
@@ -494,7 +486,7 @@ public void needReturnValue(boolean retVal) {
reader.incrementState();
case 25:
- pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
+ nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
return false;
@@ -502,7 +494,7 @@ public void needReturnValue(boolean retVal) {
reader.incrementState();
case 26:
- writeVer = reader.readMessage("writeVer");
+ partUpdateCnt = reader.readMessage("partUpdateCnt");
if (!reader.isLastRead())
return false;
@@ -510,7 +502,7 @@ public void needReturnValue(boolean retVal) {
reader.incrementState();
case 27:
- mvccSnapshot = reader.readMessage("mvccSnapshot");
+ pendingVers = reader.readCollection("pendingVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -525,6 +517,14 @@ public void needReturnValue(boolean retVal) {
reader.incrementState();
+ case 29:
+ writeVer = reader.readMessage("writeVer");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
}
return reader.afterMessageRead(GridDhtTxFinishRequest.class);
@@ -537,7 +537,7 @@ public void needReturnValue(boolean retVal) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 29;
+ return 30;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 6d717ebf904e..d777a2201a14 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -173,19 +173,19 @@ public GridCacheReturn returnValue() {
}
switch (writer.state()) {
- case 6:
+ case 7:
if (!writer.writeByteArray("checkCommittedErrBytes", checkCommittedErrBytes))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeMessage("retVal", retVal))
return false;
@@ -207,7 +207,7 @@ public GridCacheReturn returnValue() {
return false;
switch (reader.state()) {
- case 6:
+ case 7:
checkCommittedErrBytes = reader.readByteArray("checkCommittedErrBytes");
if (!reader.isLastRead())
@@ -215,7 +215,7 @@ public GridCacheReturn returnValue() {
reader.incrementState();
- case 7:
+ case 8:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -223,7 +223,7 @@ public GridCacheReturn returnValue() {
reader.incrementState();
- case 8:
+ case 9:
retVal = reader.readMessage("retVal");
if (!reader.isLastRead())
@@ -243,7 +243,7 @@ public GridCacheReturn returnValue() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 10;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index a091d44ac423..ca451f064eee 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -24,6 +24,8 @@
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.failure.FailureContext;
+import org.apache.ignite.failure.FailureType;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
@@ -39,6 +41,7 @@
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
@@ -46,6 +49,7 @@
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteInClosure;
@@ -467,7 +471,11 @@ else if (!lockFut.isDone()) {
", tx=" + CU.txString(this) + ']');
}
catch (IgniteCheckedException e) {
- U.error(log, "Failed to finish transaction [commit=" + commit + ", tx=" + this + ']', e);
+ logTxFinishErrorSafe(log, commit, e);
+
+ // Treat heuristic exception as critical.
+ if (X.hasCause(e, IgniteTxHeuristicCheckedException.class))
+ cctx.kernalContext().failure().process(new FailureContext(FailureType.CRITICAL_ERROR, e));
err = e;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index 29169162caa2..86f9c3c0d0cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -29,6 +29,8 @@
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.failure.FailureContext;
+import org.apache.ignite.failure.FailureType;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -41,6 +43,7 @@
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtInvalidPartitionException;
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareResponse;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
+import org.apache.ignite.internal.processors.cache.transactions.IgniteTxAdapter;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxLocalAdapter;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
index 67eacd3f8c5f..50f2e7947b1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxOnePhaseCommitAckRequest.java
@@ -97,7 +97,7 @@ public GridDhtTxOnePhaseCommitAckRequest(Collection<GridCacheVersion> vers) {
}
switch (writer.state()) {
- case 2:
+ case 3:
if (!writer.writeCollection("vers", vers, MessageCollectionItemType.MSG))
return false;
@@ -119,7 +119,7 @@ public GridDhtTxOnePhaseCommitAckRequest(Collection<GridCacheVersion> vers) {
return false;
switch (reader.state()) {
- case 2:
+ case 3:
vers = reader.readCollection("vers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -139,6 +139,6 @@ public GridDhtTxOnePhaseCommitAckRequest(Collection<GridCacheVersion> vers) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 3;
+ return 4;
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 57280788bc16..d10d329fecf5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -26,6 +26,7 @@
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
@@ -36,6 +37,8 @@
import org.apache.ignite.IgniteInterruptedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.failure.FailureContext;
+import org.apache.ignite.failure.FailureType;
import org.apache.ignite.internal.IgniteDiagnosticAware;
import org.apache.ignite.internal.IgniteDiagnosticPrepareContext;
import org.apache.ignite.internal.IgniteInternalFuture;
@@ -215,6 +218,9 @@
/** Timeout object. */
private final PrepareTimeoutObject timeoutObj;
+ /** */
+ private CountDownLatch timeoutAddedLatch;
+
/**
* @param cctx Context.
* @param tx Transaction.
@@ -258,6 +264,9 @@ public GridDhtTxPrepareFuture(
assert nearMap != null;
timeoutObj = timeout > 0 ? new PrepareTimeoutObject(timeout) : null;
+
+ if (tx.onePhaseCommit())
+ timeoutAddedLatch = new CountDownLatch(1);
}
/** {@inheritDoc} */
@@ -690,6 +699,14 @@ private boolean mapIfLocked() {
if (!MAPPED_UPD.compareAndSet(this, 0, 1))
return false;
+ if (timeoutObj != null && tx.onePhaseCommit()) {
+ U.awaitQuiet(timeoutAddedLatch);
+
+ // Disable timeouts after all locks are acquired for one-phase commit or partition desync will occur.
+ if (!cctx.time().removeTimeoutObject(timeoutObj))
+ return true; // Should not proceed with prepare if tx is already timed out.
+ }
+
if (forceKeysFut == null || (forceKeysFut.isDone() && forceKeysFut.error() == null))
prepare0();
else {
@@ -728,7 +745,7 @@ private boolean mapIfLocked() {
tx.clearPrepareFuture(this);
// Do not commit one-phase commit transaction if originating node has near cache enabled.
- if (tx.onePhaseCommit() && tx.commitOnPrepare()) {
+ if (tx.commitOnPrepare()) {
assert last;
Throwable prepErr = this.err;
@@ -738,37 +755,30 @@ private boolean mapIfLocked() {
onComplete(res);
- if (tx.commitOnPrepare()) {
- if (tx.markFinalizing(IgniteInternalTx.FinalizationStatus.USER_FINISH)) {
- IgniteInternalFuture<IgniteInternalTx> fut = null;
-
- CIX1<IgniteInternalFuture<IgniteInternalTx>> resClo =
- new CIX1<IgniteInternalFuture<IgniteInternalTx>>() {
- @Override public void applyx(IgniteInternalFuture<IgniteInternalTx> fut) {
- if(res.error() == null && fut.error() != null)
- res.error(fut.error());
+ if (tx.markFinalizing(IgniteInternalTx.FinalizationStatus.USER_FINISH)) {
+ CIX1<IgniteInternalFuture<IgniteInternalTx>> resClo =
+ new CIX1<IgniteInternalFuture<IgniteInternalTx>>() {
+ @Override public void applyx(IgniteInternalFuture<IgniteInternalTx> fut) {
+ if (res.error() == null && fut.error() != null)
+ res.error(fut.error());
- if (REPLIED_UPD.compareAndSet(GridDhtTxPrepareFuture.this, 0, 1))
- sendPrepareResponse(res);
- }
- };
+ if (REPLIED_UPD.compareAndSet(GridDhtTxPrepareFuture.this, 0, 1))
+ sendPrepareResponse(res);
+ }
+ };
+ try {
if (prepErr == null) {
try {
- fut = tx.commitAsync();
+ tx.commitAsync().listen(resClo);
}
- catch (RuntimeException | Error e) {
- Exception hEx = new IgniteTxHeuristicCheckedException("Commit produced a runtime " +
- "exception: " + CU.txString(tx), e);
-
- res.error(hEx);
+ catch (Throwable e) {
+ res.error(e);
tx.systemInvalidate(true);
try {
- fut = tx.rollbackAsync();
-
- fut.listen(resClo);
+ tx.rollbackAsync().listen(resClo);
}
catch (Throwable e1) {
e.addSuppressed(e1);
@@ -776,25 +786,25 @@ private boolean mapIfLocked() {
throw e;
}
-
}
- else if (!cctx.kernalContext().isStopping())
+ else if (!cctx.kernalContext().isStopping()) {
try {
- fut = tx.rollbackAsync();
+ tx.rollbackAsync().listen(resClo);
}
catch (Throwable e) {
- err.addSuppressed(e);
- fut = null;
+ if (err != null)
+ err.addSuppressed(e);
+
+ throw err;
}
+ }
+ }
+ catch (Throwable e) {
+ tx.logTxFinishErrorSafe(log, true, e);
- if (fut != null)
- fut.listen(resClo);
+ cctx.kernalContext().failure().process(new FailureContext(FailureType.CRITICAL_ERROR, e));
}
}
- else {
- if (REPLIED_UPD.compareAndSet(this, 0, 1))
- sendPrepareResponse(res);
- }
return true;
}
@@ -1062,9 +1072,14 @@ public void prepare(GridNearTxPrepareRequest req) {
readyLocks();
- if (timeoutObj != null && !isDone()) {
- // Start timeout tracking after 'readyLocks' to avoid race with timeout processing.
+ // Start timeout tracking after 'readyLocks' to avoid race with timeout processing.
+ if (timeoutObj != null) {
cctx.time().addTimeoutObject(timeoutObj);
+
+ // Fix race with add/remove timeout object if locks are mapped from another
+ // thread before timeout object is enqueued.
+ if (tx.onePhaseCommit())
+ timeoutAddedLatch.countDown();
}
mapIfLocked();
@@ -1216,8 +1231,6 @@ private IgniteTxOptimisticCheckedException versionCheckError(IgniteTxEntry entry
*
*/
private void prepare0() {
- boolean skipInit = false;
-
try {
if (tx.serializable() && tx.optimistic()) {
IgniteCheckedException err0;
@@ -1252,8 +1265,6 @@ private void prepare0() {
}
}
- IgniteInternalFuture<MvccSnapshot> waitCrdCntrFut = null;
-
if (req.requestMvccCounter()) {
assert last;
@@ -1294,37 +1305,11 @@ private void prepare0() {
if (isDone())
return;
- if (last) {
- if (waitCrdCntrFut != null) {
- skipInit = true;
-
- waitCrdCntrFut.listen(new IgniteInClosure<IgniteInternalFuture<MvccSnapshot>>() {
- @Override public void apply(IgniteInternalFuture<MvccSnapshot> fut) {
- try {
- fut.get();
-
- sendPrepareRequests();
-
- markInitialized();
- }
- catch (Throwable e) {
- U.error(log, "Failed to get mvcc version for tx [txId=" + tx.nearXidVersion() +
- ", err=" + e + ']', e);
-
- GridNearTxPrepareResponse res = createPrepareResponse(e);
-
- onDone(res, res.error());
- }
- }
- });
- }
- else
- sendPrepareRequests();
- }
+ if (last)
+ sendPrepareRequests();
}
finally {
- if (!skipInit)
- markInitialized();
+ markInitialized();
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 30e8cebbd363..46a06d781b57 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -90,7 +90,7 @@
/** */
@GridDirectCollection(PartitionUpdateCountersMessage.class)
- private Collection<PartitionUpdateCountersMessage> counters;
+ private Collection<PartitionUpdateCountersMessage> updCntrs;
/** Near transaction ID. */
private GridCacheVersion nearXidVer;
@@ -136,7 +136,7 @@ public GridDhtTxPrepareRequest() {
* @param storeWriteThrough Cache store write through flag.
* @param retVal Need return value flag
* @param mvccSnapshot Mvcc snapshot.
- * @param counters Update counters for mvcc Tx.
+ * @param updCntrs Update counters for mvcc Tx.
*/
public GridDhtTxPrepareRequest(
IgniteUuid futId,
@@ -156,7 +156,7 @@ public GridDhtTxPrepareRequest(
boolean storeWriteThrough,
boolean retVal,
MvccSnapshot mvccSnapshot,
- Collection<PartitionUpdateCountersMessage> counters) {
+ Collection<PartitionUpdateCountersMessage> updCntrs) {
super(tx,
timeout,
null,
@@ -178,7 +178,7 @@ public GridDhtTxPrepareRequest(
this.subjId = subjId;
this.taskNameHash = taskNameHash;
this.mvccSnapshot = mvccSnapshot;
- this.counters = counters;
+ this.updCntrs = updCntrs;
storeWriteThrough(storeWriteThrough);
needReturnValue(retVal);
@@ -201,7 +201,7 @@ public MvccSnapshot mvccSnapshot() {
* @return Update counters list.
*/
public Collection<PartitionUpdateCountersMessage> updateCounters() {
- return counters;
+ return updCntrs;
}
/**
@@ -423,92 +423,92 @@ public boolean skipCompletedVersion() {
}
switch (writer.state()) {
- case 20:
- if (!writer.writeIgniteUuid("futId", futId))
- return false;
-
- writer.incrementState();
-
case 21:
- if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries))
+ if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
case 22:
- if (!writer.writeInt("miniId", miniId))
+ if (!writer.writeBitSet("invalidateNearEntries", invalidateNearEntries))
return false;
writer.incrementState();
case 23:
- if (!writer.writeUuid("nearNodeId", nearNodeId))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
case 24:
- if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG))
+ if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
case 25:
- if (!writer.writeMessage("nearXidVer", nearXidVer))
+ if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
case 26:
- if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
+ if (!writer.writeCollection("nearWrites", nearWrites, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 27:
- if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG))
+ if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
case 28:
- if (!writer.writeBitSet("preloadKeys", preloadKeys))
+ if (!writer.writeCollection("ownedKeys", ownedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 29:
- if (!writer.writeBoolean("skipCompletedVers", skipCompletedVers))
+ if (!writer.writeCollection("ownedVals", ownedVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 30:
- if (!writer.writeUuid("subjId", subjId))
+ if (!writer.writeBitSet("preloadKeys", preloadKeys))
return false;
writer.incrementState();
case 31:
- if (!writer.writeInt("taskNameHash", taskNameHash))
+ if (!writer.writeBoolean("skipCompletedVers", skipCompletedVers))
return false;
writer.incrementState();
case 32:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 33:
- if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
+ if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
case 34:
- if (!writer.writeCollection("counters", counters, MessageCollectionItemType.MSG))
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
+ return false;
+
+ writer.incrementState();
+
+ case 35:
+ if (!writer.writeCollection("updCntrs", updCntrs, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
@@ -529,16 +529,8 @@ public boolean skipCompletedVersion() {
return false;
switch (reader.state()) {
- case 20:
- futId = reader.readIgniteUuid("futId");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 21:
- invalidateNearEntries = reader.readBitSet("invalidateNearEntries");
+ futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
return false;
@@ -546,7 +538,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 22:
- miniId = reader.readInt("miniId");
+ invalidateNearEntries = reader.readBitSet("invalidateNearEntries");
if (!reader.isLastRead())
return false;
@@ -554,7 +546,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 23:
- nearNodeId = reader.readUuid("nearNodeId");
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
@@ -562,7 +554,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 24:
- nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG);
+ mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
return false;
@@ -570,7 +562,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 25:
- nearXidVer = reader.readMessage("nearXidVer");
+ nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
return false;
@@ -578,7 +570,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 26:
- ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG);
+ nearWrites = reader.readCollection("nearWrites", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -586,7 +578,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 27:
- ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG);
+ nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
return false;
@@ -594,7 +586,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 28:
- preloadKeys = reader.readBitSet("preloadKeys");
+ ownedKeys = reader.readCollection("ownedKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -602,7 +594,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 29:
- skipCompletedVers = reader.readBoolean("skipCompletedVers");
+ ownedVals = reader.readCollection("ownedVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -610,7 +602,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 30:
- subjId = reader.readUuid("subjId");
+ preloadKeys = reader.readBitSet("preloadKeys");
if (!reader.isLastRead())
return false;
@@ -618,7 +610,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 31:
- taskNameHash = reader.readInt("taskNameHash");
+ skipCompletedVers = reader.readBoolean("skipCompletedVers");
if (!reader.isLastRead())
return false;
@@ -626,7 +618,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 32:
- topVer = reader.readMessage("topVer");
+ subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
return false;
@@ -634,7 +626,7 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 33:
- mvccSnapshot = reader.readMessage("mvccSnapshot");
+ taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
return false;
@@ -642,7 +634,15 @@ public boolean skipCompletedVersion() {
reader.incrementState();
case 34:
- counters = reader.readCollection("counters", MessageCollectionItemType.MSG);
+ topVer = reader.readAffinityTopologyVersion("topVer");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 35:
+ updCntrs = reader.readCollection("updCntrs", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -661,7 +661,7 @@ public boolean skipCompletedVersion() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 35;
+ return 36;
}
/** {@inheritDoc} */
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 0c2bf8198bac..fcb14a34c58e 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
@@ -245,31 +245,31 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
}
switch (writer.state()) {
- case 10:
+ case 11:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeMap("invalidParts", invalidParts, MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeCollection("preloadEntries", preloadEntries, MessageCollectionItemType.MSG))
return false;
@@ -291,7 +291,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
return false;
switch (reader.state()) {
- case 10:
+ case 11:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -299,7 +299,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
reader.incrementState();
- case 11:
+ case 12:
invalidParts = reader.readMap("invalidParts", MessageCollectionItemType.INT, MessageCollectionItemType.INT_ARR, false);
if (!reader.isLastRead())
@@ -307,7 +307,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
reader.incrementState();
- case 12:
+ case 13:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -315,7 +315,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
reader.incrementState();
- case 13:
+ case 14:
nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -323,7 +323,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
reader.incrementState();
- case 14:
+ case 15:
preloadEntries = reader.readCollection("preloadEntries", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -343,7 +343,7 @@ public void addPreloadEntry(GridCacheEntryInfo info) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 15;
+ return 16;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java
index b3aa56ddf3cc..27b7c81aa147 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistRequest.java
@@ -247,43 +247,43 @@ else if (val instanceof GridInvokeValue)
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeInt("batchId", batchId))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeIgniteUuid("dhtFutId", dhtFutId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeMessage("lockVer", lockVer))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeInt("mvccOpCnt", mvccOpCnt))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG))
return false;
@@ -305,7 +305,7 @@ else if (val instanceof GridInvokeValue)
return false;
switch (reader.state()) {
- case 3:
+ case 4:
batchId = reader.readInt("batchId");
if (!reader.isLastRead())
@@ -313,7 +313,7 @@ else if (val instanceof GridInvokeValue)
reader.incrementState();
- case 4:
+ case 5:
dhtFutId = reader.readIgniteUuid("dhtFutId");
if (!reader.isLastRead())
@@ -321,7 +321,7 @@ else if (val instanceof GridInvokeValue)
reader.incrementState();
- case 5:
+ case 6:
keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -329,7 +329,7 @@ else if (val instanceof GridInvokeValue)
reader.incrementState();
- case 6:
+ case 7:
lockVer = reader.readMessage("lockVer");
if (!reader.isLastRead())
@@ -337,7 +337,7 @@ else if (val instanceof GridInvokeValue)
reader.incrementState();
- case 7:
+ case 8:
mvccOpCnt = reader.readInt("mvccOpCnt");
if (!reader.isLastRead())
@@ -345,7 +345,7 @@ else if (val instanceof GridInvokeValue)
reader.incrementState();
- case 8:
+ case 9:
byte opOrd;
opOrd = reader.readByte("op");
@@ -357,7 +357,7 @@ else if (val instanceof GridInvokeValue)
reader.incrementState();
- case 9:
+ case 10:
vals = reader.readCollection("vals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -372,7 +372,7 @@ else if (val instanceof GridInvokeValue)
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 11;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java
index f3b4aa7c9582..18f4baa52808 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryEnlistResponse.java
@@ -117,7 +117,7 @@ public int batchId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 6;
+ return 7;
}
/** {@inheritDoc} */
@@ -135,19 +135,19 @@ public int batchId() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeInt("batchId", batchId))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeIgniteUuid("futId", futId))
return false;
@@ -169,7 +169,7 @@ public int batchId() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
batchId = reader.readInt("batchId");
if (!reader.isLastRead())
@@ -177,7 +177,7 @@ public int batchId() {
reader.incrementState();
- case 4:
+ case 5:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -185,7 +185,7 @@ public int batchId() {
reader.incrementState();
- case 5:
+ case 6:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java
index 5c1bf6cb3e61..2220b29720f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxQueryFirstEnlistRequest.java
@@ -208,56 +208,56 @@ public long cleanupVersion() {
}
switch (writer.state()) {
- case 10:
+ case 11:
if (!writer.writeLong("cleanupVer", cleanupVer))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeLong("cntr", cntr))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeLong("crdVer", crdVer))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeMessage("nearXidVer", nearXidVer))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 16:
+ case 17:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 17:
+ case 18:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 18:
- if (!writer.writeMessage("topVer", topVer))
+ case 19:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -278,7 +278,7 @@ public long cleanupVersion() {
return false;
switch (reader.state()) {
- case 10:
+ case 11:
cleanupVer = reader.readLong("cleanupVer");
if (!reader.isLastRead())
@@ -286,7 +286,7 @@ public long cleanupVersion() {
reader.incrementState();
- case 11:
+ case 12:
cntr = reader.readLong("cntr");
if (!reader.isLastRead())
@@ -294,7 +294,7 @@ public long cleanupVersion() {
reader.incrementState();
- case 12:
+ case 13:
crdVer = reader.readLong("crdVer");
if (!reader.isLastRead())
@@ -302,7 +302,7 @@ public long cleanupVersion() {
reader.incrementState();
- case 13:
+ case 14:
nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
@@ -310,7 +310,7 @@ public long cleanupVersion() {
reader.incrementState();
- case 14:
+ case 15:
nearXidVer = reader.readMessage("nearXidVer");
if (!reader.isLastRead())
@@ -318,7 +318,7 @@ public long cleanupVersion() {
reader.incrementState();
- case 15:
+ case 16:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -326,7 +326,7 @@ public long cleanupVersion() {
reader.incrementState();
- case 16:
+ case 17:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -334,7 +334,7 @@ public long cleanupVersion() {
reader.incrementState();
- case 17:
+ case 18:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -342,8 +342,8 @@ public long cleanupVersion() {
reader.incrementState();
- case 18:
- topVer = reader.readMessage("topVer");
+ case 19:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -357,7 +357,7 @@ public long cleanupVersion() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 19;
+ return 20;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index 5671d7fd0f04..3bc4de01f6b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -113,7 +113,7 @@ public void addNearKey(KeyCacheObject key)
}
switch (writer.state()) {
- case 8:
+ case 9:
if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
return false;
@@ -135,7 +135,7 @@ public void addNearKey(KeyCacheObject key)
return false;
switch (reader.state()) {
- case 8:
+ case 9:
nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -155,6 +155,6 @@ public void addNearKey(KeyCacheObject key)
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 10;
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
index 3e5953fcb7ca..f30d51d9016d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/PartitionUpdateCountersMessage.java
@@ -20,6 +20,7 @@
import java.nio.ByteBuffer;
import java.util.Arrays;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.plugin.extensions.communication.MessageReader;
@@ -28,6 +29,7 @@
/**
* Partition update counters message.
*/
+@IgniteCodeGeneratingFail
public class PartitionUpdateCountersMessage implements Message {
/** */
private static final int ITEM_SIZE = 4 /* partition */ + 8 /* initial counter */ + 8 /* updates count */;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
index a5e9feb1255a..0096f012d0fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
@@ -484,7 +484,7 @@ final boolean isFlag(int mask) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 12;
+ return 13;
}
/** {@inheritDoc} */
@@ -502,55 +502,55 @@ final boolean isFlag(int mask) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeLong("nearFutId", nearFutId))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeUuid("nearNodeId", nearNodeId))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 10:
- if (!writer.writeMessage("topVer", topVer))
+ case 11:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeMessage("writeVer", writeVer))
return false;
@@ -572,7 +572,7 @@ final boolean isFlag(int mask) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -580,7 +580,7 @@ final boolean isFlag(int mask) {
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -588,7 +588,7 @@ final boolean isFlag(int mask) {
reader.incrementState();
- case 5:
+ case 6:
nearFutId = reader.readLong("nearFutId");
if (!reader.isLastRead())
@@ -596,7 +596,7 @@ final boolean isFlag(int mask) {
reader.incrementState();
- case 6:
+ case 7:
nearNodeId = reader.readUuid("nearNodeId");
if (!reader.isLastRead())
@@ -604,7 +604,7 @@ final boolean isFlag(int mask) {
reader.incrementState();
- case 7:
+ case 8:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -612,7 +612,7 @@ final boolean isFlag(int mask) {
reader.incrementState();
- case 8:
+ case 9:
byte syncModeOrd;
syncModeOrd = reader.readByte("syncMode");
@@ -624,7 +624,7 @@ final boolean isFlag(int mask) {
reader.incrementState();
- case 9:
+ case 10:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -632,15 +632,15 @@ final boolean isFlag(int mask) {
reader.incrementState();
- case 10:
- topVer = reader.readMessage("topVer");
+ case 11:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 11:
+ case 12:
writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
index 0c069da80082..ee5eac15a6c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java
@@ -119,7 +119,7 @@ GridLongList futureIds() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeMessage("futIds", futIds))
return false;
@@ -141,7 +141,7 @@ GridLongList futureIds() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
futIds = reader.readMessage("futIds");
if (!reader.isLastRead())
@@ -161,7 +161,7 @@ GridLongList futureIds() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 4;
+ return 5;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
index 71d23216f0e2..8f11ead53adf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicNearResponse.java
@@ -171,7 +171,7 @@ public long futureId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 9;
}
/** {@inheritDoc} */
@@ -210,31 +210,31 @@ public long futureId() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeMessage("errs", errs))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeInt("partId", partId))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeUuid("primaryId", primaryId))
return false;
@@ -256,7 +256,7 @@ public long futureId() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
errs = reader.readMessage("errs");
if (!reader.isLastRead())
@@ -264,7 +264,7 @@ public long futureId() {
reader.incrementState();
- case 4:
+ case 5:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -272,7 +272,7 @@ public long futureId() {
reader.incrementState();
- case 5:
+ case 6:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -280,7 +280,7 @@ public long futureId() {
reader.incrementState();
- case 6:
+ case 7:
partId = reader.readInt("partId");
if (!reader.isLastRead())
@@ -288,7 +288,7 @@ public long futureId() {
reader.incrementState();
- case 7:
+ case 8:
primaryId = reader.readUuid("primaryId");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
index 19b24b052d79..16be80e2e5a7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
@@ -373,25 +373,25 @@ private void near(boolean near) {
}
switch (writer.state()) {
- case 12:
+ case 13:
if (!writer.writeMessage("key", key))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeMessage("prevVal", prevVal))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeLong("updateCntr", updateCntr))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeMessage("val", val))
return false;
@@ -413,7 +413,7 @@ private void near(boolean near) {
return false;
switch (reader.state()) {
- case 12:
+ case 13:
key = reader.readMessage("key");
if (!reader.isLastRead())
@@ -421,7 +421,7 @@ private void near(boolean near) {
reader.incrementState();
- case 13:
+ case 14:
prevVal = reader.readMessage("prevVal");
if (!reader.isLastRead())
@@ -429,7 +429,7 @@ private void near(boolean near) {
reader.incrementState();
- case 14:
+ case 15:
updateCntr = reader.readLong("updateCntr");
if (!reader.isLastRead())
@@ -437,7 +437,7 @@ private void near(boolean near) {
reader.incrementState();
- case 15:
+ case 16:
val = reader.readMessage("val");
if (!reader.isLastRead())
@@ -487,7 +487,7 @@ private void finishUnmarshalObject(@Nullable CacheObject obj, GridCacheContext c
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 16;
+ return 17;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index 30be9dcc30c2..67281f756267 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -558,97 +558,97 @@ else if (conflictVers != null)
}
switch (writer.state()) {
- case 12:
+ case 13:
if (!writer.writeMessage("conflictExpireTimes", conflictExpireTimes))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeCollection("conflictVers", conflictVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageCollectionItemType.BYTE_ARR))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeBoolean("forceTransformBackups", forceTransformBackups))
return false;
writer.incrementState();
- case 16:
+ case 17:
if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_ARR))
return false;
writer.incrementState();
- case 17:
+ case 18:
if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 18:
+ case 19:
if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, MessageCollectionItemType.BYTE_ARR))
return false;
writer.incrementState();
- case 19:
+ case 20:
if (!writer.writeMessage("nearExpireTimes", nearExpireTimes))
return false;
writer.incrementState();
- case 20:
+ case 21:
if (!writer.writeCollection("nearKeys", nearKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 21:
+ case 22:
if (!writer.writeMessage("nearTtls", nearTtls))
return false;
writer.incrementState();
- case 22:
+ case 23:
if (!writer.writeCollection("nearVals", nearVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 23:
+ case 24:
if (!writer.writeMessage("obsoleteIndexes", obsoleteIndexes))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeCollection("prevVals", prevVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 25:
+ case 26:
if (!writer.writeMessage("ttls", ttls))
return false;
writer.incrementState();
- case 26:
+ case 27:
if (!writer.writeMessage("updateCntrs", updateCntrs))
return false;
writer.incrementState();
- case 27:
+ case 28:
if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG))
return false;
@@ -670,7 +670,7 @@ else if (conflictVers != null)
return false;
switch (reader.state()) {
- case 12:
+ case 13:
conflictExpireTimes = reader.readMessage("conflictExpireTimes");
if (!reader.isLastRead())
@@ -678,7 +678,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 13:
+ case 14:
conflictVers = reader.readCollection("conflictVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -686,7 +686,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 14:
+ case 15:
entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageCollectionItemType.BYTE_ARR);
if (!reader.isLastRead())
@@ -694,7 +694,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 15:
+ case 16:
forceTransformBackups = reader.readBoolean("forceTransformBackups");
if (!reader.isLastRead())
@@ -702,7 +702,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 16:
+ case 17:
invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_ARR, byte[].class);
if (!reader.isLastRead())
@@ -710,7 +710,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 17:
+ case 18:
keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -718,7 +718,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 18:
+ case 19:
nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", MessageCollectionItemType.BYTE_ARR);
if (!reader.isLastRead())
@@ -726,7 +726,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 19:
+ case 20:
nearExpireTimes = reader.readMessage("nearExpireTimes");
if (!reader.isLastRead())
@@ -734,7 +734,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 20:
+ case 21:
nearKeys = reader.readCollection("nearKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -742,7 +742,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 21:
+ case 22:
nearTtls = reader.readMessage("nearTtls");
if (!reader.isLastRead())
@@ -750,7 +750,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 22:
+ case 23:
nearVals = reader.readCollection("nearVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -758,7 +758,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 23:
+ case 24:
obsoleteIndexes = reader.readMessage("obsoleteIndexes");
if (!reader.isLastRead())
@@ -766,7 +766,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 24:
+ case 25:
prevVals = reader.readCollection("prevVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -774,7 +774,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 25:
+ case 26:
ttls = reader.readMessage("ttls");
if (!reader.isLastRead())
@@ -782,7 +782,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 26:
+ case 27:
updateCntrs = reader.readMessage("updateCntrs");
if (!reader.isLastRead())
@@ -790,7 +790,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 27:
+ case 28:
vals = reader.readCollection("vals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -816,7 +816,7 @@ else if (conflictVers != null)
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 28;
+ return 29;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 70bf6f5648b4..21efbb1350b3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -179,25 +179,25 @@ public void nearEvicted(List<KeyCacheObject> nearEvicted) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeMessage("errs", errs))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeCollection("nearEvicted", nearEvicted, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeInt("partId", partId))
return false;
@@ -219,7 +219,7 @@ public void nearEvicted(List<KeyCacheObject> nearEvicted) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
errs = reader.readMessage("errs");
if (!reader.isLastRead())
@@ -227,7 +227,7 @@ public void nearEvicted(List<KeyCacheObject> nearEvicted) {
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -235,7 +235,7 @@ public void nearEvicted(List<KeyCacheObject> nearEvicted) {
reader.incrementState();
- case 5:
+ case 6:
nearEvicted = reader.readCollection("nearEvicted", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -243,7 +243,7 @@ public void nearEvicted(List<KeyCacheObject> nearEvicted) {
reader.incrementState();
- case 6:
+ case 7:
partId = reader.readInt("partId");
if (!reader.isLastRead())
@@ -263,7 +263,7 @@ public void nearEvicted(List<KeyCacheObject> nearEvicted) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 7;
+ return 8;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
index 62618f81e6af..64fe1eef8fe6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
@@ -528,7 +528,7 @@ abstract void addUpdateEntry(KeyCacheObject key,
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 11;
}
/** {@inheritDoc} */
@@ -546,44 +546,44 @@ abstract void addUpdateEntry(KeyCacheObject key,
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeByte("syncMode", syncMode != null ? (byte)syncMode.ordinal() : -1))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 9:
- if (!writer.writeMessage("topVer", topVer))
+ case 10:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -604,7 +604,7 @@ abstract void addUpdateEntry(KeyCacheObject key,
return false;
switch (reader.state()) {
- case 3:
+ case 4:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -612,7 +612,7 @@ abstract void addUpdateEntry(KeyCacheObject key,
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -620,7 +620,7 @@ abstract void addUpdateEntry(KeyCacheObject key,
reader.incrementState();
- case 5:
+ case 6:
byte opOrd;
opOrd = reader.readByte("op");
@@ -632,7 +632,7 @@ abstract void addUpdateEntry(KeyCacheObject key,
reader.incrementState();
- case 6:
+ case 7:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -640,7 +640,7 @@ abstract void addUpdateEntry(KeyCacheObject key,
reader.incrementState();
- case 7:
+ case 8:
byte syncModeOrd;
syncModeOrd = reader.readByte("syncMode");
@@ -652,7 +652,7 @@ abstract void addUpdateEntry(KeyCacheObject key,
reader.incrementState();
- case 8:
+ case 9:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -660,8 +660,8 @@ abstract void addUpdateEntry(KeyCacheObject key,
reader.incrementState();
- case 9:
- topVer = reader.readMessage("topVer");
+ case 10:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
index 96be0233c308..a19e28029b89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicCheckUpdateRequest.java
@@ -101,7 +101,7 @@ GridNearAtomicAbstractUpdateRequest updateRequest() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 5;
+ return 6;
}
/** {@inheritDoc} */
@@ -119,13 +119,13 @@ GridNearAtomicAbstractUpdateRequest updateRequest() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeInt("partId", partId))
return false;
@@ -147,7 +147,7 @@ GridNearAtomicAbstractUpdateRequest updateRequest() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -155,7 +155,7 @@ GridNearAtomicAbstractUpdateRequest updateRequest() {
reader.incrementState();
- case 4:
+ case 5:
partId = reader.readInt("partId");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index d6956a64dae6..170586b22d58 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -435,55 +435,55 @@ else if (conflictVers != null)
}
switch (writer.state()) {
- case 10:
+ case 11:
if (!writer.writeMessage("conflictExpireTimes", conflictExpireTimes))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeMessage("conflictTtls", conflictTtls))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeCollection("conflictVers", conflictVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageCollectionItemType.BYTE_ARR))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeByteArray("expiryPlcBytes", expiryPlcBytes))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 16:
+ case 17:
if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_ARR))
return false;
writer.incrementState();
- case 17:
+ case 18:
if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 18:
+ case 19:
if (!writer.writeCollection("vals", vals, MessageCollectionItemType.MSG))
return false;
@@ -505,7 +505,7 @@ else if (conflictVers != null)
return false;
switch (reader.state()) {
- case 10:
+ case 11:
conflictExpireTimes = reader.readMessage("conflictExpireTimes");
if (!reader.isLastRead())
@@ -513,7 +513,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 11:
+ case 12:
conflictTtls = reader.readMessage("conflictTtls");
if (!reader.isLastRead())
@@ -521,7 +521,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 12:
+ case 13:
conflictVers = reader.readCollection("conflictVers", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -529,7 +529,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 13:
+ case 14:
entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageCollectionItemType.BYTE_ARR);
if (!reader.isLastRead())
@@ -537,7 +537,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 14:
+ case 15:
expiryPlcBytes = reader.readByteArray("expiryPlcBytes");
if (!reader.isLastRead())
@@ -545,7 +545,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 15:
+ case 16:
filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class);
if (!reader.isLastRead())
@@ -553,7 +553,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 16:
+ case 17:
invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_ARR, byte[].class);
if (!reader.isLastRead())
@@ -561,7 +561,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 17:
+ case 18:
keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -569,7 +569,7 @@ else if (conflictVers != null)
reader.incrementState();
- case 18:
+ case 19:
vals = reader.readCollection("vals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -601,7 +601,7 @@ else if (conflictVers != null)
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 19;
+ return 20;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
index 5c66bc46894b..c7076988a659 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
@@ -155,7 +155,7 @@ public GridNearAtomicSingleUpdateFilterRequest() {
}
switch (writer.state()) {
- case 12:
+ case 13:
if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG))
return false;
@@ -177,7 +177,7 @@ public GridNearAtomicSingleUpdateFilterRequest() {
return false;
switch (reader.state()) {
- case 12:
+ case 13:
filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class);
if (!reader.isLastRead())
@@ -197,7 +197,7 @@ public GridNearAtomicSingleUpdateFilterRequest() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 13;
+ return 14;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index 865d6f8664e9..ee3d2a4fe036 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -225,13 +225,13 @@ public GridNearAtomicSingleUpdateInvokeRequest() {
}
switch (writer.state()) {
- case 12:
+ case 13:
if (!writer.writeByteArray("entryProcessorBytes", entryProcessorBytes))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageCollectionItemType.BYTE_ARR))
return false;
@@ -253,7 +253,7 @@ public GridNearAtomicSingleUpdateInvokeRequest() {
return false;
switch (reader.state()) {
- case 12:
+ case 13:
entryProcessorBytes = reader.readByteArray("entryProcessorBytes");
if (!reader.isLastRead())
@@ -261,7 +261,7 @@ public GridNearAtomicSingleUpdateInvokeRequest() {
reader.incrementState();
- case 13:
+ case 14:
invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageCollectionItemType.BYTE_ARR, byte[].class);
if (!reader.isLastRead())
@@ -276,7 +276,7 @@ public GridNearAtomicSingleUpdateInvokeRequest() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 14;
+ return 15;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
index dd3a7bedb7de..83ec4565f49c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
@@ -247,13 +247,13 @@ public GridNearAtomicSingleUpdateRequest() {
}
switch (writer.state()) {
- case 10:
+ case 11:
if (!writer.writeMessage("key", key))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeMessage("val", val))
return false;
@@ -275,7 +275,7 @@ public GridNearAtomicSingleUpdateRequest() {
return false;
switch (reader.state()) {
- case 10:
+ case 11:
key = reader.readMessage("key");
if (!reader.isLastRead())
@@ -283,7 +283,7 @@ public GridNearAtomicSingleUpdateRequest() {
reader.incrementState();
- case 11:
+ case 12:
val = reader.readMessage("val");
if (!reader.isLastRead())
@@ -311,7 +311,7 @@ public GridNearAtomicSingleUpdateRequest() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 12;
+ return 13;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 37fe824a39f9..6dccd8b9cdc9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -405,43 +405,43 @@ synchronized void addFailedKeys(Collection<KeyCacheObject> keys, Throwable e) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeMessage("errs", errs))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeCollection("mapping", mapping, MessageCollectionItemType.UUID))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeMessage("nearUpdates", nearUpdates))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeInt("partId", partId))
return false;
writer.incrementState();
- case 8:
- if (!writer.writeMessage("remapTopVer", remapTopVer))
+ case 9:
+ if (!writer.writeAffinityTopologyVersion("remapTopVer", remapTopVer))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeMessage("ret", ret))
return false;
@@ -463,7 +463,7 @@ synchronized void addFailedKeys(Collection<KeyCacheObject> keys, Throwable e) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
errs = reader.readMessage("errs");
if (!reader.isLastRead())
@@ -471,7 +471,7 @@ synchronized void addFailedKeys(Collection<KeyCacheObject> keys, Throwable e) {
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -479,7 +479,7 @@ synchronized void addFailedKeys(Collection<KeyCacheObject> keys, Throwable e) {
reader.incrementState();
- case 5:
+ case 6:
mapping = reader.readCollection("mapping", MessageCollectionItemType.UUID);
if (!reader.isLastRead())
@@ -487,7 +487,7 @@ synchronized void addFailedKeys(Collection<KeyCacheObject> keys, Throwable e) {
reader.incrementState();
- case 6:
+ case 7:
nearUpdates = reader.readMessage("nearUpdates");
if (!reader.isLastRead())
@@ -495,7 +495,7 @@ synchronized void addFailedKeys(Collection<KeyCacheObject> keys, Throwable e) {
reader.incrementState();
- case 7:
+ case 8:
partId = reader.readInt("partId");
if (!reader.isLastRead())
@@ -503,15 +503,15 @@ synchronized void addFailedKeys(Collection<KeyCacheObject> keys, Throwable e) {
reader.incrementState();
- case 8:
- remapTopVer = reader.readMessage("remapTopVer");
+ case 9:
+ remapTopVer = reader.readAffinityTopologyVersion("remapTopVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 9:
+ case 10:
ret = reader.readMessage("ret");
if (!reader.isLastRead())
@@ -531,7 +531,7 @@ synchronized void addFailedKeys(Collection<KeyCacheObject> keys, Throwable e) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 11;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
index 7da4051e2792..695eadca581a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java
@@ -192,16 +192,10 @@ private CacheGroupAffinityMessage(List<List<ClusterNode>> assign0,
for (int n = 0; n < assign.size(); n++) {
long order = assign.get(n);
- ClusterNode affNode = nodesByOrder.get(order);
+ ClusterNode affNode = nodesByOrder.computeIfAbsent(order, o -> discoCache.serverNodeByOrder(order));
- if (affNode == null) {
- affNode = discoCache.serverNodeByOrder(order);
-
- assert affNode != null : "Failed to find node by order [order=" + order +
- ", topVer=" + discoCache.version() + ']';
-
- nodesByOrder.put(order, affNode);
- }
+ assert affNode != null : "Failed to find node by order [order=" + order +
+ ", topVer=" + discoCache.version() + ']';
assign0.add(affNode);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
index 2d5eec3878cf..008c2766e4a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CachePartitionFullCountersMap.java
@@ -93,27 +93,6 @@ public void updateCounter(int p, long updCntr) {
updCntrs[p] = updCntr;
}
- /**
- * Creates submap for provided partition IDs.
- *
- * @param parts Partition IDs.
- * @return Partial counters map.
- */
- public CachePartitionPartialCountersMap subMap(Set<Integer> parts) {
- CachePartitionPartialCountersMap res = new CachePartitionPartialCountersMap(parts.size());
-
- for (int p = 0; p < updCntrs.length; p++) {
- if (!parts.contains(p))
- continue;
-
- res.add(p, initialUpdCntrs[p], updCntrs[p]);
- }
-
- assert res.size() == parts.size();
-
- return res;
- }
-
/**
* Clears full counters map.
*/
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index 124ae44ca5b3..80c45efc7680 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -167,26 +167,26 @@ private int keyCount() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 6:
- if (!writer.writeMessage("topVer", topVer))
+ case 7:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -207,7 +207,7 @@ private int keyCount() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -215,7 +215,7 @@ private int keyCount() {
reader.incrementState();
- case 4:
+ case 5:
keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -223,7 +223,7 @@ private int keyCount() {
reader.incrementState();
- case 5:
+ case 6:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -231,8 +231,8 @@ private int keyCount() {
reader.incrementState();
- case 6:
- topVer = reader.readMessage("topVer");
+ case 7:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -251,7 +251,7 @@ private int keyCount() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 7;
+ return 8;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index 977e9ba41eef..ab85df3e9462 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -213,31 +213,31 @@ public void addInfo(GridCacheEntryInfo info) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeCollection("infos", infos, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeCollection("missedKeys", missedKeys, MessageCollectionItemType.MSG))
return false;
@@ -259,7 +259,7 @@ public void addInfo(GridCacheEntryInfo info) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -267,7 +267,7 @@ public void addInfo(GridCacheEntryInfo info) {
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -275,7 +275,7 @@ public void addInfo(GridCacheEntryInfo info) {
reader.incrementState();
- case 5:
+ case 6:
infos = reader.readCollection("infos", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -283,7 +283,7 @@ public void addInfo(GridCacheEntryInfo info) {
reader.incrementState();
- case 6:
+ case 7:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -291,7 +291,7 @@ public void addInfo(GridCacheEntryInfo info) {
reader.incrementState();
- case 7:
+ case 8:
missedKeys = reader.readCollection("missedKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -311,7 +311,7 @@ public void addInfo(GridCacheEntryInfo info) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 9;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java
index 46e9ceb00483..cd7741b554fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandLegacyMessage.java
@@ -285,49 +285,49 @@ Long partitionCounter(int part) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeCollection("historicalParts", historicalParts, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeCollection("parts", parts, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeMap("partsCntrs", partsCntrs, MessageCollectionItemType.INT, MessageCollectionItemType.LONG))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 7:
- if (!writer.writeMessage("topVer", topVer))
+ case 8:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeByteArray("topicBytes", topicBytes))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeLong("updateSeq", updateSeq))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeInt("workerId", workerId))
return false;
@@ -349,7 +349,7 @@ Long partitionCounter(int part) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
historicalParts = reader.readCollection("historicalParts", MessageCollectionItemType.INT);
if (!reader.isLastRead())
@@ -357,7 +357,7 @@ Long partitionCounter(int part) {
reader.incrementState();
- case 4:
+ case 5:
parts = reader.readCollection("parts", MessageCollectionItemType.INT);
if (!reader.isLastRead())
@@ -365,7 +365,7 @@ Long partitionCounter(int part) {
reader.incrementState();
- case 5:
+ case 6:
partsCntrs = reader.readMap("partsCntrs", MessageCollectionItemType.INT, MessageCollectionItemType.LONG, false);
if (!reader.isLastRead())
@@ -373,7 +373,7 @@ Long partitionCounter(int part) {
reader.incrementState();
- case 6:
+ case 7:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -381,15 +381,15 @@ Long partitionCounter(int part) {
reader.incrementState();
- case 7:
- topVer = reader.readMessage("topVer");
+ case 8:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 8:
+ case 9:
topicBytes = reader.readByteArray("topicBytes");
if (!reader.isLastRead())
@@ -397,7 +397,7 @@ Long partitionCounter(int part) {
reader.incrementState();
- case 9:
+ case 10:
updateSeq = reader.readLong("updateSeq");
if (!reader.isLastRead())
@@ -405,7 +405,7 @@ Long partitionCounter(int part) {
reader.incrementState();
- case 10:
+ case 11:
workerId = reader.readInt("workerId");
if (!reader.isLastRead())
@@ -415,7 +415,7 @@ Long partitionCounter(int part) {
}
- return reader.afterMessageRead(GridDhtPartitionDemandMessage.class);
+ return reader.afterMessageRead(GridDhtPartitionDemandLegacyMessage.class);
}
/** {@inheritDoc} */
@@ -425,7 +425,7 @@ Long partitionCounter(int part) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 11;
+ return 12;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
index dc6162bc321f..bae326424d0f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
@@ -21,6 +21,7 @@
import java.nio.ByteBuffer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheGroupIdMessage;
import org.apache.ignite.internal.processors.cache.GridCacheMessage;
@@ -35,6 +36,7 @@
/**
* Partition demand request.
*/
+@IgniteCodeGeneratingFail
public class GridDhtPartitionDemandMessage extends GridCacheGroupIdMessage {
/** */
private static final long serialVersionUID = 0L;
@@ -259,37 +261,37 @@ public GridCacheMessage convertIfNeeded(IgniteProductVersion target) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByteArray("partsBytes", partsBytes))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 5:
- if (!writer.writeMessage("topVer", topVer))
+ case 6:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeByteArray("topicBytes", topicBytes))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeLong("rebalanceId", rebalanceId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeInt("workerId", workerId))
return false;
@@ -311,7 +313,7 @@ public GridCacheMessage convertIfNeeded(IgniteProductVersion target) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
partsBytes = reader.readByteArray("partsBytes");
if (!reader.isLastRead())
@@ -319,7 +321,7 @@ public GridCacheMessage convertIfNeeded(IgniteProductVersion target) {
reader.incrementState();
- case 4:
+ case 5:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -327,15 +329,15 @@ public GridCacheMessage convertIfNeeded(IgniteProductVersion target) {
reader.incrementState();
- case 5:
- topVer = reader.readMessage("topVer");
+ case 6:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 6:
+ case 7:
topicBytes = reader.readByteArray("topicBytes");
if (!reader.isLastRead())
@@ -343,7 +345,7 @@ public GridCacheMessage convertIfNeeded(IgniteProductVersion target) {
reader.incrementState();
- case 7:
+ case 8:
rebalanceId = reader.readLong("rebalanceId");
if (!reader.isLastRead())
@@ -351,7 +353,7 @@ public GridCacheMessage convertIfNeeded(IgniteProductVersion target) {
reader.incrementState();
- case 8:
+ case 9:
workerId = reader.readInt("workerId");
if (!reader.isLastRead())
@@ -371,7 +373,7 @@ public GridCacheMessage convertIfNeeded(IgniteProductVersion target) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 10;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
index 741386b40707..2206f2e372fa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionExchangeId.java
@@ -248,7 +248,7 @@ public boolean isLeft() {
writer.incrementState();
case 2:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -283,7 +283,7 @@ public boolean isLeft() {
reader.incrementState();
case 2:
- topVer = reader.readMessage("topVer");
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -311,4 +311,4 @@ public boolean isLeft() {
"nodeId", U.id8(nodeId),
"evt", U.gridEventName(evt));
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
index 835910e36387..92547667ca39 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
@@ -27,6 +27,7 @@
import java.util.stream.Collectors;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
@@ -45,6 +46,7 @@
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.T3;
+import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgnitePredicate;
@@ -71,6 +73,10 @@
/** Supply context map. T3: nodeId, topicId, topVer. */
private final Map<T3<UUID, Integer, AffinityTopologyVersion>, SupplyContext> scMap = new HashMap<>();
+ /** Override for rebalance throttle. */
+ private long rebalanceThrottleOverride =
+ IgniteSystemProperties.getLong(IgniteSystemProperties.IGNITE_REBALANCE_THROTTLE_OVERRIDE, 0);
+
/**
* @param grp Cache group.
*/
@@ -82,6 +88,9 @@
log = grp.shared().logger(getClass());
top = grp.topology();
+
+ if (rebalanceThrottleOverride > 0)
+ LT.info(log, "Using rebalance throttle override: " + rebalanceThrottleOverride);
}
/**
@@ -511,7 +520,9 @@ private boolean reply(
grp.shared().io().sendOrderedMessage(demander, demandMsg.topic(), supplyMsg, grp.ioPolicy(), demandMsg.timeout());
// Throttle preloading.
- if (grp.config().getRebalanceThrottle() > 0)
+ if (rebalanceThrottleOverride > 0)
+ U.sleep(rebalanceThrottleOverride);
+ else if (grp.config().getRebalanceThrottle() > 0)
U.sleep(grp.config().getRebalanceThrottle());
return true;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
index 284700ad3a44..3034fb9daaf2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
@@ -28,6 +28,7 @@
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.GridDirectCollection;
import org.apache.ignite.internal.GridDirectMap;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
@@ -45,6 +46,7 @@
/**
* Partition supply message.
*/
+@IgniteCodeGeneratingFail
public class GridDhtPartitionSupplyMessage extends GridCacheGroupIdMessage implements GridCacheDeployable {
/** */
private static final long serialVersionUID = 0L;
@@ -282,55 +284,55 @@ public int size() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeCollection("clean", clean, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("estimatedKeysCnt", estimatedKeysCnt))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeMap("infos", infos, MessageCollectionItemType.INT, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeMap("keysPerCache", keysPerCache, MessageCollectionItemType.INT, MessageCollectionItemType.LONG))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeMap("last", last, MessageCollectionItemType.INT, MessageCollectionItemType.LONG))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeCollection("missed", missed, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeInt("msgSize", msgSize))
return false;
writer.incrementState();
- case 10:
- if (!writer.writeMessage("topVer", topVer))
+ case 11:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 11:
+ case 12:
// Keep 'updateSeq' name for compatibility.
if (!writer.writeLong("updateSeq", rebalanceId))
return false;
@@ -353,7 +355,7 @@ public int size() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
clean = reader.readCollection("clean", MessageCollectionItemType.INT);
if (!reader.isLastRead())
@@ -361,7 +363,7 @@ public int size() {
reader.incrementState();
- case 4:
+ case 5:
estimatedKeysCnt = reader.readLong("estimatedKeysCnt");
if (!reader.isLastRead())
@@ -369,7 +371,7 @@ public int size() {
reader.incrementState();
- case 5:
+ case 6:
infos = reader.readMap("infos", MessageCollectionItemType.INT, MessageCollectionItemType.MSG, false);
if (!reader.isLastRead())
@@ -377,7 +379,7 @@ public int size() {
reader.incrementState();
- case 6:
+ case 7:
keysPerCache = reader.readMap("keysPerCache", MessageCollectionItemType.INT, MessageCollectionItemType.LONG, false);
if (!reader.isLastRead())
@@ -385,7 +387,7 @@ public int size() {
reader.incrementState();
- case 7:
+ case 8:
last = reader.readMap("last", MessageCollectionItemType.INT, MessageCollectionItemType.LONG, false);
if (!reader.isLastRead())
@@ -393,7 +395,7 @@ public int size() {
reader.incrementState();
- case 8:
+ case 9:
missed = reader.readCollection("missed", MessageCollectionItemType.INT);
if (!reader.isLastRead())
@@ -401,7 +403,7 @@ public int size() {
reader.incrementState();
- case 9:
+ case 10:
msgSize = reader.readInt("msgSize");
if (!reader.isLastRead())
@@ -409,15 +411,15 @@ public int size() {
reader.incrementState();
- case 10:
- topVer = reader.readMessage("topVer");
+ case 11:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 11:
+ case 12:
// Keep 'updateSeq' name for compatibility.
rebalanceId = reader.readLong("updateSeq");
@@ -438,7 +440,7 @@ public int size() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 12;
+ return 13;
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
index b6bff0e82350..154d9fb4a613 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessageV2.java
@@ -36,7 +36,7 @@
private static final long serialVersionUID = 0L;
/** Available since. */
- public static final IgniteProductVersion AVAILABLE_SINCE = IgniteProductVersion.fromString("2.7.0");
+ public static final IgniteProductVersion AVAILABLE_SINCE = IgniteProductVersion.fromString("2.5.3");
/** Supplying process error. */
@GridDirectTransient
@@ -101,7 +101,7 @@ public GridDhtPartitionSupplyMessageV2(
}
switch (writer.state()) {
- case 12:
+ case 13:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
@@ -123,7 +123,7 @@ public GridDhtPartitionSupplyMessageV2(
return false;
switch (reader.state()) {
- case 12:
+ case 13:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -148,6 +148,6 @@ public GridDhtPartitionSupplyMessageV2(
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 13;
+ return 14;
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
index 84cc792fe22e..e2884e175150 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
@@ -145,7 +145,7 @@ public boolean restoreState() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 5;
+ return 6;
}
/** {@inheritDoc} */
@@ -163,19 +163,19 @@ public boolean restoreState() {
}
switch (writer.state()) {
- case 2:
+ case 3:
if (!writer.writeMessage("exchId", exchId))
return false;
writer.incrementState();
- case 3:
+ case 4:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeMessage("lastVer", lastVer))
return false;
@@ -197,7 +197,7 @@ public boolean restoreState() {
return false;
switch (reader.state()) {
- case 2:
+ case 3:
exchId = reader.readMessage("exchId");
if (!reader.isLastRead())
@@ -205,7 +205,7 @@ public boolean restoreState() {
reader.incrementState();
- case 3:
+ case 4:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -213,7 +213,7 @@ public boolean restoreState() {
reader.incrementState();
- case 4:
+ case 5:
lastVer = reader.readMessage("lastVer");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 6f38757300f0..9dc1ab48f70b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -42,6 +42,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheMode;
@@ -49,7 +50,6 @@
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.events.DiscoveryEvent;
import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
import org.apache.ignite.internal.IgniteDiagnosticAware;
@@ -82,7 +82,6 @@
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.GridCacheUtils;
-import org.apache.ignite.internal.processors.cache.LocalJoinCachesContext;
import org.apache.ignite.internal.processors.cache.StateChangeRequest;
import org.apache.ignite.internal.processors.cache.WalStateAbstractMessage;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFutureAdapter;
@@ -93,6 +92,7 @@
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionTopology;
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionsStateValidator;
import org.apache.ignite.internal.processors.cache.mvcc.MvccCoordinator;
+import org.apache.ignite.internal.processors.cache.persistence.DatabaseLifecycleListener;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotDiscoveryMessage;
import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
@@ -103,6 +103,7 @@
import org.apache.ignite.internal.util.GridLongList;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.lang.IgniteInClosureX;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.CI1;
@@ -131,6 +132,7 @@
import static org.apache.ignite.internal.processors.cache.ExchangeDiscoveryEvents.serverJoinEvent;
import static org.apache.ignite.internal.processors.cache.ExchangeDiscoveryEvents.serverLeftEvent;
import static org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionPartialCountersMap.PARTIAL_COUNTERS_MAP_SINCE;
+import static org.apache.ignite.internal.util.IgniteUtils.doInParallel;
/**
* Future for exchanging partition maps.
@@ -567,6 +569,16 @@ public boolean changedBaseline() {
return exchActions != null && exchActions.changedBaseline();
}
+ /** {@inheritDoc} */
+ @Override public boolean changedAffinity() {
+ DiscoveryEvent firstDiscoEvt0 = firstDiscoEvt;
+
+ assert firstDiscoEvt0 != null;
+
+ return firstDiscoEvt0.type() == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT
+ || !firstDiscoEvt0.eventNode().isClient() || firstDiscoEvt0.eventNode().isLocal();
+ }
+
/**
* @return {@code True} if there are caches to start.
*/
@@ -869,16 +881,15 @@ else if (msg instanceof WalStateAbstractMessage)
* @throws IgniteCheckedException If failed.
*/
private IgniteInternalFuture<?> initCachesOnLocalJoin() throws IgniteCheckedException {
- if (isLocalNodeNotInBaseline()) {
+ if (!cctx.kernalContext().clientNode() && !isLocalNodeInBaseline()) {
cctx.exchange().exchangerBlockingSectionBegin();
try {
- cctx.cache().cleanupCachesDirectories();
-
- cctx.database().cleanupCheckpointDirectory();
+ List<DatabaseLifecycleListener> listeners = cctx.kernalContext().internalSubscriptionProcessor()
+ .getDatabaseListeners();
- if (cctx.wal() != null)
- cctx.wal().cleanupWalDirectories();
+ for (DatabaseLifecycleListener lsnr : listeners)
+ lsnr.onBaselineChange();
}
finally {
cctx.exchange().exchangerBlockingSectionEnd();
@@ -894,34 +905,11 @@ else if (msg instanceof WalStateAbstractMessage)
cctx.exchange().exchangerBlockingSectionEnd();
}
- LocalJoinCachesContext locJoinCtx = exchActions == null ? null : exchActions.localJoinContext();
-
- List<T2<DynamicCacheDescriptor, NearCacheConfiguration>> caches = locJoinCtx == null ? null :
- locJoinCtx.caches();
-
- if (!cctx.kernalContext().clientNode()) {
- List<DynamicCacheDescriptor> startDescs = new ArrayList<>();
-
- if (caches != null) {
- for (T2<DynamicCacheDescriptor, NearCacheConfiguration> c : caches) {
- DynamicCacheDescriptor startDesc = c.get1();
-
- if (CU.isPersistentCache(startDesc.cacheConfiguration(), cctx.gridConfig().getDataStorageConfiguration()))
- startDescs.add(startDesc);
- }
- }
-
- cctx.exchange().exchangerBlockingSectionBegin();
-
- try {
- cctx.database().readCheckpointAndRestoreMemory(startDescs);
- }
- finally {
- cctx.exchange().exchangerBlockingSectionEnd();
- }
- }
+ IgniteInternalFuture<?> cachesRegistrationFut = cctx.cache().startCachesOnLocalJoin(initialVersion(),
+ exchActions == null ? null : exchActions.localJoinContext());
- IgniteInternalFuture<?> cachesRegistrationFut = cctx.cache().startCachesOnLocalJoin(initialVersion(), locJoinCtx);
+ if (!cctx.kernalContext().clientNode())
+ cctx.cache().shutdownNotFinishedRecoveryCaches();
ensureClientCachesStarted();
@@ -948,12 +936,12 @@ private void ensureClientCachesStarted() {
}
/**
- * @return {@code true} if local node is not in baseline and {@code false} otherwise.
+ * @return {@code true} if local node is in baseline and {@code false} otherwise.
*/
- private boolean isLocalNodeNotInBaseline() {
+ private boolean isLocalNodeInBaseline() {
BaselineTopology topology = cctx.discovery().discoCache().state().baselineTopology();
- return topology!= null && !topology.consistentIds().contains(cctx.localNode().consistentId());
+ return topology != null && topology.consistentIds().contains(cctx.localNode().consistentId());
}
/**
@@ -1096,7 +1084,7 @@ private ExchangeType onClusterStateChangeRequest(boolean crd) {
cctx.exchange().exchangerBlockingSectionBegin();
try {
- cctx.database().readCheckpointAndRestoreMemory(startDescs);
+ cctx.database().readCheckpointAndRestoreMemory(startDescs, false);
}
finally {
cctx.exchange().exchangerBlockingSectionEnd();
@@ -1109,6 +1097,9 @@ private ExchangeType onClusterStateChangeRequest(boolean crd) {
try {
registerCachesFuture = cctx.affinity().onCacheChangeRequest(this, crd, exchActions);
+
+ if (!cctx.kernalContext().clientNode())
+ cctx.cache().shutdownNotFinishedRecoveryCaches();
}
finally {
cctx.exchange().exchangerBlockingSectionEnd();
@@ -1441,16 +1432,15 @@ private void distributedExchange() throws IgniteCheckedException {
}
}
- /* It is necessary to run database callback before all topology callbacks.
- In case of persistent store is enabled we first restore partitions presented on disk.
- We need to guarantee that there are no partition state changes logged to WAL before this callback
- to make sure that we correctly restored last actual states. */
- boolean restored;
-
cctx.exchange().exchangerBlockingSectionBegin();
try {
- restored = cctx.database().beforeExchange(this);
+ /* It is necessary to run database callback before all topology callbacks.
+ In case of persistent store is enabled we first restore partitions presented on disk.
+ We need to guarantee that there are no partition state changes logged to WAL before this callback
+ to make sure that we correctly restored last actual states. */
+
+ cctx.database().beforeExchange(this);
}
finally {
cctx.exchange().exchangerBlockingSectionEnd();
@@ -1477,11 +1467,11 @@ private void distributedExchange() throws IgniteCheckedException {
}
// After all partitions have been restored and pre-created it's safe to make first checkpoint.
- if (restored) {
+ if (localJoinExchange() || activateCluster()) {
cctx.exchange().exchangerBlockingSectionBegin();
try {
- cctx.database().onStateRestored();
+ cctx.database().onStateRestored(initialVersion());
}
finally {
cctx.exchange().exchangerBlockingSectionEnd();
@@ -1944,8 +1934,6 @@ private void sendAllPartitions(
.map(singleMessage -> fullMsg.copy().joinedNodeAffinity(affinityForJoinedNodes))
.orElse(null);
- long time = System.currentTimeMillis();
-
// Prepare and send full messages for given nodes.
nodes.stream()
.map(node -> {
@@ -1998,9 +1986,6 @@ private void sendAllPartitions(
U.error(log, "Failed to send partitions [node=" + node + ']', e);
}
});
-
- if (log.isInfoEnabled())
- log.info("Sending Full Message performed in " + (System.currentTimeMillis() - time) + " ms.");
}
/**
@@ -2078,22 +2063,24 @@ public void finishMerged() {
if (centralizedAff || forceAffReassignment) {
assert !exchCtx.mergeExchanges();
+ Collection<CacheGroupContext> grpToRefresh = U.newHashSet(cctx.cache().cacheGroups().size());
+
for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
if (grp.isLocal())
continue;
- boolean needRefresh = false;
-
try {
- needRefresh = grp.topology().initPartitionsWhenAffinityReady(res, this);
+ if (grp.topology().initPartitionsWhenAffinityReady(res, this))
+ grpToRefresh.add(grp);
}
catch (IgniteInterruptedCheckedException e) {
U.error(log, "Failed to initialize partitions.", e);
}
- if (needRefresh)
- cctx.exchange().refreshPartitions();
}
+
+ if (!grpToRefresh.isEmpty())
+ cctx.exchange().refreshPartitions(grpToRefresh);
}
for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
@@ -2101,7 +2088,7 @@ public void finishMerged() {
if (drCacheCtx.isDrEnabled()) {
try {
- drCacheCtx.dr().onExchange(res, exchId.isLeft());
+ drCacheCtx.dr().onExchange(res, exchId.isLeft(), activateCluster());
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to notify DR: " + e, e);
@@ -2148,9 +2135,9 @@ public void finishMerged() {
cctx.database().releaseHistoryForExchange();
- cctx.database().rebuildIndexesIfNeeded(this);
-
if (err == null) {
+ cctx.database().rebuildIndexesIfNeeded(this);
+
for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
if (!grp.isLocal())
grp.topology().onExchangeDone(this, grp.affinity().readyAffinity(res), false);
@@ -3411,16 +3398,11 @@ else if (forceAffReassignment)
nodes.addAll(sndResNodes);
}
- time = System.currentTimeMillis();
-
if (!nodes.isEmpty())
sendAllPartitions(msg, nodes, mergedJoinExchMsgs0, joinedNodeAff);
partitionsSent = true;
- if (log.isInfoEnabled())
- log.info("Sending Full Message to all nodes performed in " + (System.currentTimeMillis() - time) + " ms.");
-
if (!stateChangeExchange())
onDone(exchCtx.events().topologyVersion(), null);
@@ -3436,8 +3418,6 @@ else if (forceAffReassignment)
}
if (stateChangeExchange()) {
- IgniteCheckedException err = null;
-
StateChangeRequest req = exchActions.stateChangeRequest();
assert req != null : exchActions;
@@ -3447,8 +3427,6 @@ else if (forceAffReassignment)
if (!F.isEmpty(exchangeGlobalExceptions)) {
stateChangeErr = true;
- err = new IgniteCheckedException("Cluster state change failed.");
-
cctx.kernalContext().state().onStateChangeError(exchangeGlobalExceptions, req);
}
else {
@@ -3480,7 +3458,7 @@ else if (forceAffReassignment)
cctx.discovery().sendCustomEvent(stateFinishMsg);
if (!centralizedAff)
- onDone(exchCtx.events().topologyVersion(), err);
+ onDone(exchCtx.events().topologyVersion(), null);
}
}
catch (IgniteCheckedException e) {
@@ -3491,44 +3469,58 @@ else if (forceAffReassignment)
}
}
+ /**
+ * Collects non local cache group descriptors.
+ *
+ * @return Collection of non local cache group descriptors.
+ */
+ private List<CacheGroupDescriptor> nonLocalCacheGroupDescriptors() {
+ return cctx.affinity().cacheGroups().values().stream()
+ .filter(grpDesc -> grpDesc.config().getCacheMode() != CacheMode.LOCAL)
+ .collect(Collectors.toList());
+ }
+
/**
* Validates that partition update counters and cache sizes for all caches are consistent.
*/
private void validatePartitionsState() {
long time = System.currentTimeMillis();
- for (Map.Entry<Integer, CacheGroupDescriptor> e : cctx.affinity().cacheGroups().entrySet()) {
- CacheGroupDescriptor grpDesc = e.getValue();
- if (grpDesc.config().getCacheMode() == CacheMode.LOCAL)
- continue;
-
- int grpId = e.getKey();
-
- CacheGroupContext grpCtx = cctx.cache().cacheGroup(grpId);
-
- GridDhtPartitionTopology top = grpCtx != null ?
- grpCtx.topology() :
- cctx.exchange().clientTopology(grpId, events().discoveryCache());
-
- // Do not validate read or write through caches or caches with disabled rebalance
- // or ExpiryPolicy is set or validation is disabled.
- if (grpCtx == null
- || grpCtx.config().isReadThrough()
- || grpCtx.config().isWriteThrough()
- || grpCtx.config().getCacheStoreFactory() != null
- || grpCtx.config().getRebalanceDelay() == -1
- || grpCtx.config().getRebalanceMode() == CacheRebalanceMode.NONE
- || grpCtx.config().getExpiryPolicyFactory() == null
- || SKIP_PARTITION_SIZE_VALIDATION)
- continue;
+ try {
+ U.doInParallel(
+ cctx.kernalContext().getSystemExecutorService(),
+ nonLocalCacheGroupDescriptors(),
+ grpDesc -> {
+ CacheGroupContext grpCtx = cctx.cache().cacheGroup(grpDesc.groupId());
+
+ GridDhtPartitionTopology top = grpCtx != null
+ ? grpCtx.topology()
+ : cctx.exchange().clientTopology(grpDesc.groupId(), events().discoveryCache());
+
+ // Do not validate read or write through caches or caches with disabled rebalance
+ // or ExpiryPolicy is set or validation is disabled.
+ if (grpCtx == null
+ || grpCtx.config().isReadThrough()
+ || grpCtx.config().isWriteThrough()
+ || grpCtx.config().getCacheStoreFactory() != null
+ || grpCtx.config().getRebalanceDelay() == -1
+ || grpCtx.config().getRebalanceMode() == CacheRebalanceMode.NONE
+ || grpCtx.config().getExpiryPolicyFactory() == null
+ || SKIP_PARTITION_SIZE_VALIDATION)
+ return;
- try {
- validator.validatePartitionCountersAndSizes(this, top, msgs);
- }
- catch (IgniteCheckedException ex) {
- log.warning("Partition states validation has failed for group: " + grpDesc.cacheOrGroupName() + ". " + ex.getMessage());
- // TODO: Handle such errors https://issues.apache.org/jira/browse/IGNITE-7833
- }
+ try {
+ validator.validatePartitionCountersAndSizes(GridDhtPartitionsExchangeFuture.this, top, msgs);
+ }
+ catch (IgniteCheckedException ex) {
+ log.warning("Partition states validation has failed for group: " + grpCtx.cacheOrGroupName() + ". " + ex.getMessage());
+ // TODO: Handle such errors https://issues.apache.org/jira/browse/IGNITE-7833
+ }
+ }
+ );
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException("Failed to validate partitions state", e);
}
if (log.isInfoEnabled())
@@ -3541,21 +3533,26 @@ private void validatePartitionsState() {
private void assignPartitionsStates() {
long time = System.currentTimeMillis();
- for (Map.Entry<Integer, CacheGroupDescriptor> e : cctx.affinity().cacheGroups().entrySet()) {
- CacheGroupDescriptor grpDesc = e.getValue();
- if (grpDesc.config().getCacheMode() == CacheMode.LOCAL)
- continue;
-
- CacheGroupContext grpCtx = cctx.cache().cacheGroup(e.getKey());
-
- GridDhtPartitionTopology top = grpCtx != null ?
- grpCtx.topology() :
- cctx.exchange().clientTopology(e.getKey(), events().discoveryCache());
-
- if (!CU.isPersistentCache(grpDesc.config(), cctx.gridConfig().getDataStorageConfiguration()))
- assignPartitionSizes(top);
- else
- assignPartitionStates(top);
+ try {
+ U.doInParallel(
+ cctx.kernalContext().getSystemExecutorService(),
+ nonLocalCacheGroupDescriptors(),
+ grpDesc -> {
+ CacheGroupContext grpCtx = cctx.cache().cacheGroup(grpDesc.groupId());
+
+ GridDhtPartitionTopology top = grpCtx != null
+ ? grpCtx.topology()
+ : cctx.exchange().clientTopology(grpDesc.groupId(), events().discoveryCache());
+
+ if (!CU.isPersistentCache(grpDesc.config(), cctx.gridConfig().getDataStorageConfiguration()))
+ assignPartitionSizes(top);
+ else
+ assignPartitionStates(top);
+ }
+ );
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException("Failed to assign partition states", e);
}
if (log.isInfoEnabled())
@@ -3942,15 +3939,10 @@ else if (forceAffReassignment)
updatePartitionFullMap(resTopVer, msg);
- IgniteCheckedException err = null;
-
- if (stateChangeExchange() && !F.isEmpty(msg.getErrorsMap())) {
- err = new IgniteCheckedException("Cluster state change failed");
-
+ if (stateChangeExchange() && !F.isEmpty(msg.getErrorsMap()))
cctx.kernalContext().state().onStateChangeError(msg.getErrorsMap(), exchActions.stateChangeRequest());
- }
- onDone(resTopVer, err);
+ onDone(resTopVer, null);
}
catch (IgniteCheckedException e) {
onDone(e);
@@ -3972,39 +3964,50 @@ private void updatePartitionFullMap(AffinityTopologyVersion resTopVer, GridDhtPa
long time = System.currentTimeMillis();
- for (Map.Entry<Integer, GridDhtPartitionFullMap> entry : msg.partitions().entrySet()) {
- Integer grpId = entry.getKey();
+ int parallelismLvl = cctx.kernalContext().config().getSystemThreadPoolSize();
- CacheGroupContext grp = cctx.cache().cacheGroup(grpId);
+ // Reserve at least 2 threads for system operations.
+ parallelismLvl = Math.max(1, parallelismLvl - 2);
- if (grp != null) {
- CachePartitionFullCountersMap cntrMap = msg.partitionUpdateCounters(grpId,
- grp.topology().partitions());
+ try {
+ doInParallel(
+ parallelismLvl,
+ cctx.kernalContext().getSystemExecutorService(),
+ msg.partitions().keySet(), grpId -> {
+ CacheGroupContext grp = cctx.cache().cacheGroup(grpId);
- grp.topology().update(resTopVer,
- entry.getValue(),
- cntrMap,
- msg.partsToReload(cctx.localNodeId(), grpId),
- msg.partitionSizes(grpId),
- null);
- }
- else {
- ClusterNode oldest = cctx.discovery().oldestAliveServerNode(AffinityTopologyVersion.NONE);
+ if (grp != null) {
+ CachePartitionFullCountersMap cntrMap = msg.partitionUpdateCounters(grpId,
+ grp.topology().partitions());
- if (oldest != null && oldest.isLocal()) {
- GridDhtPartitionTopology top = cctx.exchange().clientTopology(grpId, events().discoveryCache());
+ grp.topology().update(resTopVer,
+ msg.partitions().get(grpId),
+ cntrMap,
+ msg.partsToReload(cctx.localNodeId(), grpId),
+ msg.partitionSizes(grpId),
+ null);
+ }
+ else {
+ ClusterNode oldest = cctx.discovery().oldestAliveServerNode(AffinityTopologyVersion.NONE);
- CachePartitionFullCountersMap cntrMap = msg.partitionUpdateCounters(grpId,
- top.partitions());
+ if (oldest != null && oldest.isLocal()) {
+ GridDhtPartitionTopology top = cctx.exchange().clientTopology(grpId, events().discoveryCache());
- top.update(resTopVer,
- entry.getValue(),
- cntrMap,
- Collections.emptySet(),
- null,
- null);
- }
- }
+ CachePartitionFullCountersMap cntrMap = msg.partitionUpdateCounters(grpId,
+ top.partitions());
+
+ top.update(resTopVer,
+ msg.partitions().get(grpId),
+ cntrMap,
+ Collections.emptySet(),
+ null,
+ null);
+ }
+ }
+ });
+ }
+ catch (IgniteCheckedException e) {
+ throw new IgniteException(e);
}
partitionsReceived = true;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index a63ab70e28d5..7fccfac842a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -595,74 +595,74 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
}
switch (writer.state()) {
- case 5:
+ case 6:
if (!writer.writeMap("dupPartsData", dupPartsData, MessageCollectionItemType.INT, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeByteArray("errsBytes", errsBytes))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeMap("idealAffDiff", idealAffDiff, MessageCollectionItemType.INT, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeMap("joinedNodeAff", joinedNodeAff, MessageCollectionItemType.INT, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeByteArray("partCntrsBytes", partCntrsBytes))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeByteArray("partCntrsBytes2", partCntrsBytes2))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeByteArray("partHistSuppliersBytes", partHistSuppliersBytes))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeByteArray("partsBytes", partsBytes))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeByteArray("partsSizesBytes", partsSizesBytes))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeByteArray("partsToReloadBytes", partsToReloadBytes))
return false;
writer.incrementState();
- case 15:
- if (!writer.writeMessage("resTopVer", resTopVer))
+ case 16:
+ if (!writer.writeAffinityTopologyVersion("resTopVer", resTopVer))
return false;
writer.incrementState();
- case 16:
- if (!writer.writeMessage("topVer", topVer))
+ case 17:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -683,7 +683,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
return false;
switch (reader.state()) {
- case 5:
+ case 6:
dupPartsData = reader.readMap("dupPartsData", MessageCollectionItemType.INT, MessageCollectionItemType.INT, false);
if (!reader.isLastRead())
@@ -691,7 +691,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 6:
+ case 7:
errsBytes = reader.readByteArray("errsBytes");
if (!reader.isLastRead())
@@ -699,7 +699,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 7:
+ case 8:
idealAffDiff = reader.readMap("idealAffDiff", MessageCollectionItemType.INT, MessageCollectionItemType.MSG, false);
if (!reader.isLastRead())
@@ -707,7 +707,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 8:
+ case 9:
joinedNodeAff = reader.readMap("joinedNodeAff", MessageCollectionItemType.INT, MessageCollectionItemType.MSG, false);
if (!reader.isLastRead())
@@ -715,7 +715,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 9:
+ case 10:
partCntrsBytes = reader.readByteArray("partCntrsBytes");
if (!reader.isLastRead())
@@ -723,7 +723,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 10:
+ case 11:
partCntrsBytes2 = reader.readByteArray("partCntrsBytes2");
if (!reader.isLastRead())
@@ -731,7 +731,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 11:
+ case 12:
partHistSuppliersBytes = reader.readByteArray("partHistSuppliersBytes");
if (!reader.isLastRead())
@@ -739,7 +739,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 12:
+ case 13:
partsBytes = reader.readByteArray("partsBytes");
if (!reader.isLastRead())
@@ -747,7 +747,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 13:
+ case 14:
partsSizesBytes = reader.readByteArray("partsSizesBytes");
if (!reader.isLastRead())
@@ -755,7 +755,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 14:
+ case 15:
partsToReloadBytes = reader.readByteArray("partsToReloadBytes");
if (!reader.isLastRead())
@@ -763,16 +763,16 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
reader.incrementState();
- case 15:
- resTopVer = reader.readMessage("resTopVer");
+ case 16:
+ resTopVer = reader.readAffinityTopologyVersion("resTopVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 16:
- topVer = reader.readMessage("topVer");
+ case 17:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -791,7 +791,7 @@ public void topologyVersion(AffinityTopologyVersion topVer) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 17;
+ return 18;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
index 088fb31d7f71..b872bdc30a21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java
@@ -245,6 +245,35 @@ public CachePartitionPartialCountersMap partitionUpdateCounters(int grpId, int p
return CachePartitionPartialCountersMap.fromCountersMap(map, partsCnt);
}
+ /**
+ * @param grpId Cache group ID.
+ * @param partsCnt Total cache partitions.
+ * @return Partition update counters.
+ */
+ @SuppressWarnings("unchecked")
+ public CachePartitionPartialCountersMap partitionUpdateCountersUnsorted(int grpId, int partsCnt) {
+ Object res = partCntrs == null ? null : partCntrs.get(grpId);
+
+ if (res == null)
+ return CachePartitionPartialCountersMap.EMPTY;
+
+ if (res instanceof CachePartitionPartialCountersMap)
+ return (CachePartitionPartialCountersMap)res;
+
+ assert res instanceof Map : res;
+
+ Map<Integer, T2<Long, Long>> map = (Map<Integer, T2<Long, Long>>)res;
+
+ CachePartitionPartialCountersMap partCounersMap = new CachePartitionPartialCountersMap(partsCnt);
+
+ for (Map.Entry<Integer, T2<Long, Long>> e : map.entrySet())
+ partCounersMap.add(e.getKey(), e.getValue().get1(), e.getValue().get2());
+
+ partCounersMap.trim();
+
+ return partCounersMap;
+ }
+
/**
* Adds partition sizes map for specified {@code grpId} to the current message.
*
@@ -473,65 +502,66 @@ public void setError(Exception ex) {
}
switch (writer.state()) {
- case 5:
+ case 6:
+ if (!writer.writeMessage("activeQryTrackers", activeQryTrackers))
+ return false;
+
+ writer.incrementState();
+
+ case 7:
if (!writer.writeBoolean("client", client))
return false;
writer.incrementState();
- case 6:
+ case 8:
if (!writer.writeMap("dupPartsData", dupPartsData, MessageCollectionItemType.INT, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 7:
+ case 9:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 8:
+ case 10:
if (!writer.writeMessage("finishMsg", finishMsg))
return false;
writer.incrementState();
- case 9:
+ case 11:
if (!writer.writeCollection("grpsAffRequest", grpsAffRequest, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 10:
+ case 12:
if (!writer.writeByteArray("partCntrsBytes", partCntrsBytes))
return false;
writer.incrementState();
- case 11:
+ case 13:
if (!writer.writeByteArray("partHistCntrsBytes", partHistCntrsBytes))
return false;
writer.incrementState();
- case 12:
+ case 14:
if (!writer.writeByteArray("partsBytes", partsBytes))
return false;
writer.incrementState();
- case 13:
+ case 15:
if (!writer.writeByteArray("partsSizesBytes", partsSizesBytes))
return false;
writer.incrementState();
- case 14:
- if (!writer.writeMessage("activeQryTrackers", activeQryTrackers))
- return false;
-
- writer.incrementState();
}
return true;
@@ -548,7 +578,15 @@ public void setError(Exception ex) {
return false;
switch (reader.state()) {
- case 5:
+ case 6:
+ activeQryTrackers = reader.readMessage("activeQryTrackers");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 7:
client = reader.readBoolean("client");
if (!reader.isLastRead())
@@ -556,7 +594,7 @@ public void setError(Exception ex) {
reader.incrementState();
- case 6:
+ case 8:
dupPartsData = reader.readMap("dupPartsData", MessageCollectionItemType.INT, MessageCollectionItemType.INT, false);
if (!reader.isLastRead())
@@ -564,7 +602,7 @@ public void setError(Exception ex) {
reader.incrementState();
- case 7:
+ case 9:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -572,7 +610,7 @@ public void setError(Exception ex) {
reader.incrementState();
- case 8:
+ case 10:
finishMsg = reader.readMessage("finishMsg");
if (!reader.isLastRead())
@@ -580,7 +618,7 @@ public void setError(Exception ex) {
reader.incrementState();
- case 9:
+ case 11:
grpsAffRequest = reader.readCollection("grpsAffRequest", MessageCollectionItemType.INT);
if (!reader.isLastRead())
@@ -588,7 +626,7 @@ public void setError(Exception ex) {
reader.incrementState();
- case 10:
+ case 12:
partCntrsBytes = reader.readByteArray("partCntrsBytes");
if (!reader.isLastRead())
@@ -596,7 +634,7 @@ public void setError(Exception ex) {
reader.incrementState();
- case 11:
+ case 13:
partHistCntrsBytes = reader.readByteArray("partHistCntrsBytes");
if (!reader.isLastRead())
@@ -604,7 +642,7 @@ public void setError(Exception ex) {
reader.incrementState();
- case 12:
+ case 14:
partsBytes = reader.readByteArray("partsBytes");
if (!reader.isLastRead())
@@ -612,7 +650,7 @@ public void setError(Exception ex) {
reader.incrementState();
- case 13:
+ case 15:
partsSizesBytes = reader.readByteArray("partsSizesBytes");
if (!reader.isLastRead())
@@ -620,13 +658,6 @@ public void setError(Exception ex) {
reader.incrementState();
- case 14:
- activeQryTrackers = reader.readMessage("activeQryTrackers");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
}
return reader.afterMessageRead(GridDhtPartitionsSingleMessage.class);
@@ -639,7 +670,7 @@ public void setError(Exception ex) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 15;
+ return 16;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
index 0be0f37aa22a..26d3cdeffd68 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleRequest.java
@@ -89,7 +89,7 @@ GridDhtPartitionExchangeId restoreExchangeId() {
}
switch (writer.state()) {
- case 5:
+ case 6:
if (!writer.writeMessage("restoreExchId", restoreExchId))
return false;
@@ -111,7 +111,7 @@ GridDhtPartitionExchangeId restoreExchangeId() {
return false;
switch (reader.state()) {
- case 5:
+ case 6:
restoreExchId = reader.readMessage("restoreExchId");
if (!reader.isLastRead())
@@ -131,7 +131,7 @@ GridDhtPartitionExchangeId restoreExchangeId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 6;
+ return 7;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
index 35c04fb7d790..0308ff4198d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java
@@ -64,7 +64,7 @@
* Exchange latch V2 protocol introduces following optimization:
* Joining nodes are explicitly excluded from possible latch participants.
*/
- public static final IgniteProductVersion PROTOCOL_V2_VERSION_SINCE = IgniteProductVersion.fromString("2.7.0");
+ public static final IgniteProductVersion PROTOCOL_V2_VERSION_SINCE = IgniteProductVersion.fromString("2.5.3");
/** Logger. */
private final IgniteLogger log;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
index bad1b6137bac..9c69fdf58185 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/LatchAckMessage.java
@@ -103,10 +103,11 @@ public boolean isFinal() {
writer.incrementState();
case 2:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
+
}
return true;
@@ -137,12 +138,13 @@ public boolean isFinal() {
reader.incrementState();
case 2:
- topVer = reader.readMessage("topVer");
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(LatchAckMessage.class);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
index 2ddc0d447ceb..326534d786f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java
@@ -32,6 +32,8 @@
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.failure.FailureContext;
+import org.apache.ignite.failure.FailureType;
import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.NodeStoppingException;
@@ -179,11 +181,15 @@
* @param ctx Context.
* @param grp Cache group.
* @param id Partition ID.
+ * @param recovery Flag indicates that partition is created during recovery phase.
*/
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
- public GridDhtLocalPartition(GridCacheSharedContext ctx,
- CacheGroupContext grp,
- int id) {
+ public GridDhtLocalPartition(
+ GridCacheSharedContext ctx,
+ CacheGroupContext grp,
+ int id,
+ boolean recovery
+ ) {
super(ENTRY_FACTORY);
this.id = id;
@@ -220,7 +226,7 @@ public GridDhtLocalPartition(GridCacheSharedContext ctx,
store = grp.offheap().createCacheDataStore(id);
// Log partition creation for further crash recovery purposes.
- if (grp.walEnabled())
+ if (grp.walEnabled() && !recovery)
ctx.wal().log(new PartitionMetaStateRecord(grp.groupId(), id, state(), updateCounter()));
// Inject row cache cleaner on store creation
@@ -567,6 +573,8 @@ private boolean casState(long state, GridDhtPartitionState toState) {
}
catch (IgniteCheckedException e) {
U.error(log, "Failed to log partition state change to WAL.", e);
+
+ ctx.kernalContext().failure().process(new FailureContext(FailureType.CRITICAL_ERROR, e));
}
if (log.isDebugEnabled())
@@ -981,6 +989,19 @@ public long nextUpdateCounter(int cacheId, AffinityTopologyVersion topVer, boole
if (grp.sharedGroup())
grp.onPartitionCounterUpdate(cacheId, id, primaryCntr != null ? primaryCntr : nextCntr, topVer, primary);
+ // This is first update in partition, we should log partition state information for further crash recovery.
+ if (nextCntr == 1) {
+ if (grp.persistenceEnabled() && grp.walEnabled())
+ try {
+ ctx.wal().log(new PartitionMetaStateRecord(grp.groupId(), id, state(), 0));
+ }
+ catch (IgniteCheckedException e) {
+ U.error(log, "Failed to log partition state snapshot to WAL.", e);
+
+ ctx.kernalContext().failure().process(new FailureContext(FailureType.CRITICAL_ERROR, e));
+ }
+ }
+
return nextCntr;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
index 683a140c5d97..a84d826a8864 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
@@ -313,9 +313,18 @@ private String mapString(GridDhtPartitionMap map) {
/** {@inheritDoc} */
@Override public GridDhtTopologyFuture topologyVersionFuture() {
- assert topReadyFut != null;
+ GridDhtTopologyFuture topReadyFut0 = topReadyFut;
- return topReadyFut;
+ assert topReadyFut0 != null;
+
+ if (!topReadyFut0.changedAffinity()) {
+ GridDhtTopologyFuture lastFut = ctx.exchange().lastFinishedFuture();
+
+ if (lastFut != null)
+ return lastFut;
+ }
+
+ return topReadyFut0;
}
/** {@inheritDoc} */
@@ -748,45 +757,47 @@ private boolean partitionLocalNode(int p, AffinityTopologyVersion topVer) {
long updateSeq = this.updateSeq.incrementAndGet();
- for (int p = 0; p < partitions; p++) {
- GridDhtLocalPartition locPart = localPartition0(p, topVer, false, true);
-
- if (partitionLocalNode(p, topVer)) {
- // Prepare partition to rebalance if it's not happened on full map update phase.
- if (locPart == null || locPart.state() == RENTING || locPart.state() == EVICTED)
- locPart = rebalancePartition(p, false);
+ if (!ctx.localNode().isClient()) {
+ for (int p = 0; p < partitions; p++) {
+ GridDhtLocalPartition locPart = localPartition0(p, topVer, false, true);
- GridDhtPartitionState state = locPart.state();
+ if (partitionLocalNode(p, topVer)) {
+ // Prepare partition to rebalance if it's not happened on full map update phase.
+ if (locPart == null || locPart.state() == RENTING || locPart.state() == EVICTED)
+ locPart = rebalancePartition(p, false);
- if (state == MOVING) {
- if (grp.rebalanceEnabled()) {
- Collection<ClusterNode> owners = owners(p);
+ GridDhtPartitionState state = locPart.state();
- // If an owner node left during exchange, then new exchange should be started with detecting lost partitions.
- if (!F.isEmpty(owners)) {
- if (log.isDebugEnabled())
- log.debug("Will not own partition (there are owners to rebalance from) " +
- "[grp=" + grp.cacheOrGroupName() + ", p=" + p + ", owners = " + owners + ']');
+ if (state == MOVING) {
+ if (grp.rebalanceEnabled()) {
+ Collection<ClusterNode> owners = owners(p);
+
+ // If an owner node left during exchange, then new exchange should be started with detecting lost partitions.
+ if (!F.isEmpty(owners)) {
+ if (log.isDebugEnabled())
+ log.debug("Will not own partition (there are owners to rebalance from) " +
+ "[grp=" + grp.cacheOrGroupName() + ", p=" + p + ", owners = " + owners + ']');
+ }
}
+ else
+ updateSeq = updateLocal(p, locPart.state(), updateSeq, topVer);
}
- else
- updateSeq = updateLocal(p, locPart.state(), updateSeq, topVer);
}
- }
- else {
- if (locPart != null) {
- GridDhtPartitionState state = locPart.state();
+ else {
+ if (locPart != null) {
+ GridDhtPartitionState state = locPart.state();
- if (state == MOVING) {
- locPart.rent(false);
+ if (state == MOVING) {
+ locPart.rent(false);
- updateSeq = updateLocal(p, locPart.state(), updateSeq, topVer);
+ updateSeq = updateLocal(p, locPart.state(), updateSeq, topVer);
- changed = true;
+ changed = true;
- if (log.isDebugEnabled()) {
- log.debug("Evicting " + state + " partition (it does not belong to affinity) [" +
- "grp=" + grp.cacheOrGroupName() + ", p=" + locPart.id() + ']');
+ if (log.isDebugEnabled()) {
+ log.debug("Evicting " + state + " partition (it does not belong to affinity) [" +
+ "grp=" + grp.cacheOrGroupName() + ", p=" + locPart.id() + ']');
+ }
}
}
}
@@ -850,7 +861,7 @@ private GridDhtLocalPartition getOrCreatePartition(int p) {
if (loc != null)
loc.awaitDestroy();
- locParts.set(p, loc = new GridDhtLocalPartition(ctx, grp, p));
+ locParts.set(p, loc = new GridDhtLocalPartition(ctx, grp, p, false));
long updCntr = cntrMap.updateCounter(p);
@@ -881,12 +892,10 @@ private GridDhtLocalPartition getOrCreatePartition(int p) {
if (part != null && part.state() != EVICTED)
return part;
- part = new GridDhtLocalPartition(ctx, grp, p);
+ part = new GridDhtLocalPartition(ctx, grp, p, true);
locParts.set(p, part);
- ctx.pageStore().onPartitionCreated(grp.groupId(), p);
-
return part;
}
finally {
@@ -958,7 +967,7 @@ else if (loc != null && state == RENTING && !showRenting) {
"[grp=" + grp.cacheOrGroupName() + ", part=" + p + ", topVer=" + topVer +
", this.topVer=" + this.readyTopVer + ']');
- locParts.set(p, loc = new GridDhtLocalPartition(ctx, grp, p));
+ locParts.set(p, loc = new GridDhtLocalPartition(ctx, grp, p, false));
this.updateSeq.incrementAndGet();
@@ -1131,25 +1140,38 @@ else if (loc != null && state == RENTING && !showRenting) {
List<ClusterNode> nodes = null;
- if (!topVer.equals(diffFromAffinityVer)) {
- LT.warn(log, "Requested topology version does not match calculated diff, will require full iteration to" +
- "calculate mapping [grp=" + grp.cacheOrGroupName() + ", topVer=" + topVer +
- ", diffVer=" + diffFromAffinityVer + "]");
+ AffinityTopologyVersion diffVer = diffFromAffinityVer;
- nodes = new ArrayList<>();
+ if (!diffVer.equals(topVer)) {
+ LT.warn(log, "Requested topology version does not match calculated diff, need to check if " +
+ "affinity has changed [grp=" + grp.cacheOrGroupName() + ", topVer=" + topVer +
+ ", diffVer=" + diffVer + "]");
- nodes.addAll(affNodes);
+ boolean affChanged;
- for (Map.Entry<UUID, GridDhtPartitionMap> entry : node2part.entrySet()) {
- GridDhtPartitionState state = entry.getValue().get(p);
+ if (diffVer.compareTo(topVer) < 0)
+ affChanged = ctx.exchange().affinityChanged(diffVer, topVer);
+ else
+ affChanged = ctx.exchange().affinityChanged(topVer, diffVer);
- ClusterNode n = ctx.discovery().node(entry.getKey());
+ if (affChanged) {
+ LT.warn(log, "Requested topology version does not match calculated diff, will require full iteration to" +
+ "calculate mapping [grp=" + grp.cacheOrGroupName() + ", topVer=" + topVer +
+ ", diffVer=" + diffVer + "]");
- if (n != null && state != null && (state == MOVING || state == OWNING || state == RENTING)
- && !nodes.contains(n) && (topVer.topologyVersion() < 0 || n.order() <= topVer.topologyVersion())) {
- nodes.add(n);
- }
+ nodes = new ArrayList<>();
+
+ nodes.addAll(affNodes);
+
+ for (Map.Entry<UUID, GridDhtPartitionMap> entry : node2part.entrySet()) {
+ GridDhtPartitionState state = entry.getValue().get(p);
+ ClusterNode n = ctx.discovery().node(entry.getKey());
+
+ if (n != null && state != null && (state == MOVING || state == OWNING || state == RENTING)
+ && !nodes.contains(n) && (topVer.topologyVersion() < 0 || n.order() <= topVer.topologyVersion()))
+ nodes.add(n);
+ }
}
return nodes;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsReservation.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsReservation.java
index 2682a896e747..501748628661 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsReservation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsReservation.java
@@ -179,7 +179,7 @@ public void onPublish(CI1<GridDhtPartitionsReservation> unpublish) {
*/
private static void tryEvict(GridDhtLocalPartition[] parts) {
if (parts == null) // Can be not initialized yet.
- return ;
+ return;
for (GridDhtLocalPartition part : parts)
tryEvict(part);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsStateValidator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsStateValidator.java
index d131d56375e4..63fe926acc60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsStateValidator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionsStateValidator.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.distributed.dht.topology;
+import java.util.AbstractMap;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -33,7 +34,6 @@
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
import org.apache.ignite.internal.processors.cache.mvcc.MvccUtils;
-import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.lang.IgniteProductVersion;
import org.jetbrains.annotations.Nullable;
@@ -78,14 +78,16 @@ public void validatePartitionCountersAndSizes(
final Set<UUID> ignoringNodes = new HashSet<>();
// Ignore just joined nodes.
- for (DiscoveryEvent evt : fut.events().events())
+ for (DiscoveryEvent evt : fut.events().events()) {
if (evt.type() == EVT_NODE_JOINED)
ignoringNodes.add(evt.eventNode().id());
+ }
AffinityTopologyVersion topVer = fut.context().events().topologyVersion();
// Validate update counters.
Map<Integer, Map<UUID, Long>> result = validatePartitionsUpdateCounters(top, messages, ignoringNodes);
+
if (!result.isEmpty())
throw new IgniteCheckedException("Partitions update counters are inconsistent for " + fold(topVer, result));
@@ -110,16 +112,21 @@ public void validatePartitionCountersAndSizes(
*
* @param top Topology to validate.
* @param nodeId Node which sent single message.
- * @param singleMsg Single message.
+ * @param countersMap Counters map.
+ * @param sizesMap Sizes map.
* @return Set of partition ids should be excluded from validation.
*/
- @Nullable private Set<Integer> shouldIgnore(GridDhtPartitionTopology top, UUID nodeId, GridDhtPartitionsSingleMessage singleMsg) {
- CachePartitionPartialCountersMap countersMap = singleMsg.partitionUpdateCounters(top.groupId(), top.partitions());
- Map<Integer, Long> sizesMap = singleMsg.partitionSizes(top.groupId());
-
+ @Nullable private Set<Integer> shouldIgnore(
+ GridDhtPartitionTopology top,
+ UUID nodeId,
+ CachePartitionPartialCountersMap countersMap,
+ Map<Integer, Long> sizesMap
+ ) {
Set<Integer> ignore = null;
- for (int p = 0; p < top.partitions(); p++) {
+ for (int i = 0; i < countersMap.size(); i++) {
+ int p = countersMap.partitionAt(i);
+
if (top.partitionState(nodeId, p) != GridDhtPartitionState.OWNING) {
if (ignore == null)
ignore = new HashSet<>();
@@ -129,9 +136,8 @@ public void validatePartitionCountersAndSizes(
continue;
}
- int partIdx = countersMap.partitionIndex(p);
- long updateCounter = partIdx >= 0 ? countersMap.updateCounterAt(partIdx) : 0;
- long size = sizesMap.containsKey(p) ? sizesMap.get(p) : 0;
+ long updateCounter = countersMap.updateCounterAt(i);
+ long size = sizesMap.getOrDefault(p, 0L);
// Do not validate partitions with zero update counter and size.
if (updateCounter == 0 && size == 0) {
@@ -154,14 +160,14 @@ public void validatePartitionCountersAndSizes(
* @return Invalid partitions map with following structure: (partId, (nodeId, updateCounter)).
* If map is empty validation is successful.
*/
- public Map<Integer, Map<UUID, Long>> validatePartitionsUpdateCounters(
- GridDhtPartitionTopology top,
- Map<UUID, GridDhtPartitionsSingleMessage> messages,
- Set<UUID> ignoringNodes
- ) {
+ public Map<Integer, Map<UUID, Long>> validatePartitionsUpdateCounters(
+ GridDhtPartitionTopology top,
+ Map<UUID, GridDhtPartitionsSingleMessage> messages,
+ Set<UUID> ignoringNodes
+ ) {
Map<Integer, Map<UUID, Long>> invalidPartitions = new HashMap<>();
- Map<Integer, T2<UUID, Long>> updateCountersAndNodesByPartitions = new HashMap<>();
+ Map<Integer, AbstractMap.Entry<UUID, Long>> updateCountersAndNodesByPartitions = new HashMap<>();
// Populate counters statistics from local node partitions.
for (GridDhtLocalPartition part : top.currentLocalPartitions()) {
@@ -171,7 +177,7 @@ public void validatePartitionCountersAndSizes(
if (part.updateCounter() == 0 && part.fullSize() == 0)
continue;
- updateCountersAndNodesByPartitions.put(part.id(), new T2<>(cctx.localNodeId(), part.updateCounter()));
+ updateCountersAndNodesByPartitions.put(part.id(), new AbstractMap.SimpleEntry<>(cctx.localNodeId(), part.updateCounter()));
}
int partitions = top.partitions();
@@ -182,18 +188,23 @@ public void validatePartitionCountersAndSizes(
if (ignoringNodes.contains(nodeId))
continue;
- CachePartitionPartialCountersMap countersMap = e.getValue().partitionUpdateCounters(top.groupId(), partitions);
+ final GridDhtPartitionsSingleMessage message = e.getValue();
+
+ CachePartitionPartialCountersMap countersMap = message.partitionUpdateCountersUnsorted(top.groupId(), partitions);
- Set<Integer> ignorePartitions = shouldIgnore(top, nodeId, e.getValue());
+ Map<Integer, Long> sizesMap = message.partitionSizes(top.groupId());
- for (int part = 0; part < partitions; part++) {
- if (ignorePartitions != null && ignorePartitions.contains(part))
+ Set<Integer> ignorePartitions = shouldIgnore(top, nodeId, countersMap, sizesMap);
+
+ for (int i = 0; i < countersMap.size(); i++) {
+ int p = countersMap.partitionAt(i);
+
+ if (ignorePartitions != null && ignorePartitions.contains(p))
continue;
- int partIdx = countersMap.partitionIndex(part);
- long currentCounter = partIdx >= 0 ? countersMap.updateCounterAt(partIdx) : 0;
+ long currentCounter = countersMap.updateCounterAt(i);
- process(invalidPartitions, updateCountersAndNodesByPartitions, part, nodeId, currentCounter);
+ process(invalidPartitions, updateCountersAndNodesByPartitions, p, nodeId, currentCounter);
}
}
@@ -209,14 +220,14 @@ public void validatePartitionCountersAndSizes(
* @return Invalid partitions map with following structure: (partId, (nodeId, cacheSize)).
* If map is empty validation is successful.
*/
- public Map<Integer, Map<UUID, Long>> validatePartitionsSizes(
- GridDhtPartitionTopology top,
- Map<UUID, GridDhtPartitionsSingleMessage> messages,
- Set<UUID> ignoringNodes
- ) {
+ public Map<Integer, Map<UUID, Long>> validatePartitionsSizes(
+ GridDhtPartitionTopology top,
+ Map<UUID, GridDhtPartitionsSingleMessage> messages,
+ Set<UUID> ignoringNodes
+ ) {
Map<Integer, Map<UUID, Long>> invalidPartitions = new HashMap<>();
- Map<Integer, T2<UUID, Long>> sizesAndNodesByPartitions = new HashMap<>();
+ Map<Integer, AbstractMap.Entry<UUID, Long>> sizesAndNodesByPartitions = new HashMap<>();
// Populate sizes statistics from local node partitions.
for (GridDhtLocalPartition part : top.currentLocalPartitions()) {
@@ -226,7 +237,7 @@ public void validatePartitionCountersAndSizes(
if (part.updateCounter() == 0 && part.fullSize() == 0)
continue;
- sizesAndNodesByPartitions.put(part.id(), new T2<>(cctx.localNodeId(), part.fullSize()));
+ sizesAndNodesByPartitions.put(part.id(), new AbstractMap.SimpleEntry<>(cctx.localNodeId(), part.fullSize()));
}
int partitions = top.partitions();
@@ -237,17 +248,23 @@ public void validatePartitionCountersAndSizes(
if (ignoringNodes.contains(nodeId))
continue;
- Map<Integer, Long> sizesMap = e.getValue().partitionSizes(top.groupId());
+ final GridDhtPartitionsSingleMessage message = e.getValue();
+
+ CachePartitionPartialCountersMap countersMap = message.partitionUpdateCountersUnsorted(top.groupId(), partitions);
+
+ Map<Integer, Long> sizesMap = message.partitionSizes(top.groupId());
+
+ Set<Integer> ignorePartitions = shouldIgnore(top, nodeId, countersMap, sizesMap);
- Set<Integer> ignorePartitions = shouldIgnore(top, nodeId, e.getValue());
+ for (int i = 0; i < countersMap.size(); i++) {
+ int p = countersMap.partitionAt(i);
- for (int part = 0; part < partitions; part++) {
- if (ignorePartitions != null && ignorePartitions.contains(part))
+ if (ignorePartitions != null && ignorePartitions.contains(p))
continue;
- long currentSize = sizesMap.containsKey(part) ? sizesMap.get(part) : 0L;
+ long currentSize = sizesMap.getOrDefault(p, 0L);
- process(invalidPartitions, sizesAndNodesByPartitions, part, nodeId, currentSize);
+ process(invalidPartitions, sizesAndNodesByPartitions, p, nodeId, currentSize);
}
}
@@ -264,20 +281,22 @@ public void validatePartitionCountersAndSizes(
* @param node Node id.
* @param counter Counter value reported by {@code node}.
*/
- private void process(Map<Integer, Map<UUID, Long>> invalidPartitions,
- Map<Integer, T2<UUID, Long>> countersAndNodes,
- int part,
- UUID node,
- long counter) {
- T2<UUID, Long> existingData = countersAndNodes.get(part);
+ private void process(
+ Map<Integer, Map<UUID, Long>> invalidPartitions,
+ Map<Integer, AbstractMap.Entry<UUID, Long>> countersAndNodes,
+ int part,
+ UUID node,
+ long counter
+ ) {
+ AbstractMap.Entry<UUID, Long> existingData = countersAndNodes.get(part);
if (existingData == null)
- countersAndNodes.put(part, new T2<>(node, counter));
+ countersAndNodes.put(part, new AbstractMap.SimpleEntry<>(node, counter));
- if (existingData != null && counter != existingData.get2()) {
+ if (existingData != null && counter != existingData.getValue()) {
if (!invalidPartitions.containsKey(part)) {
Map<UUID, Long> map = new HashMap<>();
- map.put(existingData.get1(), existingData.get2());
+ map.put(existingData.getKey(), existingData.getValue());
invalidPartitions.put(part, map);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
index cd010fa89d32..27b11c242bd2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/PartitionsEvictManager.java
@@ -19,6 +19,7 @@
import java.util.Collection;
import java.util.Comparator;
+import java.util.HashSet;
import java.util.Map;
import java.util.Queue;
import java.util.Set;
@@ -31,7 +32,6 @@
import org.apache.ignite.internal.managers.communication.GridIoPolicy;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.GridCacheSharedManagerAdapter;
-import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -110,28 +110,28 @@ public void onCacheGroupStopped(CacheGroupContext grp){
* @param part Partition to evict.
*/
public void evictPartitionAsync(CacheGroupContext grp, GridDhtLocalPartition part) {
- // Check node stop.
- if (sharedEvictionContext.shouldStop())
- return;
-
GroupEvictionContext groupEvictionContext = evictionGroupsMap.computeIfAbsent(
grp.groupId(), (k) -> new GroupEvictionContext(grp));
- PartitionEvictionTask evictionTask = groupEvictionContext.createEvictPartitionTask(part);
-
- if (evictionTask == null)
+ // Check node stop.
+ if (groupEvictionContext.shouldStop())
return;
- if (log.isDebugEnabled())
- log.debug("Partition has been scheduled for eviction [grp=" + grp.cacheOrGroupName()
- + ", p=" + part.id() + ", state=" + part.state() + "]");
-
int bucket;
synchronized (mux) {
- bucket = evictionQueue.offer(evictionTask);
+ if (!groupEvictionContext.partIds.add(part.id()))
+ return;
+
+ bucket = evictionQueue.offer(new PartitionEvictionTask(part, groupEvictionContext));
}
+ groupEvictionContext.totalTasks.incrementAndGet();
+
+ if (log.isDebugEnabled())
+ log.debug("Partition has been scheduled for eviction [grp=" + grp.cacheOrGroupName()
+ + ", p=" + part.id() + ", state=" + part.state() + "]");
+
scheduleNextPartitionEviction(bucket);
}
@@ -270,7 +270,7 @@ private void showProgress() {
private final CacheGroupContext grp;
/** Deduplicate set partition ids. */
- private final Set<Integer> partIds = new GridConcurrentHashSet<>();
+ private final Set<Integer> partIds = new HashSet<>();
/** Future for currently running partition eviction task. */
private final Map<Integer, IgniteInternalFuture<?>> partsEvictFutures = new ConcurrentHashMap<>();
@@ -296,19 +296,6 @@ private GroupEvictionContext(CacheGroupContext grp) {
return stop || sharedEvictionContext.shouldStop();
}
- /**
- *
- * @param part Grid local partition.
- */
- private PartitionEvictionTask createEvictPartitionTask(GridDhtLocalPartition part){
- if (shouldStop() || !partIds.add(part.id()))
- return null;
-
- totalTasks.incrementAndGet();
-
- return new PartitionEvictionTask(part, this);
- }
-
/**
*
* @param task Partition eviction task.
@@ -323,6 +310,8 @@ private synchronized void taskScheduled(PartitionEvictionTask task) {
int partId = task.part.id();
+ partIds.remove(partId);
+
partsEvictFutures.put(partId, fut);
fut.listen(f -> {
@@ -426,12 +415,14 @@ private PartitionEvictionTask(
if (part.state() == GridDhtPartitionState.EVICTED && part.markForDestroy())
part.destroy();
}
- else // Re-offer partition if clear was unsuccessful due to partition reservation.
- evictionQueue.offer(this);
// Complete eviction future before schedule new to prevent deadlock with
// simultaneous eviction stopping and scheduling new eviction.
finishFut.onDone();
+
+ // Re-offer partition if clear was unsuccessful due to partition reservation.
+ if (!success)
+ evictPartitionAsync(groupEvictionContext.grp, part);
}
catch (Throwable ex) {
finishFut.onDone(ex);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
index 9670f8a4ea5c..c19d486a489b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java
@@ -174,4 +174,4 @@ public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws Ignite
@Override public String toString() {
return S.toString(CacheVersionedValue.class, this);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index f594e2bd353f..a607a9afafbc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -360,74 +360,74 @@ public long accessTtl() {
}
switch (writer.state()) {
- case 3:
- if (!writer.writeLong("accessTtl", accessTtl))
- return false;
-
- writer.incrementState();
-
case 4:
- if (!writer.writeLong("createTtl", createTtl))
+ if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
case 5:
- if (!writer.writeByte("flags", flags))
+ if (!writer.writeLong("createTtl", createTtl))
return false;
writer.incrementState();
case 6:
- if (!writer.writeIgniteUuid("futId", futId))
+ if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
case 7:
- if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
+ if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
case 8:
- if (!writer.writeIgniteUuid("miniId", miniId))
+ if (!writer.writeCollection("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 9:
- if (!writer.writeCollection("readersFlags", readersFlags, MessageCollectionItemType.BOOLEAN))
+ if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
case 10:
- if (!writer.writeUuid("subjId", subjId))
+ if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
case 11:
- if (!writer.writeInt("taskNameHash", taskNameHash))
+ if (!writer.writeCollection("readersFlags", readersFlags, MessageCollectionItemType.BOOLEAN))
return false;
writer.incrementState();
case 12:
- if (!writer.writeMessage("topVer", topVer))
+ if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 13:
- if (!writer.writeMessage("ver", ver))
+ if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
case 14:
- if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
+ return false;
+
+ writer.incrementState();
+
+ case 15:
+ if (!writer.writeMessage("ver", ver))
return false;
writer.incrementState();
@@ -448,7 +448,7 @@ public long accessTtl() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
@@ -456,7 +456,7 @@ public long accessTtl() {
reader.incrementState();
- case 4:
+ case 5:
createTtl = reader.readLong("createTtl");
if (!reader.isLastRead())
@@ -464,7 +464,7 @@ public long accessTtl() {
reader.incrementState();
- case 5:
+ case 6:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -472,7 +472,7 @@ public long accessTtl() {
reader.incrementState();
- case 6:
+ case 7:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -480,7 +480,7 @@ public long accessTtl() {
reader.incrementState();
- case 7:
+ case 8:
keys = reader.readCollection("keys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -488,7 +488,7 @@ public long accessTtl() {
reader.incrementState();
- case 8:
+ case 9:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -496,48 +496,48 @@ public long accessTtl() {
reader.incrementState();
- case 9:
- readersFlags = reader.readCollection("readersFlags", MessageCollectionItemType.BOOLEAN);
+ case 10:
+ mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 10:
- subjId = reader.readUuid("subjId");
+ case 11:
+ readersFlags = reader.readCollection("readersFlags", MessageCollectionItemType.BOOLEAN);
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 11:
- taskNameHash = reader.readInt("taskNameHash");
+ case 12:
+ subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 12:
- topVer = reader.readMessage("topVer");
+ case 13:
+ taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 13:
- ver = reader.readMessage("ver");
+ case 14:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 14:
- mvccSnapshot = reader.readMessage("mvccSnapshot");
+ case 15:
+ ver = reader.readMessage("ver");
if (!reader.isLastRead())
return false;
@@ -556,7 +556,7 @@ public long accessTtl() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 15;
+ return 16;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
index b4e4424862c5..578c46b6ac34 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java
@@ -228,43 +228,43 @@ public void error(IgniteCheckedException err) {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeCollection("entries", entries, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeCollection("invalidParts", invalidParts, MessageCollectionItemType.INT))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeIgniteUuid("miniId", miniId))
return false;
writer.incrementState();
- case 8:
- if (!writer.writeMessage("topVer", topVer))
+ case 9:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeMessage("ver", ver))
return false;
@@ -286,7 +286,7 @@ public void error(IgniteCheckedException err) {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
entries = reader.readCollection("entries", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -294,7 +294,7 @@ public void error(IgniteCheckedException err) {
reader.incrementState();
- case 4:
+ case 5:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -302,7 +302,7 @@ public void error(IgniteCheckedException err) {
reader.incrementState();
- case 5:
+ case 6:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -310,7 +310,7 @@ public void error(IgniteCheckedException err) {
reader.incrementState();
- case 6:
+ case 7:
invalidParts = reader.readCollection("invalidParts", MessageCollectionItemType.INT);
if (!reader.isLastRead())
@@ -318,7 +318,7 @@ public void error(IgniteCheckedException err) {
reader.incrementState();
- case 7:
+ case 8:
miniId = reader.readIgniteUuid("miniId");
if (!reader.isLastRead())
@@ -326,15 +326,15 @@ public void error(IgniteCheckedException err) {
reader.incrementState();
- case 8:
- topVer = reader.readMessage("topVer");
+ case 9:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 9:
+ case 10:
ver = reader.readMessage("ver");
if (!reader.isLastRead())
@@ -354,7 +354,7 @@ public void error(IgniteCheckedException err) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 11;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index f736cae61848..0712e2234f6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -363,56 +363,56 @@ public long accessTtl() {
}
switch (writer.state()) {
- case 20:
+ case 21:
if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
- case 21:
+ case 22:
if (!writer.writeLong("createTtl", createTtl))
return false;
writer.incrementState();
- case 22:
+ case 23:
if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 23:
+ case 24:
if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 25:
+ case 26:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 26:
+ case 27:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 27:
+ case 28:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 28:
- if (!writer.writeMessage("topVer", topVer))
+ case 29:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -433,7 +433,7 @@ public long accessTtl() {
return false;
switch (reader.state()) {
- case 20:
+ case 21:
accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
@@ -441,7 +441,7 @@ public long accessTtl() {
reader.incrementState();
- case 21:
+ case 22:
createTtl = reader.readLong("createTtl");
if (!reader.isLastRead())
@@ -449,7 +449,7 @@ public long accessTtl() {
reader.incrementState();
- case 22:
+ case 23:
dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -457,7 +457,7 @@ public long accessTtl() {
reader.incrementState();
- case 23:
+ case 24:
filter = reader.readObjectArray("filter", MessageCollectionItemType.MSG, CacheEntryPredicate.class);
if (!reader.isLastRead())
@@ -465,7 +465,7 @@ public long accessTtl() {
reader.incrementState();
- case 24:
+ case 25:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -473,7 +473,7 @@ public long accessTtl() {
reader.incrementState();
- case 25:
+ case 26:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -481,7 +481,7 @@ public long accessTtl() {
reader.incrementState();
- case 26:
+ case 27:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -489,7 +489,7 @@ public long accessTtl() {
reader.incrementState();
- case 27:
+ case 28:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -497,8 +497,8 @@ public long accessTtl() {
reader.incrementState();
- case 28:
- topVer = reader.readMessage("topVer");
+ case 29:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -517,7 +517,7 @@ public long accessTtl() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 29;
+ return 30;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
index e88f0a07e075..b6c6d8c903c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
@@ -208,37 +208,37 @@ public void addValueBytes(
}
switch (writer.state()) {
- case 10:
- if (!writer.writeMessage("clientRemapVer", clientRemapVer))
+ case 11:
+ if (!writer.writeAffinityTopologyVersion("clientRemapVer", clientRemapVer))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeObjectArray("dhtVers", dhtVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeBooleanArray("filterRes", filterRes))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeObjectArray("mappedVers", mappedVers, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG))
return false;
@@ -260,15 +260,15 @@ public void addValueBytes(
return false;
switch (reader.state()) {
- case 10:
- clientRemapVer = reader.readMessage("clientRemapVer");
+ case 11:
+ clientRemapVer = reader.readAffinityTopologyVersion("clientRemapVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 11:
+ case 12:
dhtVers = reader.readObjectArray("dhtVers", MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -276,7 +276,7 @@ public void addValueBytes(
reader.incrementState();
- case 12:
+ case 13:
filterRes = reader.readBooleanArray("filterRes");
if (!reader.isLastRead())
@@ -284,7 +284,7 @@ public void addValueBytes(
reader.incrementState();
- case 13:
+ case 14:
mappedVers = reader.readObjectArray("mappedVers", MessageCollectionItemType.MSG, GridCacheVersion.class);
if (!reader.isLastRead())
@@ -292,7 +292,7 @@ public void addValueBytes(
reader.incrementState();
- case 14:
+ case 15:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -300,7 +300,7 @@ public void addValueBytes(
reader.incrementState();
- case 15:
+ case 16:
pending = reader.readCollection("pending", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -320,7 +320,7 @@ public void addValueBytes(
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 16;
+ return 17;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
index cf885e27111e..44addb053243 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
@@ -296,7 +296,7 @@ public boolean recovery() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
accessTtl = reader.readLong("accessTtl");
if (!reader.isLastRead())
@@ -304,7 +304,7 @@ public boolean recovery() {
reader.incrementState();
- case 4:
+ case 5:
createTtl = reader.readLong("createTtl");
if (!reader.isLastRead())
@@ -312,7 +312,7 @@ public boolean recovery() {
reader.incrementState();
- case 5:
+ case 6:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -320,7 +320,7 @@ public boolean recovery() {
reader.incrementState();
- case 6:
+ case 7:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -328,7 +328,7 @@ public boolean recovery() {
reader.incrementState();
- case 7:
+ case 8:
key = reader.readMessage("key");
if (!reader.isLastRead())
@@ -336,32 +336,32 @@ public boolean recovery() {
reader.incrementState();
- case 8:
- subjId = reader.readUuid("subjId");
+ case 9:
+ mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 9:
- taskNameHash = reader.readInt("taskNameHash");
+ case 10:
+ subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 10:
- topVer = reader.readMessage("topVer");
+ case 11:
+ taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 11:
- mvccSnapshot = reader.readMessage("mvccSnapshot");
+ case 12:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -388,56 +388,56 @@ public boolean recovery() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeLong("accessTtl", accessTtl))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeLong("createTtl", createTtl))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeMessage("key", key))
return false;
writer.incrementState();
- case 8:
- if (!writer.writeUuid("subjId", subjId))
+ case 9:
+ if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
- case 9:
- if (!writer.writeInt("taskNameHash", taskNameHash))
+ case 10:
+ if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 10:
- if (!writer.writeMessage("topVer", topVer))
+ case 11:
+ if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 11:
- if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
+ case 12:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -459,7 +459,7 @@ public boolean recovery() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 12;
+ return 13;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
index 2cb75c253e29..584cec2eb1cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetResponse.java
@@ -206,32 +206,32 @@ else if (res instanceof GridCacheEntryInfo)
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeLong("futId", futId))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeMessage("res", res))
return false;
writer.incrementState();
- case 7:
- if (!writer.writeMessage("topVer", topVer))
+ case 8:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -252,7 +252,7 @@ else if (res instanceof GridCacheEntryInfo)
return false;
switch (reader.state()) {
- case 3:
+ case 4:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -260,7 +260,7 @@ else if (res instanceof GridCacheEntryInfo)
reader.incrementState();
- case 4:
+ case 5:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -268,7 +268,7 @@ else if (res instanceof GridCacheEntryInfo)
reader.incrementState();
- case 5:
+ case 6:
futId = reader.readLong("futId");
if (!reader.isLastRead())
@@ -276,7 +276,7 @@ else if (res instanceof GridCacheEntryInfo)
reader.incrementState();
- case 6:
+ case 7:
res = reader.readMessage("res");
if (!reader.isLastRead())
@@ -284,8 +284,8 @@ else if (res instanceof GridCacheEntryInfo)
reader.incrementState();
- case 7:
- topVer = reader.readMessage("topVer");
+ case 8:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -309,7 +309,7 @@ else if (res instanceof GridCacheEntryInfo)
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 9;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java
index e71de896a185..dd868618c005 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistRequest.java
@@ -388,97 +388,97 @@ public CacheEntryPredicate filter() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeBoolean("clientFirst", clientFirst))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeMessage("filter", filter))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeObjectArray("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeMessage("lockVer", lockVer))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeBoolean("needRes", needRes))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 16:
- if (!writer.writeMessage("topVer", topVer))
+ case 17:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 17:
+ case 18:
if (!writer.writeLong("txTimeout", txTimeout))
return false;
writer.incrementState();
- case 18:
+ case 19:
if (!writer.writeObjectArray("values", values, MessageCollectionItemType.MSG))
return false;
@@ -500,7 +500,7 @@ public CacheEntryPredicate filter() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
clientFirst = reader.readBoolean("clientFirst");
if (!reader.isLastRead())
@@ -508,7 +508,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 4:
+ case 5:
filter = reader.readMessage("filter");
if (!reader.isLastRead())
@@ -516,7 +516,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 5:
+ case 6:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -524,7 +524,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 6:
+ case 7:
keys = reader.readObjectArray("keys", MessageCollectionItemType.MSG, KeyCacheObject.class);
if (!reader.isLastRead())
@@ -532,7 +532,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 7:
+ case 8:
lockVer = reader.readMessage("lockVer");
if (!reader.isLastRead())
@@ -540,7 +540,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 8:
+ case 9:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -548,7 +548,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 9:
+ case 10:
mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
@@ -556,7 +556,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 10:
+ case 11:
needRes = reader.readBoolean("needRes");
if (!reader.isLastRead())
@@ -564,7 +564,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 11:
+ case 12:
byte opOrd;
opOrd = reader.readByte("op");
@@ -576,7 +576,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 12:
+ case 13:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -584,7 +584,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 13:
+ case 14:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -592,7 +592,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 14:
+ case 15:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -600,7 +600,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 15:
+ case 16:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -608,15 +608,15 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 16:
- topVer = reader.readMessage("topVer");
+ case 17:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 17:
+ case 18:
txTimeout = reader.readLong("txTimeout");
if (!reader.isLastRead())
@@ -624,7 +624,7 @@ public CacheEntryPredicate filter() {
reader.incrementState();
- case 18:
+ case 19:
values = reader.readObjectArray("values", MessageCollectionItemType.MSG, Message.class);
if (!reader.isLastRead())
@@ -639,7 +639,7 @@ public CacheEntryPredicate filter() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 19;
+ return 20;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistResponse.java
index 78333a4e65ae..cf00186eb121 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxEnlistResponse.java
@@ -190,7 +190,7 @@ public IgniteUuid dhtFutureId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 11;
+ return 12;
}
/** {@inheritDoc} */
@@ -208,49 +208,49 @@ public IgniteUuid dhtFutureId() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeIgniteUuid("dhtFutId", dhtFutId))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeMessage("dhtVer", dhtVer))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeMessage("lockVer", lockVer))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeCollection("newDhtNodes", newDhtNodes, MessageCollectionItemType.UUID))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeMessage("res", res))
return false;
@@ -272,7 +272,7 @@ public IgniteUuid dhtFutureId() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
dhtFutId = reader.readIgniteUuid("dhtFutId");
if (!reader.isLastRead())
@@ -280,7 +280,7 @@ public IgniteUuid dhtFutureId() {
reader.incrementState();
- case 4:
+ case 5:
dhtVer = reader.readMessage("dhtVer");
if (!reader.isLastRead())
@@ -288,7 +288,7 @@ public IgniteUuid dhtFutureId() {
reader.incrementState();
- case 5:
+ case 6:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -296,7 +296,7 @@ public IgniteUuid dhtFutureId() {
reader.incrementState();
- case 6:
+ case 7:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -304,7 +304,7 @@ public IgniteUuid dhtFutureId() {
reader.incrementState();
- case 7:
+ case 8:
lockVer = reader.readMessage("lockVer");
if (!reader.isLastRead())
@@ -312,7 +312,7 @@ public IgniteUuid dhtFutureId() {
reader.incrementState();
- case 8:
+ case 9:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -320,7 +320,7 @@ public IgniteUuid dhtFutureId() {
reader.incrementState();
- case 9:
+ case 10:
newDhtNodes = reader.readCollection("newDhtNodes", MessageCollectionItemType.UUID);
if (!reader.isLastRead())
@@ -328,7 +328,7 @@ public IgniteUuid dhtFutureId() {
reader.incrementState();
- case 10:
+ case 11:
res = reader.readMessage("res");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 4a4d8e352493..befa3053fe60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -311,7 +311,7 @@ void forceFinish() {
if (err != null) {
tx.setRollbackOnly();
- nodeStop = err instanceof NodeStoppingException;
+ nodeStop = err instanceof NodeStoppingException || cctx.kernalContext().failure().nodeStopping();
}
if (commit) {
@@ -357,29 +357,6 @@ else if (err != null)
}
if (super.onDone(tx0, err)) {
- if (error() instanceof IgniteTxHeuristicCheckedException && !nodeStop) {
- AffinityTopologyVersion topVer = tx.topologyVersion();
-
- for (IgniteTxEntry e : tx.writeMap().values()) {
- GridCacheContext cacheCtx = e.context();
-
- try {
- if (e.op() != NOOP && !cacheCtx.affinity().keyLocalNode(e.key(), topVer)) {
- GridCacheEntryEx entry = cacheCtx.cache().peekEx(e.key());
-
- if (entry != null)
- entry.invalidate(tx.xidVersion());
- }
- }
- catch (Throwable t) {
- U.error(log, "Failed to invalidate entry.", t);
-
- if (t instanceof Error)
- throw (Error)t;
- }
- }
- }
-
// Don't forget to clean up.
cctx.mvcc().removeFuture(futId);
@@ -402,8 +379,7 @@ private boolean isMini(IgniteInternalFuture<?> fut) {
}
/** {@inheritDoc} */
- @Override @SuppressWarnings("ForLoopReplaceableByForEach")
- public void finish(final boolean commit, final boolean clearThreadMap, final boolean onTimeout) {
+ @Override public void finish(final boolean commit, final boolean clearThreadMap, final boolean onTimeout) {
if (!cctx.mvcc().addFuture(this, futureId()))
return;
@@ -490,18 +466,22 @@ private void doFinish(boolean commit, boolean clearThreadMap) {
}
}
+ // Cleanup transaction if heuristic failure.
+ if (tx.state() == UNKNOWN)
+ cctx.tm().rollbackTx(tx, clearThreadMap, false);
+
if ((tx.onePhaseCommit() && needFinishOnePhase(commit)) || (!tx.onePhaseCommit() && mappings != null)) {
if (mappings.single()) {
GridDistributedTxMapping mapping = mappings.singleMapping();
if (mapping != null) {
- assert !hasFutures() || waitTxs != null : futures();
+ assert !hasFutures() || isDone() || waitTxs != null : futures();
finish(1, mapping, commit, !clearThreadMap);
}
}
else {
- assert !hasFutures() || waitTxs != null : futures();
+ assert !hasFutures() || isDone() || waitTxs != null : futures();
finish(mappings.mappings(), commit, !clearThreadMap);
}
@@ -762,7 +742,7 @@ private void readyNearMappingFromBackup(GridDistributedTxMapping mapping) {
/**
* @param mappings Mappings.
* @param commit Commit flag.
- * @param {@code true} If need to add completed version on finish.
+ * @param useCompletedVer {@code True} if need to add completed version on finish.
*/
private void finish(Iterable<GridDistributedTxMapping> mappings, boolean commit, boolean useCompletedVer) {
int miniId = 0;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index 6b5aa90e3f5f..91079dff6c13 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -186,13 +186,13 @@ public void miniId(int miniId) {
}
switch (writer.state()) {
- case 21:
+ case 22:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 22:
+ case 23:
if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
@@ -214,7 +214,7 @@ public void miniId(int miniId) {
return false;
switch (reader.state()) {
- case 21:
+ case 22:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -222,7 +222,7 @@ public void miniId(int miniId) {
reader.incrementState();
- case 22:
+ case 23:
mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
@@ -242,7 +242,7 @@ public void miniId(int miniId) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 23;
+ return 24;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
index a1a2b5712fcd..e3dcbf832bd1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java
@@ -133,19 +133,19 @@ public long threadId() {
}
switch (writer.state()) {
- case 6:
+ case 7:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeLong("nearThreadId", nearThreadId))
return false;
@@ -167,7 +167,7 @@ public long threadId() {
return false;
switch (reader.state()) {
- case 6:
+ case 7:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -175,7 +175,7 @@ public long threadId() {
reader.incrementState();
- case 7:
+ case 8:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -183,7 +183,7 @@ public long threadId() {
reader.incrementState();
- case 8:
+ case 9:
nearThreadId = reader.readLong("nearThreadId");
if (!reader.isLastRead())
@@ -203,7 +203,7 @@ public long threadId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 9;
+ return 10;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 68aa5c05faf9..c7b2ad3a9e9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -3955,7 +3955,7 @@ private NearTxFinishFuture finishFuture(boolean fast, boolean commit) {
assert rollbackFut.isDone() : rollbackFut;
}
- else
+ else // First finish attempt was unsuccessful. Try again.
rollbackFut.finish(false, clearThreadMap, onTimeout);
}
else {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 55c809d6f189..cb17e6a9e737 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -318,38 +318,38 @@ private boolean isFlag(int mask) {
}
switch (writer.state()) {
- case 20:
+ case 21:
if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
- case 21:
+ case 22:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 22:
+ case 23:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 23:
+ case 24:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 24:
+ case 25:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 25:
- if (!writer.writeMessage("topVer", topVer))
+ case 26:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
@@ -370,7 +370,7 @@ private boolean isFlag(int mask) {
return false;
switch (reader.state()) {
- case 20:
+ case 21:
flags = reader.readByte("flags");
if (!reader.isLastRead())
@@ -378,7 +378,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 21:
+ case 22:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -386,7 +386,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 22:
+ case 23:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -394,7 +394,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 23:
+ case 24:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -402,7 +402,7 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 24:
+ case 25:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -410,8 +410,8 @@ private boolean isFlag(int mask) {
reader.incrementState();
- case 25:
- topVer = reader.readMessage("topVer");
+ case 26:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
@@ -430,7 +430,7 @@ private boolean isFlag(int mask) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 26;
+ return 27;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
index e9865df5e3e3..67f7116b7a90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
@@ -376,68 +376,68 @@ public boolean hasOwnedValue(IgniteTxKey key) {
}
switch (writer.state()) {
- case 10:
- if (!writer.writeMessage("clientRemapVer", clientRemapVer))
- return false;
-
- writer.incrementState();
-
case 11:
- if (!writer.writeMessage("dhtVer", dhtVer))
+ if (!writer.writeAffinityTopologyVersion("clientRemapVer", clientRemapVer))
return false;
writer.incrementState();
case 12:
- if (!writer.writeCollection("filterFailedKeys", filterFailedKeys, MessageCollectionItemType.MSG))
+ if (!writer.writeMessage("dhtVer", dhtVer))
return false;
writer.incrementState();
case 13:
- if (!writer.writeIgniteUuid("futId", futId))
+ if (!writer.writeCollection("filterFailedKeys", filterFailedKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 14:
- if (!writer.writeInt("miniId", miniId))
+ if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
case 15:
- if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG))
+ if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
case 16:
- if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG))
+ if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
case 17:
- if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG))
+ if (!writer.writeCollection("ownedValKeys", ownedValKeys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 18:
- if (!writer.writeMessage("retVal", retVal))
+ if (!writer.writeCollection("ownedValVals", ownedValVals, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 19:
- if (!writer.writeMessage("writeVer", writeVer))
+ if (!writer.writeCollection("pending", pending, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
case 20:
- if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
+ if (!writer.writeMessage("retVal", retVal))
+ return false;
+
+ writer.incrementState();
+
+ case 21:
+ if (!writer.writeMessage("writeVer", writeVer))
return false;
writer.incrementState();
@@ -458,16 +458,8 @@ public boolean hasOwnedValue(IgniteTxKey key) {
return false;
switch (reader.state()) {
- case 10:
- clientRemapVer = reader.readMessage("clientRemapVer");
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
case 11:
- dhtVer = reader.readMessage("dhtVer");
+ clientRemapVer = reader.readAffinityTopologyVersion("clientRemapVer");
if (!reader.isLastRead())
return false;
@@ -475,7 +467,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 12:
- filterFailedKeys = reader.readCollection("filterFailedKeys", MessageCollectionItemType.MSG);
+ dhtVer = reader.readMessage("dhtVer");
if (!reader.isLastRead())
return false;
@@ -483,7 +475,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 13:
- futId = reader.readIgniteUuid("futId");
+ filterFailedKeys = reader.readCollection("filterFailedKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -491,7 +483,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 14:
- miniId = reader.readInt("miniId");
+ futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
return false;
@@ -499,7 +491,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 15:
- ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG);
+ miniId = reader.readInt("miniId");
if (!reader.isLastRead())
return false;
@@ -507,7 +499,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 16:
- ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG);
+ mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
return false;
@@ -515,7 +507,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 17:
- pending = reader.readCollection("pending", MessageCollectionItemType.MSG);
+ ownedValKeys = reader.readCollection("ownedValKeys", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -523,7 +515,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 18:
- retVal = reader.readMessage("retVal");
+ ownedValVals = reader.readCollection("ownedValVals", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -531,7 +523,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 19:
- writeVer = reader.readMessage("writeVer");
+ pending = reader.readCollection("pending", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
return false;
@@ -539,7 +531,15 @@ public boolean hasOwnedValue(IgniteTxKey key) {
reader.incrementState();
case 20:
- mvccSnapshot = reader.readMessage("mvccSnapshot");
+ retVal = reader.readMessage("retVal");
+
+ if (!reader.isLastRead())
+ return false;
+
+ reader.incrementState();
+
+ case 21:
+ writeVer = reader.readMessage("writeVer");
if (!reader.isLastRead())
return false;
@@ -558,7 +558,7 @@ public boolean hasOwnedValue(IgniteTxKey key) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 21;
+ return 22;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java
index 472937be4156..3b22afb7734b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistRequest.java
@@ -297,7 +297,7 @@ public boolean firstClientRequest() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 21;
+ return 22;
}
/** {@inheritDoc} */
@@ -331,109 +331,109 @@ public boolean firstClientRequest() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeIntArray("cacheIds", cacheIds))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeBoolean("clientFirst", clientFirst))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeInt("flags", flags))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeMessage("lockVer", lockVer))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeInt("pageSize", pageSize))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeByteArray("paramsBytes", paramsBytes))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeIntArray("parts", parts))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeString("qry", qry))
return false;
writer.incrementState();
- case 14:
+ case 15:
if (!writer.writeString("schema", schema))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 16:
+ case 17:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 17:
+ case 18:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 18:
+ case 19:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 19:
- if (!writer.writeMessage("topVer", topVer))
+ case 20:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 20:
+ case 21:
if (!writer.writeLong("txTimeout", txTimeout))
return false;
@@ -455,7 +455,7 @@ public boolean firstClientRequest() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
cacheIds = reader.readIntArray("cacheIds");
if (!reader.isLastRead())
@@ -463,7 +463,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 4:
+ case 5:
clientFirst = reader.readBoolean("clientFirst");
if (!reader.isLastRead())
@@ -471,7 +471,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 5:
+ case 6:
flags = reader.readInt("flags");
if (!reader.isLastRead())
@@ -479,7 +479,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 6:
+ case 7:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -487,7 +487,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 7:
+ case 8:
lockVer = reader.readMessage("lockVer");
if (!reader.isLastRead())
@@ -495,7 +495,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 8:
+ case 9:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -503,7 +503,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 9:
+ case 10:
mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
@@ -511,7 +511,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 10:
+ case 11:
pageSize = reader.readInt("pageSize");
if (!reader.isLastRead())
@@ -519,7 +519,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 11:
+ case 12:
paramsBytes = reader.readByteArray("paramsBytes");
if (!reader.isLastRead())
@@ -527,7 +527,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 12:
+ case 13:
parts = reader.readIntArray("parts");
if (!reader.isLastRead())
@@ -535,7 +535,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 13:
+ case 14:
qry = reader.readString("qry");
if (!reader.isLastRead())
@@ -543,7 +543,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 14:
+ case 15:
schema = reader.readString("schema");
if (!reader.isLastRead())
@@ -551,7 +551,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 15:
+ case 16:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -559,7 +559,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 16:
+ case 17:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -567,7 +567,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 17:
+ case 18:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -575,7 +575,7 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 18:
+ case 19:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -583,15 +583,15 @@ public boolean firstClientRequest() {
reader.incrementState();
- case 19:
- topVer = reader.readMessage("topVer");
+ case 20:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 20:
+ case 21:
txTimeout = reader.readLong("txTimeout");
if (!reader.isLastRead())
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistResponse.java
index d628de1d5631..2715f89b408f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryEnlistResponse.java
@@ -166,7 +166,7 @@ public boolean removeMapping() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 10;
+ return 11;
}
/** {@inheritDoc} */
@@ -184,47 +184,48 @@ public boolean removeMapping() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeByteArray("errBytes", errBytes))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeMessage("lockVer", lockVer))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 7:
- if (!writer.writeBoolean("removeMapping", removeMapping))
+ case 8:
+ if (!writer.writeCollection("newDhtNodes", newDhtNodes, MessageCollectionItemType.UUID))
return false;
writer.incrementState();
- case 8:
- if (!writer.writeLong("res", res))
+ case 9:
+ if (!writer.writeBoolean("removeMapping", removeMapping))
return false;
writer.incrementState();
- case 9:
- if (!writer.writeCollection("newDhtNodes", newDhtNodes, MessageCollectionItemType.UUID))
+ case 10:
+ if (!writer.writeLong("res", res))
return false;
writer.incrementState();
+
}
return true;
@@ -241,7 +242,7 @@ public boolean removeMapping() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
errBytes = reader.readByteArray("errBytes");
if (!reader.isLastRead())
@@ -249,7 +250,7 @@ public boolean removeMapping() {
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -257,7 +258,7 @@ public boolean removeMapping() {
reader.incrementState();
- case 5:
+ case 6:
lockVer = reader.readMessage("lockVer");
if (!reader.isLastRead())
@@ -265,7 +266,7 @@ public boolean removeMapping() {
reader.incrementState();
- case 6:
+ case 7:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -273,29 +274,30 @@ public boolean removeMapping() {
reader.incrementState();
- case 7:
- removeMapping = reader.readBoolean("removeMapping");
+ case 8:
+ newDhtNodes = reader.readCollection("newDhtNodes", MessageCollectionItemType.UUID);
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 8:
- res = reader.readLong("res");
+ case 9:
+ removeMapping = reader.readBoolean("removeMapping");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 9:
- newDhtNodes = reader.readCollection("newDhtNodes", MessageCollectionItemType.UUID);
+ case 10:
+ res = reader.readLong("res");
if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(GridNearTxQueryEnlistResponse.class);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java
index f350d502b9b7..8e10a7edb349 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistRequest.java
@@ -335,85 +335,85 @@ public EnlistOperation operation() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeBoolean("clientFirst", clientFirst))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 5:
+ case 6:
if (!writer.writeObjectArray("keys", keys, MessageCollectionItemType.MSG))
return false;
writer.incrementState();
- case 6:
+ case 7:
if (!writer.writeMessage("lockVer", lockVer))
return false;
writer.incrementState();
- case 7:
+ case 8:
if (!writer.writeInt("miniId", miniId))
return false;
writer.incrementState();
- case 8:
+ case 9:
if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
- case 9:
+ case 10:
if (!writer.writeByte("op", op != null ? (byte)op.ordinal() : -1))
return false;
writer.incrementState();
- case 10:
+ case 11:
if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
- case 12:
+ case 13:
if (!writer.writeLong("threadId", threadId))
return false;
writer.incrementState();
- case 13:
+ case 14:
if (!writer.writeLong("timeout", timeout))
return false;
writer.incrementState();
- case 14:
- if (!writer.writeMessage("topVer", topVer))
+ case 15:
+ if (!writer.writeAffinityTopologyVersion("topVer", topVer))
return false;
writer.incrementState();
- case 15:
+ case 16:
if (!writer.writeLong("txTimeout", txTimeout))
return false;
writer.incrementState();
- case 16:
+ case 17:
if (!writer.writeObjectArray("values", values, MessageCollectionItemType.MSG))
return false;
@@ -435,7 +435,7 @@ public EnlistOperation operation() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
clientFirst = reader.readBoolean("clientFirst");
if (!reader.isLastRead())
@@ -443,7 +443,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 4:
+ case 5:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -451,7 +451,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 5:
+ case 6:
keys = reader.readObjectArray("keys", MessageCollectionItemType.MSG, KeyCacheObject.class);
if (!reader.isLastRead())
@@ -459,7 +459,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 6:
+ case 7:
lockVer = reader.readMessage("lockVer");
if (!reader.isLastRead())
@@ -467,7 +467,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 7:
+ case 8:
miniId = reader.readInt("miniId");
if (!reader.isLastRead())
@@ -475,7 +475,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 8:
+ case 9:
mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
@@ -483,7 +483,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 9:
+ case 10:
byte opOrd;
opOrd = reader.readByte("op");
@@ -495,7 +495,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 10:
+ case 11:
subjId = reader.readUuid("subjId");
if (!reader.isLastRead())
@@ -503,7 +503,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 11:
+ case 12:
taskNameHash = reader.readInt("taskNameHash");
if (!reader.isLastRead())
@@ -511,7 +511,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 12:
+ case 13:
threadId = reader.readLong("threadId");
if (!reader.isLastRead())
@@ -519,7 +519,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 13:
+ case 14:
timeout = reader.readLong("timeout");
if (!reader.isLastRead())
@@ -527,15 +527,15 @@ public EnlistOperation operation() {
reader.incrementState();
- case 14:
- topVer = reader.readMessage("topVer");
+ case 15:
+ topVer = reader.readAffinityTopologyVersion("topVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
- case 15:
+ case 16:
txTimeout = reader.readLong("txTimeout");
if (!reader.isLastRead())
@@ -543,7 +543,7 @@ public EnlistOperation operation() {
reader.incrementState();
- case 16:
+ case 17:
values = reader.readObjectArray("values", MessageCollectionItemType.MSG, CacheObject.class);
if (!reader.isLastRead())
@@ -558,7 +558,7 @@ public EnlistOperation operation() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 17;
+ return 18;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java
index 48c63bc3c942..2a0c63242f86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxQueryResultsEnlistResponse.java
@@ -102,7 +102,7 @@ public IgniteUuid dhtFutureId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 12;
+ return 13;
}
/** {@inheritDoc} */
@@ -120,17 +120,18 @@ public IgniteUuid dhtFutureId() {
}
switch (writer.state()) {
- case 10:
+ case 11:
if (!writer.writeIgniteUuid("dhtFutId", dhtFutId))
return false;
writer.incrementState();
- case 11:
+ case 12:
if (!writer.writeMessage("dhtVer", dhtVer))
return false;
writer.incrementState();
+
}
return true;
@@ -147,7 +148,7 @@ public IgniteUuid dhtFutureId() {
return false;
switch (reader.state()) {
- case 10:
+ case 11:
dhtFutId = reader.readIgniteUuid("dhtFutId");
if (!reader.isLastRead())
@@ -155,13 +156,14 @@ public IgniteUuid dhtFutureId() {
reader.incrementState();
- case 11:
+ case 12:
dhtVer = reader.readMessage("dhtVer");
if (!reader.isLastRead())
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(GridNearTxQueryResultsEnlistResponse.class);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
index 2b49889cadc2..b2ed241e91fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
@@ -85,7 +85,7 @@ public GridNearUnlockRequest(int cacheId, int keyCnt, boolean addDepInfo) {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 8;
+ return 9;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
index f2a4b30c4af8..33a52a11a03d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
@@ -60,9 +60,10 @@ public void replicate(KeyCacheObject key,
*
* @param topVer Topology version.
* @param left {@code True} if exchange has been caused by node leave.
+ * @param activate {@code True} if exchange has been caused by cluster activation.
* @throws IgniteCheckedException If failed.
*/
- public void onExchange(AffinityTopologyVersion topVer, boolean left) throws IgniteCheckedException;
+ public void onExchange(AffinityTopologyVersion topVer, boolean left, boolean activate) throws IgniteCheckedException;
/**
* @return {@code True} is DR is enabled.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
index f3c1b23f7c7d..425e79c53634 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridOsCacheDrManager.java
@@ -78,7 +78,7 @@
}
/** {@inheritDoc} */
- @Override public void onExchange(AffinityTopologyVersion topVer, boolean left) throws IgniteCheckedException {
+ @Override public void onExchange(AffinityTopologyVersion topVer, boolean left, boolean activate) throws IgniteCheckedException {
// No-op.
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
index 7b7ac66c0cc3..481a6cf3d8a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCache.java
@@ -232,4 +232,27 @@ else if (modes.heap)
@Override public long localSizeLong(int part, CachePeekMode[] peekModes) throws IgniteCheckedException {
return localSizeLong(peekModes);
}
+
+ /** {@inheritDoc} */
+ @Override public void preloadPartition(int part) throws IgniteCheckedException {
+ ctx.offheap().preloadPartition(part);
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteInternalFuture<?> preloadPartitionAsync(int part) throws IgniteCheckedException {
+ return ctx.closures().callLocalSafe(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ preloadPartition(part);
+
+ return null;
+ }
+ });
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean localPreloadPartition(int part) throws IgniteCheckedException {
+ ctx.offheap().preloadPartition(part);
+
+ return true;
+ }
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
index 4651bcd767f5..9c8254b9b061 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccProcessorImpl.java
@@ -321,15 +321,22 @@ public MvccProcessorImpl(GridKernalContext ctx) {
}
/** {@inheritDoc} */
- @Override public void afterInitialise(IgniteCacheDatabaseSharedManager mgr) {
- // No-op.
+ @Override public void beforeResumeWalLogging(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {
+ // In case of blt changed we should re-init TX_LOG cache.
+ txLogPageStoreInit(mgr);
}
/** {@inheritDoc} */
- @SuppressWarnings("ConstantConditions")
- @Override public void beforeMemoryRestore(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {
+ @Override public void beforeBinaryMemoryRestore(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {
+ txLogPageStoreInit(mgr);
+ }
+
+ /**
+ * @param mgr Database shared manager.
+ * @throws IgniteCheckedException If failed.
+ */
+ private void txLogPageStoreInit(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {
assert CU.isPersistenceEnabled(ctx.config());
- assert txLog == null;
ctx.cache().context().pageStore().initialize(TX_LOG_CACHE_ID, 1,
TX_LOG_CACHE_NAME, mgr.dataRegion(TX_LOG_CACHE_NAME).memoryMetrics());
@@ -344,11 +351,6 @@ public MvccProcessorImpl(GridKernalContext ctx) {
}
}
- /** {@inheritDoc} */
- @Override public void afterMemoryRestore(IgniteCacheDatabaseSharedManager mgr) {
- // No-op.
- }
-
/** {@inheritDoc} */
@Override public void onDiscoveryEvent(int evtType, Collection<ClusterNode> nodes, long topVer,
@Nullable DiscoveryCustomMessage customMsg) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java
index 89f09db5d0b2..f3b3150480af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccAckRequestTxAndQueryId.java
@@ -76,6 +76,7 @@ public MvccAckRequestTxAndQueryId(long futId, long txCntr, long qryTrackerId) {
return false;
writer.incrementState();
+
}
return true;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java
index c5a849499e0d..73d3f9483981 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccSnapshotResponse.java
@@ -20,6 +20,7 @@
import java.nio.ByteBuffer;
import java.util.Arrays;
import org.apache.ignite.internal.GridDirectTransient;
+import org.apache.ignite.internal.IgniteCodeGeneratingFail;
import org.apache.ignite.internal.managers.communication.GridIoMessageFactory;
import org.apache.ignite.internal.processors.cache.mvcc.MvccLongList;
import org.apache.ignite.internal.processors.cache.mvcc.MvccSnapshot;
@@ -33,6 +34,7 @@
/**
*
*/
+@IgniteCodeGeneratingFail
public class MvccSnapshotResponse implements MvccMessage, MvccSnapshot, MvccLongList {
/** */
private static final long serialVersionUID = 0L;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java
index cd30eb85b88a..4cf6f65a44de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/MvccTxSnapshotRequest.java
@@ -81,6 +81,7 @@ public long futureId() {
return false;
writer.incrementState();
+
}
return true;
@@ -101,6 +102,7 @@ public long futureId() {
return false;
reader.incrementState();
+
}
return reader.afterMessageRead(MvccTxSnapshotRequest.class);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java
index ffd9a67edb6d..5c46ca66a280 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastRequest.java
@@ -79,13 +79,13 @@ public IgniteUuid futId() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeIgniteUuid("futId", futId))
return false;
writer.incrementState();
- case 4:
+ case 5:
if (!writer.writeCollection("updCntrs", updCntrs, MessageCollectionItemType.MSG))
return false;
@@ -107,7 +107,7 @@ public IgniteUuid futId() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -115,7 +115,7 @@ public IgniteUuid futId() {
reader.incrementState();
- case 4:
+ case 5:
updCntrs = reader.readCollection("updCntrs", MessageCollectionItemType.MSG);
if (!reader.isLastRead())
@@ -135,7 +135,7 @@ public IgniteUuid futId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 5;
+ return 6;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java
index 547539db69ba..2f88cde5a6fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/msg/PartitionCountersNeighborcastResponse.java
@@ -62,7 +62,7 @@ public IgniteUuid futId() {
}
switch (writer.state()) {
- case 3:
+ case 4:
if (!writer.writeIgniteUuid("futId", futId))
return false;
@@ -84,7 +84,7 @@ public IgniteUuid futId() {
return false;
switch (reader.state()) {
- case 3:
+ case 4:
futId = reader.readIgniteUuid("futId");
if (!reader.isLastRead())
@@ -104,7 +104,7 @@ public IgniteUuid futId() {
/** {@inheritDoc} */
@Override public byte fieldsCount() {
- return 4;
+ return 5;
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DatabaseLifecycleListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DatabaseLifecycleListener.java
index f96cdd91a7e8..676210964e05 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DatabaseLifecycleListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DatabaseLifecycleListener.java
@@ -22,33 +22,70 @@
/**
*
*/
+@SuppressWarnings("RedundantThrows")
public interface DatabaseLifecycleListener {
+ /**
+ * Callback executed when data regions become to start-up.
+ *
+ * @param mgr Database shared manager.
+ * @throws IgniteCheckedException If failed.
+ */
+ public default void onInitDataRegions(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {}
+
+ /**
+ * Callback executed when node detected that baseline topology is changed and node is not in that baseline.
+ * It's useful to cleanup and invalidate all available data restored at that moment.
+ *
+ * @throws IgniteCheckedException If failed.
+ */
+ public default void onBaselineChange() throws IgniteCheckedException {}
/**
+ * Callback executed right before node become perform binary recovery.
+ *
* @param mgr Database shared manager.
+ * @throws IgniteCheckedException If failed.
+ */
+ public default void beforeBinaryMemoryRestore(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {}
+
+ /**
+ * Callback executed when binary memory has fully restored and WAL logging is resumed.
*
+ * @param binaryState Result of binary recovery.
+ * @throws IgniteCheckedException If failed.
*/
- void onInitDataRegions(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException;
+ public default void afterBinaryMemoryRestore(GridCacheDatabaseSharedManager.RestoreBinaryState binaryState)
+ throws IgniteCheckedException {}
/**
- * @param mgr Page store manager.
+ * Callback executed when all logical updates were applied and page memory become to fully consistent state.
*
+ * @param logicalState Result of logical recovery.
+ * @throws IgniteCheckedException If failed.
*/
- void beforeMemoryRestore(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException;
+ public default void afterLogicalUpdatesApplied(GridCacheDatabaseSharedManager.RestoreLogicalState logicalState)
+ throws IgniteCheckedException {}
/**
- * @param mgr Database shared manager.
+ * Callback executed when all physical updates are applied and we are ready to write new physical records
+ * during logical recovery.
*
+ * @param mgr Database shared manager.
+ * @throws IgniteCheckedException If failed.
*/
- void afterMemoryRestore(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException;
+ public default void beforeResumeWalLogging(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {}
/**
+ * Callback executed after all data regions are initialized.
+ *
* @param mgr Database shared manager.
*/
- void afterInitialise(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException;
+ public default void afterInitialise(IgniteCacheDatabaseSharedManager mgr) throws IgniteCheckedException {}
/**
+ * Callback executed before shared manager will be stopped.
+ *
* @param mgr Database shared manager.
*/
- void beforeStop(IgniteCacheDatabaseSharedManager mgr);
+ public default void beforeStop(IgniteCacheDatabaseSharedManager mgr) {}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index da965f8ee2d8..d12808140df5 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -53,10 +53,10 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.LongAdder;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import javax.management.ObjectName;
import org.apache.ignite.DataStorageMetrics;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -70,8 +70,6 @@
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.events.DiscoveryEvent;
-import org.apache.ignite.events.EventType;
import org.apache.ignite.failure.FailureContext;
import org.apache.ignite.failure.FailureType;
import org.apache.ignite.internal.GridKernalContext;
@@ -82,9 +80,8 @@
import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
import org.apache.ignite.internal.mem.DirectMemoryProvider;
import org.apache.ignite.internal.mem.DirectMemoryRegion;
-import org.apache.ignite.internal.mem.file.MappedFileMemoryProvider;
-import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryProvider;
import org.apache.ignite.internal.pagemem.FullPageId;
+import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageIdUtils;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.pagemem.PageUtils;
@@ -96,22 +93,22 @@
import org.apache.ignite.internal.pagemem.wal.record.CheckpointRecord;
import org.apache.ignite.internal.pagemem.wal.record.DataEntry;
import org.apache.ignite.internal.pagemem.wal.record.DataRecord;
-import org.apache.ignite.internal.pagemem.wal.record.MemoryRecoveryRecord;
import org.apache.ignite.internal.pagemem.wal.record.MetastoreDataRecord;
import org.apache.ignite.internal.pagemem.wal.record.MvccDataEntry;
import org.apache.ignite.internal.pagemem.wal.record.MvccTxRecord;
import org.apache.ignite.internal.pagemem.wal.record.PageSnapshot;
import org.apache.ignite.internal.pagemem.wal.record.WALRecord;
+import org.apache.ignite.internal.pagemem.wal.record.WalRecordCacheGroupAware;
import org.apache.ignite.internal.pagemem.wal.record.delta.PageDeltaRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.PartitionDestroyRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.PartitionMetaStateRecord;
+import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor;
import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor;
import org.apache.ignite.internal.processors.cache.ExchangeActions;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
-import org.apache.ignite.internal.processors.cache.StoredCacheData;
import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition;
import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState;
@@ -129,17 +126,18 @@
import org.apache.ignite.internal.processors.cache.persistence.pagemem.CheckpointMetricsTracker;
import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryEx;
import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryImpl;
+import org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
import org.apache.ignite.internal.processors.cache.persistence.partstate.PartitionAllocationMap;
+import org.apache.ignite.internal.processors.cache.persistence.partstate.PartitionRecoverState;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteCacheSnapshotManager;
import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotOperation;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PagePartitionMetaIO;
import org.apache.ignite.internal.processors.cache.persistence.wal.FileWALPointer;
+import org.apache.ignite.internal.processors.cache.persistence.wal.crc.FastCrc;
import org.apache.ignite.internal.processors.cache.persistence.wal.crc.IgniteDataIntegrityViolationException;
-import org.apache.ignite.internal.processors.cache.persistence.wal.crc.PureJavaCrc32;
import org.apache.ignite.internal.processors.port.GridPortRecord;
import org.apache.ignite.internal.util.GridMultiCollectionWrapper;
-import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.future.CountDownFuture;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
@@ -156,6 +154,7 @@
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgniteOutClosure;
@@ -170,12 +169,10 @@
import static java.nio.file.StandardOpenOption.READ;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_CHECKPOINT_READ_LOCK_TIMEOUT;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_PDS_SKIP_CRC;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_PDS_WAL_REBALANCE_THRESHOLD;
import static org.apache.ignite.failure.FailureType.CRITICAL_ERROR;
import static org.apache.ignite.failure.FailureType.SYSTEM_WORKER_TERMINATION;
import static org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.CHECKPOINT_RECORD;
-import static org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage.METASTORAGE_CACHE_ID;
import static org.apache.ignite.internal.util.IgniteUtils.checkpointBufferSize;
/**
@@ -186,15 +183,15 @@
/** */
public static final String IGNITE_PDS_CHECKPOINT_TEST_SKIP_SYNC = "IGNITE_PDS_CHECKPOINT_TEST_SKIP_SYNC";
+ /** */
+ public static final String IGNITE_PDS_SKIP_CHECKPOINT_ON_NODE_STOP = "IGNITE_PDS_SKIP_CHECKPOINT_ON_NODE_STOP";
+
/** MemoryPolicyConfiguration name reserved for meta store. */
public static final String METASTORE_DATA_REGION_NAME = "metastoreMemPlc";
/** Skip sync. */
private final boolean skipSync = IgniteSystemProperties.getBoolean(IGNITE_PDS_CHECKPOINT_TEST_SKIP_SYNC);
- /** */
- private boolean skipCrc = IgniteSystemProperties.getBoolean(IGNITE_PDS_SKIP_CRC, false);
-
/** */
private final int walRebalanceThreshold = IgniteSystemProperties.getInteger(
IGNITE_PDS_WAL_REBALANCE_THRESHOLD, 500_000);
@@ -203,6 +200,9 @@
private final String throttlingPolicyOverride = IgniteSystemProperties.getString(
IgniteSystemProperties.IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED);
+ /** */
+ private final boolean skipCheckpointOnNodeStop = IgniteSystemProperties.getBoolean(IGNITE_PDS_SKIP_CHECKPOINT_ON_NODE_STOP, false);
+
/** Checkpoint lock hold count. */
private static final ThreadLocal<Integer> CHECKPOINT_LOCK_HOLD_COUNT = new ThreadLocal<Integer>() {
@Override protected Integer initialValue() {
@@ -216,9 +216,6 @@
/** Checkpoint file name pattern. */
public static final Pattern CP_FILE_NAME_PATTERN = Pattern.compile("(\\d+)-(.*)-(START|END)\\.bin");
- /** Node started file suffix. */
- public static final String NODE_STARTED_FILE_NAME_SUFFIX = "-node-started.bin";
-
/** */
private static final String MBEAN_NAME = "DataStorageMetrics";
@@ -253,6 +250,9 @@
/** Checkpoint thread. Needs to be volatile because it is created in exchange worker. */
private volatile Checkpointer checkpointer;
+ /** Checkpointer thread instance. */
+ private volatile IgniteThread checkpointerThread;
+
/** For testing only. */
private volatile boolean checkpointsEnabled = true;
@@ -286,6 +286,14 @@
/** */
private boolean stopping;
+ /**
+ * The position of last seen WAL pointer. Used for resumming logging from this pointer.
+ *
+ * If binary memory recovery pefrormed on node start, the checkpoint END pointer will store
+ * not the last WAL pointer and can't be used for resumming logging.
+ */
+ private volatile WALPointer walTail;
+
/** Checkpoint runner thread pool. If null tasks are to be run in single thread */
@Nullable private IgniteThreadPoolExecutor asyncRunner;
@@ -319,9 +327,6 @@
/** */
private DataStorageMetricsImpl persStoreMetrics;
- /** */
- private ObjectName persistenceMetricsMbeanName;
-
/** Counter for written checkpoint pages. Not null only if checkpoint is running. */
private volatile AtomicInteger writtenPagesCntr = null;
@@ -334,7 +339,10 @@
/** Number of pages in current checkpoint at the beginning of checkpoint. */
private volatile int currCheckpointPagesCnt;
- /** */
+ /**
+ * MetaStorage instance. Value {@code null} means storage not initialized yet.
+ * Guarded by {@link GridCacheDatabaseSharedManager#checkpointReadLock()}
+ */
private MetaStorage metaStorage;
/** */
@@ -352,6 +360,10 @@
/** Timeout for checkpoint read lock acquisition in milliseconds. */
private volatile long checkpointReadLockTimeout;
+ /** Flag allows to log additional information about partitions during recovery phases. */
+ private final boolean recoveryVerboseLogging = IgniteSystemProperties.getBoolean(
+ IgniteSystemProperties.IGNITE_RECOVERY_VERBOSE_LOGGING, true);
+
/**
* @param ctx Kernal context.
*/
@@ -409,6 +421,15 @@ public Checkpointer getCheckpointer() {
return checkpointer;
}
+ /**
+ * For test use only.
+ *
+ * @return Checkpointer thread instance.
+ */
+ public IgniteThread checkpointerThread() {
+ return checkpointerThread;
+ }
+
/**
* For test use only.
*/
@@ -430,7 +451,7 @@ public Checkpointer getCheckpointer() {
addDataRegion(
memCfg,
- createDataRegionConfiguration(memCfg),
+ createMetastoreDataRegionConfig(memCfg),
false
);
@@ -438,16 +459,19 @@ public Checkpointer getCheckpointer() {
}
/**
+ * Create metastorage data region configuration with enabled persistence by default.
+ *
* @param storageCfg Data storage configuration.
* @return Data region configuration.
*/
- private DataRegionConfiguration createDataRegionConfiguration(DataStorageConfiguration storageCfg) {
+ private DataRegionConfiguration createMetastoreDataRegionConfig(DataStorageConfiguration storageCfg) {
DataRegionConfiguration cfg = new DataRegionConfiguration();
cfg.setName(METASTORE_DATA_REGION_NAME);
cfg.setInitialSize(storageCfg.getSystemRegionInitialSize());
cfg.setMaxSize(storageCfg.getSystemRegionMaxSize());
cfg.setPersistenceEnabled(true);
+
return cfg;
}
@@ -471,6 +495,8 @@ private DataRegionConfiguration createDataRegionConfiguration(DataStorageConfigu
final GridKernalContext kernalCtx = cctx.kernalContext();
if (!kernalCtx.clientNode()) {
+ kernalCtx.internalSubscriptionProcessor().registerDatabaseListener(new MetastorageRecoveryLifecycle());
+
checkpointer = new Checkpointer(cctx.igniteInstanceName(), "db-checkpoint-thread", log);
cpHistory = new CheckpointHistory(kernalCtx);
@@ -490,15 +516,7 @@ private DataRegionConfiguration createDataRegionConfiguration(DataStorageConfigu
.resolveFolders()
.getLockedFileLockHolder();
- fileLockHolder = preLocked == null ?
- new FileLockHolder(storeMgr.workDir().getPath(), kernalCtx, log) : preLocked;
-
- if (log.isDebugEnabled())
- log.debug("Try to capture file lock [nodeId=" +
- cctx.localNodeId() + " path=" + fileLockHolder.lockPath() + "]");
-
- if (!fileLockHolder.isLocked())
- fileLockHolder.tryLock(lockWaitTime);
+ acquireFileLock(preLocked);
cleanupTempCheckpointDirectory();
@@ -524,10 +542,48 @@ private DataRegionConfiguration createDataRegionConfiguration(DataStorageConfigu
}
}
- /**
- * Cleanup checkpoint directory.
- */
+ /** {@inheritDoc} */
+ @Override public void cleanupRestoredCaches() {
+ if (dataRegionMap.isEmpty())
+ return;
+
+ for (CacheGroupDescriptor grpDesc : cctx.cache().cacheGroupDescriptors().values()) {
+ String regionName = grpDesc.config().getDataRegionName();
+
+ DataRegion region = regionName != null ? dataRegionMap.get(regionName) : dfltDataRegion;
+
+ if (region == null)
+ continue;
+
+ if (log.isInfoEnabled())
+ log.info("Page memory " + region.config().getName() + " for " + grpDesc + " has invalidated.");
+
+ int partitions = grpDesc.config().getAffinity().partitions();
+
+ if (region.pageMemory() instanceof PageMemoryEx) {
+ PageMemoryEx memEx = (PageMemoryEx)region.pageMemory();
+
+ for (int partId = 0; partId < partitions; partId++)
+ memEx.invalidate(grpDesc.groupId(), partId);
+
+ memEx.invalidate(grpDesc.groupId(), PageIdAllocator.INDEX_PARTITION);
+ }
+ }
+
+ storeMgr.cleanupPageStoreIfMatch(
+ new Predicate<Integer>() {
+ @Override public boolean test(Integer grpId) {
+ return MetaStorage.METASTORAGE_CACHE_ID != grpId;
+ }
+ },
+ true);
+ }
+
+ /** {@inheritDoc} */
@Override public void cleanupCheckpointDirectory() throws IgniteCheckedException {
+ if (cpHistory != null)
+ cpHistory = new CheckpointHistory(cctx.kernalContext());
+
try {
try (DirectoryStream<Path> files = Files.newDirectoryStream(cpDir.toPath())) {
for (Path path : files)
@@ -539,6 +595,39 @@ private DataRegionConfiguration createDataRegionConfiguration(DataStorageConfigu
}
}
+ /**
+ * @param preLocked Pre-locked file lock holder.
+ */
+ private void acquireFileLock(FileLockHolder preLocked) throws IgniteCheckedException {
+ if (cctx.kernalContext().clientNode())
+ return;
+
+ fileLockHolder = preLocked == null ?
+ new FileLockHolder(storeMgr.workDir().getPath(), cctx.kernalContext(), log) : preLocked;
+
+ if (!fileLockHolder.isLocked()) {
+ if (log.isDebugEnabled())
+ log.debug("Try to capture file lock [nodeId=" +
+ cctx.localNodeId() + " path=" + fileLockHolder.lockPath() + "]");
+
+ fileLockHolder.tryLock(lockWaitTime);
+ }
+ }
+
+ /**
+ *
+ */
+ private void releaseFileLock() {
+ if (cctx.kernalContext().clientNode() || fileLockHolder == null)
+ return;
+
+ if (log.isDebugEnabled())
+ log.debug("Release file lock [nodeId=" +
+ cctx.localNodeId() + " path=" + fileLockHolder.lockPath() + "]");
+
+ fileLockHolder.close();
+ }
+
/**
* Retreives checkpoint history form specified {@code dir}.
*
@@ -622,52 +711,36 @@ private void removeCheckpointFiles(CheckpointEntry cpEntry) throws IgniteChecked
/** */
private void readMetastore() throws IgniteCheckedException {
try {
- DataStorageConfiguration memCfg = cctx.kernalContext().config().getDataStorageConfiguration();
-
- DataRegionConfiguration plcCfg = createDataRegionConfiguration(memCfg);
-
- File allocPath = buildAllocPath(plcCfg);
-
- DirectMemoryProvider memProvider = allocPath == null ?
- new UnsafeMemoryProvider(log) :
- new MappedFileMemoryProvider(
- log,
- allocPath);
-
- DataRegionMetricsImpl memMetrics = new DataRegionMetricsImpl(plcCfg);
-
- PageMemoryEx storePageMem = (PageMemoryEx)createPageMemory(memProvider, memCfg, plcCfg, memMetrics, false);
-
- DataRegion regCfg = new DataRegion(storePageMem, plcCfg, memMetrics, createPageEvictionTracker(plcCfg, storePageMem));
-
CheckpointStatus status = readCheckpointStatus();
- cctx.pageStore().initializeForMetastorage();
-
- storePageMem.start();
-
checkpointReadLock();
try {
- restoreMemory(status, true, storePageMem);
+ dataRegion(METASTORE_DATA_REGION_NAME).pageMemory().start();
- metaStorage = new MetaStorage(cctx, regCfg, memMetrics, true);
+ performBinaryMemoryRestore(status, g -> MetaStorage.METASTORAGE_CACHE_ID == g, false);
- metaStorage.init(this);
+ metaStorage = createMetastorage(true);
- applyLastUpdates(status, true);
+ applyLogicalUpdates(status, g -> MetaStorage.METASTORAGE_CACHE_ID == g, false);
fillWalDisabledGroups();
notifyMetastorageReadyForRead();
}
finally {
- checkpointReadUnlock();
- }
+ metaStorage = null;
- metaStorage = null;
+ dataRegion(METASTORE_DATA_REGION_NAME).pageMemory().stop(false);
- storePageMem.stop(true);
+ cctx.pageStore().cleanupPageStoreIfMatch(new Predicate<Integer>() {
+ @Override public boolean test(Integer grpId) {
+ return MetaStorage.METASTORAGE_CACHE_ID == grpId;
+ }
+ }, false);
+
+ checkpointReadUnlock();
+ }
}
catch (StorageException e) {
cctx.kernalContext().failure().process(new FailureContext(FailureType.CRITICAL_ERROR, e));
@@ -684,16 +757,16 @@ private void readMetastore() throws IgniteCheckedException {
snapshotMgr = cctx.snapshot();
- if (!cctx.localNode().isClient()) {
- initDataBase();
-
- registrateMetricsMBean();
- }
-
- if (checkpointer == null)
+ if (!cctx.kernalContext().clientNode() && checkpointer == null)
checkpointer = new Checkpointer(cctx.igniteInstanceName(), "db-checkpoint-thread", log);
super.onActivate(ctx);
+
+ if (!cctx.kernalContext().clientNode()) {
+ initializeCheckpointPool();
+
+ finishRecovery();
+ }
}
/** {@inheritDoc} */
@@ -713,7 +786,7 @@ private void readMetastore() throws IgniteCheckedException {
/**
*
*/
- private void initDataBase() {
+ private void initializeCheckpointPool() {
if (persistenceCfg.getCheckpointThreads() > 1)
asyncRunner = new IgniteThreadPoolExecutor(
CHECKPOINT_RUNNER_THREAD_PREFIX,
@@ -725,46 +798,17 @@ private void initDataBase() {
);
}
- /**
- * Try to register Metrics MBean.
- *
- * @throws IgniteCheckedException If failed.
- */
- private void registrateMetricsMBean() throws IgniteCheckedException {
- if (U.IGNITE_MBEANS_DISABLED)
- return;
-
- try {
- persistenceMetricsMbeanName = U.registerMBean(
- cctx.kernalContext().config().getMBeanServer(),
- cctx.kernalContext().igniteInstanceName(),
- MBEAN_GROUP,
- MBEAN_NAME,
- persStoreMetrics,
- DataStorageMetricsMXBean.class);
- }
- catch (Throwable e) {
- throw new IgniteCheckedException("Failed to register " + MBEAN_NAME + " MBean.", e);
- }
- }
-
- /**
- * Unregister metrics MBean.
- */
- private void unRegistrateMetricsMBean() {
- if (persistenceMetricsMbeanName == null)
- return;
-
- assert !U.IGNITE_MBEANS_DISABLED;
-
- try {
- cctx.kernalContext().config().getMBeanServer().unregisterMBean(persistenceMetricsMbeanName);
-
- persistenceMetricsMbeanName = null;
- }
- catch (Throwable e) {
- U.error(log, "Failed to unregister " + MBEAN_NAME + " MBean.", e);
- }
+ /** {@inheritDoc} */
+ @Override protected void registerMetricsMBeans(IgniteConfiguration cfg) {
+ super.registerMetricsMBeans(cfg);
+
+ registerMetricsMBean(
+ cctx.kernalContext().config(),
+ MBEAN_GROUP,
+ MBEAN_NAME,
+ persStoreMetrics,
+ DataStorageMetricsMXBean.class
+ );
}
/** {@inheritDoc} */
@@ -792,11 +836,14 @@ private void unRegistrateMetricsMBean() {
};
}
- /** {@inheritDoc} */
- @Override public void readCheckpointAndRestoreMemory(
- List<DynamicCacheDescriptor> cachesToStart
- ) throws IgniteCheckedException {
- assert !cctx.localNode().isClient();
+ /**
+ * Restores last valid WAL pointer and resumes logging from that pointer.
+ * Re-creates metastorage if needed.
+ *
+ * @throws IgniteCheckedException If failed.
+ */
+ private void finishRecovery() throws IgniteCheckedException {
+ assert !cctx.kernalContext().clientNode();
long time = System.currentTimeMillis();
@@ -804,50 +851,26 @@ private void unRegistrateMetricsMBean() {
try {
for (DatabaseLifecycleListener lsnr : getDatabaseListeners(cctx.kernalContext()))
- lsnr.beforeMemoryRestore(this);
+ lsnr.beforeResumeWalLogging(this);
- if (!F.isEmpty(cachesToStart)) {
- for (DynamicCacheDescriptor desc : cachesToStart) {
- if (CU.affinityNode(cctx.localNode(), desc.cacheConfiguration().getNodeFilter()))
- storeMgr.initializeForCache(desc.groupDescriptor(), new StoredCacheData(desc.cacheConfiguration()));
- }
- }
-
- CheckpointStatus status = readCheckpointStatus();
-
- cctx.pageStore().initializeForMetastorage();
+ // Try to resume logging since last finished checkpoint if possible.
+ if (walTail == null) {
+ CheckpointStatus status = readCheckpointStatus();
- metaStorage = new MetaStorage(
- cctx,
- dataRegionMap.get(METASTORE_DATA_REGION_NAME),
- (DataRegionMetricsImpl)memMetricsMap.get(METASTORE_DATA_REGION_NAME)
- );
-
- WALPointer restore = restoreMemory(status);
-
- if (restore == null && !status.endPtr.equals(CheckpointStatus.NULL_PTR)) {
- throw new StorageException("Restore wal pointer = " + restore + ", while status.endPtr = " +
- status.endPtr + ". Can't restore memory - critical part of WAL archive is missing.");
+ walTail = CheckpointStatus.NULL_PTR.equals(status.endPtr) ? null : status.endPtr;
}
- // First, bring memory to the last consistent checkpoint state if needed.
- // This method should return a pointer to the last valid record in the WAL.
- cctx.wal().resumeLogging(restore);
+ cctx.wal().resumeLogging(walTail);
- WALPointer ptr = cctx.wal().log(new MemoryRecoveryRecord(U.currentTimeMillis()));
+ walTail = null;
- if (ptr != null) {
- cctx.wal().flush(ptr, true);
-
- nodeStart(ptr);
- }
-
- metaStorage.init(this);
+ // Recreate metastorage to refresh page memory state after deactivation.
+ if (metaStorage == null)
+ metaStorage = createMetastorage(false);
notifyMetastorageReadyForReadWrite();
- for (DatabaseLifecycleListener lsnr : getDatabaseListeners(cctx.kernalContext()))
- lsnr.afterMemoryRestore(this);
+ U.log(log, "Finish recovery performed in " + (System.currentTimeMillis() - time) + " ms.");
}
catch (IgniteCheckedException e) {
if (X.hasCause(e, StorageException.class, IOException.class))
@@ -857,103 +880,75 @@ private void unRegistrateMetricsMBean() {
}
finally {
checkpointReadUnlock();
-
- if (log.isInfoEnabled())
- log.info("Binary recovery performed in " + (System.currentTimeMillis() - time) + " ms.");
}
}
/**
- * Creates file with current timestamp and specific "node-started.bin" suffix
- * and writes into memory recovery pointer.
- *
- * @param ptr Memory recovery wal pointer.
+ * @param readOnly Metastorage read-only mode.
+ * @return Instance of Metastorage.
+ * @throws IgniteCheckedException If failed to create metastorage.
*/
- private void nodeStart(WALPointer ptr) throws IgniteCheckedException {
- FileWALPointer p = (FileWALPointer)ptr;
-
- String fileName = U.currentTimeMillis() + NODE_STARTED_FILE_NAME_SUFFIX;
- String tmpFileName = fileName + FilePageStoreManager.TMP_SUFFIX;
+ private MetaStorage createMetastorage(boolean readOnly) throws IgniteCheckedException {
+ cctx.pageStore().initializeForMetastorage();
- ByteBuffer buf = ByteBuffer.allocate(FileWALPointer.POINTER_SIZE);
- buf.order(ByteOrder.nativeOrder());
-
- try {
- try (FileIO io = ioFactory.create(Paths.get(cpDir.getAbsolutePath(), tmpFileName).toFile(),
- StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)) {
- buf.putLong(p.index());
-
- buf.putInt(p.fileOffset());
-
- buf.putInt(p.length());
-
- buf.flip();
-
- io.writeFully(buf);
-
- buf.clear();
+ MetaStorage storage = new MetaStorage(
+ cctx,
+ dataRegion(METASTORE_DATA_REGION_NAME),
+ (DataRegionMetricsImpl) memMetricsMap.get(METASTORE_DATA_REGION_NAME),
+ readOnly
+ );
- io.force(true);
- }
+ storage.init(this);
- Files.move(Paths.get(cpDir.getAbsolutePath(), tmpFileName), Paths.get(cpDir.getAbsolutePath(), fileName));
- }
- catch (IOException e) {
- throw new StorageException("Failed to write node start marker: " + ptr, e);
- }
+ return storage;
}
/**
- * Collects memory recovery pointers from node started files. See {@link #nodeStart(WALPointer)}.
- * Each pointer associated with timestamp extracted from file.
- * Tuples are sorted by timestamp.
- *
- * @return Sorted list of tuples (node started timestamp, memory recovery pointer).
- *
+ * @param cacheGroupsPredicate Cache groups to restore.
+ * @return Last seen WAL pointer during binary memory recovery.
* @throws IgniteCheckedException If failed.
*/
- public List<T2<Long, WALPointer>> nodeStartedPointers() throws IgniteCheckedException {
- List<T2<Long, WALPointer>> res = new ArrayList<>();
+ private RestoreBinaryState restoreBinaryMemory(Predicate<Integer> cacheGroupsPredicate) throws IgniteCheckedException {
+ long time = System.currentTimeMillis();
- try (DirectoryStream<Path> nodeStartedFiles = Files.newDirectoryStream(
- cpDir.toPath(),
- path -> path.toFile().getName().endsWith(NODE_STARTED_FILE_NAME_SUFFIX))
- ) {
- ByteBuffer buf = ByteBuffer.allocate(FileWALPointer.POINTER_SIZE);
- buf.order(ByteOrder.nativeOrder());
+ try {
+ log.info("Starting binary memory restore for: " + cctx.cache().cacheGroupDescriptors().keySet());
- for (Path path : nodeStartedFiles) {
- File f = path.toFile();
+ for (DatabaseLifecycleListener lsnr : getDatabaseListeners(cctx.kernalContext()))
+ lsnr.beforeBinaryMemoryRestore(this);
- String name = f.getName();
+ CheckpointStatus status = readCheckpointStatus();
- Long ts = Long.valueOf(name.substring(0, name.length() - NODE_STARTED_FILE_NAME_SUFFIX.length()));
+ // First, bring memory to the last consistent checkpoint state if needed.
+ // This method should return a pointer to the last valid record in the WAL.
+ RestoreBinaryState binaryState = performBinaryMemoryRestore(status, cacheGroupsPredicate, true);
- try (FileIO io = ioFactory.create(f, READ)) {
- io.readFully(buf);
+ WALPointer restored = binaryState.lastReadRecordPointer();
- buf.flip();
+ if (restored == null && !status.endPtr.equals(CheckpointStatus.NULL_PTR)) {
+ throw new StorageException("The memory cannot be restored. The critical part of WAL archive is missing " +
+ "[tailWalPtr=" + restored + ", endPtr=" + status.endPtr + ']');
+ }
+ else if (restored != null)
+ U.log(log, "Binary memory state restored at node startup [restoredPtr=" + restored + ']');
- FileWALPointer ptr = new FileWALPointer(
- buf.getLong(), buf.getInt(), buf.getInt());
+ // Wal logging is now available.
+ cctx.wal().resumeLogging(restored);
- res.add(new T2<>(ts, ptr));
+ for (DatabaseLifecycleListener lsnr : getDatabaseListeners(cctx.kernalContext()))
+ lsnr.afterBinaryMemoryRestore(binaryState);
- buf.clear();
- }
- catch (IOException e) {
- throw new StorageException("Failed to read node started marker file: " + f.getAbsolutePath(), e);
- }
- }
- }
- catch (IOException e) {
- throw new StorageException("Failed to retreive node started files.", e);
- }
+ if (log.isInfoEnabled())
+ log.info("Binary recovery performed in " + (System.currentTimeMillis() - time) + " ms.");
- // Sort start markers by file timestamp.
- res.sort(Comparator.comparingLong(IgniteBiTuple::get1));
+ return binaryState;
+ }
+ catch (IgniteCheckedException e) {
+ if (X.hasCause(e, StorageException.class, IOException.class))
+ cctx.kernalContext().failure().process(new FailureContext(FailureType.CRITICAL_ERROR, e));
- return res;
+ throw e;
+ }
}
/** {@inheritDoc} */
@@ -973,22 +968,20 @@ private void nodeStart(WALPointer ptr) throws IgniteCheckedException {
super.onKernalStop0(cancel);
- unRegistrateMetricsMBean();
+ unregisterMetricsMBean(
+ cctx.gridConfig(),
+ MBEAN_GROUP,
+ MBEAN_NAME
+ );
+
+ metaStorage = null;
}
/** {@inheritDoc} */
@Override protected void stop0(boolean cancel) {
super.stop0(cancel);
- if (!cctx.kernalContext().clientNode()) {
- if (fileLockHolder != null) {
- if (log.isDebugEnabled())
- log.debug("Release file lock [nodeId=" +
- cctx.localNodeId() + " path=" + fileLockHolder.lockPath() + "]");
-
- fileLockHolder.close();
- }
- }
+ releaseFileLock();
}
/** */
@@ -1065,13 +1058,11 @@ private void nodeStart(WALPointer ptr) throws IgniteCheckedException {
(fullId, pageBuf, tag) -> {
memMetrics.onPageWritten();
- // First of all, write page to disk.
- storeMgr.write(fullId.groupId(), fullId.pageId(), pageBuf, tag);
-
- pageBuf.rewind();
+ // We can write only page from disk into snapshot.
+ snapshotMgr.beforePageWrite(fullId);
- // Only after write we can write page into snapshot.
- snapshotMgr.flushDirtyPageHandler(fullId, pageBuf, tag);
+ // Write page to disk.
+ storeMgr.write(fullId.groupId(), fullId.pageId(), pageBuf, tag);
AtomicInteger cntr = evictedPagesCntr;
@@ -1148,8 +1139,9 @@ private void nodeStart(WALPointer ptr) throws IgniteCheckedException {
plc = PageMemoryImpl.ThrottlingPolicy.valueOf(throttlingPolicyOverride.toUpperCase());
}
catch (IllegalArgumentException e) {
- log.error("Incorrect value of IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED property: " +
- throttlingPolicyOverride + ". Default throttling policy " + plc + " will be used.");
+ log.error("Incorrect value of IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED property. " +
+ "The default throttling policy will be used [plc=" + throttlingPolicyOverride +
+ ", defaultPlc=" + plc + ']');
}
}
return plc;
@@ -1161,8 +1153,8 @@ private void nodeStart(WALPointer ptr) throws IgniteCheckedException {
if (!regCfg.isPersistenceEnabled())
super.checkRegionEvictionProperties(regCfg, dbCfg);
else if (regCfg.getPageEvictionMode() != DataPageEvictionMode.DISABLED) {
- U.warn(log, "Page eviction mode set for [" + regCfg.getName() + "] data will have no effect" +
- " because the oldest pages are evicted automatically if Ignite persistence is enabled.");
+ U.warn(log, "Page eviction mode will have no effect because the oldest pages are evicted automatically " +
+ "if Ignite persistence is enabled: " + regCfg.getName());
}
}
@@ -1282,34 +1274,30 @@ private void shutdownCheckpointer(boolean cancel) {
}
/** {@inheritDoc} */
- @Override public boolean beforeExchange(GridDhtPartitionsExchangeFuture fut) throws IgniteCheckedException {
- DiscoveryEvent discoEvt = fut.firstEvent();
-
- boolean joinEvt = discoEvt.type() == EventType.EVT_NODE_JOINED;
-
- boolean locNode = discoEvt.eventNode().isLocal();
-
- boolean isSrvNode = !cctx.kernalContext().clientNode();
-
- boolean clusterInTransitionStateToActive = fut.activateCluster();
-
- boolean restored = false;
-
- long time = System.currentTimeMillis();
-
- // In case of cluster activation or local join restore, restore whole manager state.
- if (clusterInTransitionStateToActive || (joinEvt && locNode && isSrvNode)) {
- restoreState();
+ @Override public void beforeExchange(GridDhtPartitionsExchangeFuture fut) throws IgniteCheckedException {
+ // Try to restore partition states.
+ if (fut.localJoinExchange() || fut.activateCluster()
+ || (fut.exchangeActions() != null && !F.isEmpty(fut.exchangeActions().cacheGroupsToStart()))) {
+ U.doInParallel(
+ cctx.kernalContext().getSystemExecutorService(),
+ cctx.cache().cacheGroups(),
+ cacheGroup -> {
+ if (cacheGroup.isLocal())
+ return;
+
+ cctx.database().checkpointReadLock();
- restored = true;
- }
- // In case of starting groups, restore partition states only for these groups.
- else if (fut.exchangeActions() != null && !F.isEmpty(fut.exchangeActions().cacheGroupsToStart())) {
- Set<Integer> restoreGroups = fut.exchangeActions().cacheGroupsToStart().stream()
- .map(actionData -> actionData.descriptor().groupId())
- .collect(Collectors.toSet());
+ try {
+ cacheGroup.offheap().restorePartitionStates(Collections.emptyMap());
- restorePartitionStates(Collections.emptyMap(), restoreGroups);
+ if (cacheGroup.localStartVersion().equals(fut.initialVersion()))
+ cacheGroup.topology().afterStateRestored(fut.initialVersion());
+ }
+ finally {
+ cctx.database().checkpointReadUnlock();
+ }
+ }
+ );
}
(This diff was longer than 20,000 lines, and has been truncated...)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services