alex-plekhanov commented on code in PR #12562: URL: https://github.com/apache/ignite/pull/12562#discussion_r2603131752
########## modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotRestoreFromRemoteMdcTest.java: ########## @@ -0,0 +1,168 @@ +/* + * 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.persistence.snapshot; + +import java.io.IOException; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.ListeningTestLogger; +import org.apache.ignite.testframework.LogListener; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.apache.ignite.internal.util.IgniteUtils.defaultWorkDirectory; + +/** */ +public class IgniteSnapshotRestoreFromRemoteMdcTest extends AbstractSnapshotSelfTest { + /** Cache. */ + private static final String CACHE = "cache"; + + /** */ + private static final String DC_ID_0 = "DC_ID_0"; + + /** */ + private static final String DC_ID_1 = "DC_ID_1"; + + /** */ + private ListeningTestLogger listeningLog = new ListeningTestLogger(log); Review Comment: final ########## modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotRestoreProcess.java: ########## @@ -1586,22 +1586,34 @@ private static Map<UUID, Map<Integer, Set<Integer>>> snapshotAffinity( List<UUID> nodes = new ArrayList<>(metas.keySet()); Collections.shuffle(nodes); - Map<UUID, List<SnapshotMetadata>> shuffleMetas = new LinkedHashMap<>(); - nodes.forEach(k -> shuffleMetas.put(k, metas.get(k))); + Map<UUID, List<SnapshotMetadata>> orderedMetas = new LinkedHashMap<>(); - for (Map.Entry<UUID, List<SnapshotMetadata>> e : shuffleMetas.entrySet()) { + String locDc = ctx.discovery().localNode().dataCenterId(); + + if (locDc != null) { + List<UUID> sameDcNodes = nodes.stream() + .map(uuid -> ctx.discovery().node(uuid)) + .filter(node -> Objects.equals(node.dataCenterId(), locDc)) + .map(ClusterNode::id) + .collect(Collectors.toList()); + + sameDcNodes.forEach(k -> orderedMetas.put(k, metas.get(k))); // Getting same DC files first. + } + + nodes.forEach(k -> orderedMetas.put(k, metas.get(k))); + + for (Map.Entry<UUID, List<SnapshotMetadata>> e : orderedMetas.entrySet()) { UUID nodeId = e.getKey(); for (SnapshotMetadata meta : ofNullable(e.getValue()).orElse(Collections.emptyList())) { Map<Integer, Set<Integer>> parts = ofNullable(meta.partitions()).orElse(Collections.emptyMap()); for (Map.Entry<Integer, Set<Integer>> metaParts : parts.entrySet()) { for (Integer partId : metaParts.getValue()) { - if (filter.test(metaParts.getKey(), partId)) { + if (filter.test(metaParts.getKey(), partId)) Review Comment: Redudnant change ########## modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotRestoreFromRemoteMdcTest.java: ########## @@ -0,0 +1,168 @@ +/* + * 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.persistence.snapshot; + +import java.io.IOException; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Collections; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.IgniteException; +import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteEx; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.ListeningTestLogger; +import org.apache.ignite.testframework.LogListener; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.apache.ignite.internal.util.IgniteUtils.defaultWorkDirectory; + +/** */ +public class IgniteSnapshotRestoreFromRemoteMdcTest extends AbstractSnapshotSelfTest { + /** Cache. */ + private static final String CACHE = "cache"; + + /** */ + private static final String DC_ID_0 = "DC_ID_0"; + + /** */ + private static final String DC_ID_1 = "DC_ID_1"; + + /** */ + private ListeningTestLogger listeningLog = new ListeningTestLogger(log); + + /** @throws Exception If fails. */ + @Before + public void before() throws Exception { + cleanPersistenceDir(); + cleanupDedicatedPersistenceDirs(); + } + + /** @throws Exception If fails. */ + @After + public void after() throws Exception { Review Comment: Looks like method can be ommited -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
