ptupitsyn commented on code in PR #6556: URL: https://github.com/apache/ignite-3/pull/6556#discussion_r2332254195
########## modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/StaticUnitDeployer.java: ########## @@ -0,0 +1,176 @@ +/* + * 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.deployunit; + +import static java.util.Collections.emptyList; +import static org.apache.ignite.deployment.version.Version.parseVersion; +import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED; +import static org.apache.ignite.internal.util.CompletableFutures.allOf; + +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; +import org.apache.ignite.deployment.version.Version; +import org.apache.ignite.internal.deployunit.exception.DeploymentUnitReadException; +import org.apache.ignite.internal.deployunit.metastore.DeploymentUnitStore; +import org.apache.ignite.internal.deployunit.metastore.status.UnitNodeStatus; +import org.apache.ignite.internal.logger.IgniteLogger; +import org.apache.ignite.internal.logger.Loggers; + +/** + * Observes a predefined directory with statically provisioned deployment units and + * registers their presence in the deployment store. + * + * <p>The observer scans the {@code deploymentUnitsRoot} directory, expecting the following structure: + * {@code <unitId>/<version>/} + * For every discovered {@code unitId}-{@code version} pair that is not yet registered for this node, + * the observer creates (or reuses) a cluster status and then creates the node status marked as + * {@link DeploymentStatus#DEPLOYED}. + */ +public class StaticUnitDeployer { + private static final IgniteLogger LOG = Loggers.forClass(StaticUnitDeployer.class); + + private final DeploymentUnitStore deploymentUnitStore; + + private final String nodeName; + + private final Path deploymentUnitsRoot; + + /** + * Constructor. + */ + public StaticUnitDeployer( + DeploymentUnitStore deploymentUnitStore, + String nodeName, + Path deploymentUnitsRoot + ) { + this.deploymentUnitStore = deploymentUnitStore; + this.nodeName = nodeName; + this.deploymentUnitsRoot = deploymentUnitsRoot; + } + + /** + * Scans the filesystem for statically deployed units and registers their cluster and node statuses + * if they are not yet present in the store. + * + * <p>Already registered unit versions for this node are skipped. New ones are registered as DEPLOYED. + */ + public CompletableFuture<Void> searchAndDeployStaticUnits() { + LOG.info("Start search static deployment units."); Review Comment: ```suggestion LOG.info("Static deployment unit lookup started."); ``` Or maybe remove this log message? ########## modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/StaticUnitDeployer.java: ########## @@ -0,0 +1,176 @@ +/* + * 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.deployunit; + +import static java.util.Collections.emptyList; +import static org.apache.ignite.deployment.version.Version.parseVersion; +import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED; +import static org.apache.ignite.internal.util.CompletableFutures.allOf; + +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; +import org.apache.ignite.deployment.version.Version; +import org.apache.ignite.internal.deployunit.exception.DeploymentUnitReadException; +import org.apache.ignite.internal.deployunit.metastore.DeploymentUnitStore; +import org.apache.ignite.internal.deployunit.metastore.status.UnitNodeStatus; +import org.apache.ignite.internal.logger.IgniteLogger; +import org.apache.ignite.internal.logger.Loggers; + +/** + * Observes a predefined directory with statically provisioned deployment units and + * registers their presence in the deployment store. + * + * <p>The observer scans the {@code deploymentUnitsRoot} directory, expecting the following structure: + * {@code <unitId>/<version>/} + * For every discovered {@code unitId}-{@code version} pair that is not yet registered for this node, + * the observer creates (or reuses) a cluster status and then creates the node status marked as + * {@link DeploymentStatus#DEPLOYED}. + */ +public class StaticUnitDeployer { + private static final IgniteLogger LOG = Loggers.forClass(StaticUnitDeployer.class); + + private final DeploymentUnitStore deploymentUnitStore; + + private final String nodeName; + + private final Path deploymentUnitsRoot; + + /** + * Constructor. + */ + public StaticUnitDeployer( + DeploymentUnitStore deploymentUnitStore, + String nodeName, + Path deploymentUnitsRoot + ) { + this.deploymentUnitStore = deploymentUnitStore; + this.nodeName = nodeName; + this.deploymentUnitsRoot = deploymentUnitsRoot; + } + + /** + * Scans the filesystem for statically deployed units and registers their cluster and node statuses + * if they are not yet present in the store. + * + * <p>Already registered unit versions for this node are skipped. New ones are registered as DEPLOYED. + */ + public CompletableFuture<Void> searchAndDeployStaticUnits() { + LOG.info("Start search static deployment units."); + StaticUnits allUnits = collectStaticUnits(); + + return deploymentUnitStore.getNodeStatuses(nodeName).thenCompose(statuses -> { + List<CompletableFuture<?>> futures = new ArrayList<>(); + + for (UnitNodeStatus status : statuses) { + allUnits.filter(status.id(), status.version()); + } + + allUnits.forEach((id, version) -> { + LOG.info("Start processing unit {}:{}", id, version); + CompletableFuture<Boolean> future = deploymentUnitStore.createClusterStatus(id, version, Set.of(nodeName)) + .thenCompose(status -> { + if (status == null) { + return deploymentUnitStore.getClusterStatus(id, version).thenCompose(it -> + deploymentUnitStore.createNodeStatus(nodeName, id, version, it.opId(), DEPLOYED) + ); + } else { + return deploymentUnitStore.createNodeStatus(nodeName, id, version, status.opId(), DEPLOYED); + } + }) + .whenComplete((result, t) -> + LOG.info("Finished static status creating {}:{} with result {}", t, id, version, result) Review Comment: "Static status" sounds confusing. I think it can be useful to log a full list of detected static deployment units in the very end. One message per unit seems excessive. ########## modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/StaticUnitDeployer.java: ########## @@ -0,0 +1,176 @@ +/* + * 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.deployunit; + +import static java.util.Collections.emptyList; +import static org.apache.ignite.deployment.version.Version.parseVersion; +import static org.apache.ignite.internal.deployunit.DeploymentStatus.DEPLOYED; +import static org.apache.ignite.internal.util.CompletableFutures.allOf; + +import java.io.IOException; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; +import org.apache.ignite.deployment.version.Version; +import org.apache.ignite.internal.deployunit.exception.DeploymentUnitReadException; +import org.apache.ignite.internal.deployunit.metastore.DeploymentUnitStore; +import org.apache.ignite.internal.deployunit.metastore.status.UnitNodeStatus; +import org.apache.ignite.internal.logger.IgniteLogger; +import org.apache.ignite.internal.logger.Loggers; + +/** + * Observes a predefined directory with statically provisioned deployment units and + * registers their presence in the deployment store. + * + * <p>The observer scans the {@code deploymentUnitsRoot} directory, expecting the following structure: + * {@code <unitId>/<version>/} + * For every discovered {@code unitId}-{@code version} pair that is not yet registered for this node, + * the observer creates (or reuses) a cluster status and then creates the node status marked as + * {@link DeploymentStatus#DEPLOYED}. + */ +public class StaticUnitDeployer { + private static final IgniteLogger LOG = Loggers.forClass(StaticUnitDeployer.class); + + private final DeploymentUnitStore deploymentUnitStore; + + private final String nodeName; + + private final Path deploymentUnitsRoot; + + /** + * Constructor. + */ + public StaticUnitDeployer( + DeploymentUnitStore deploymentUnitStore, + String nodeName, + Path deploymentUnitsRoot + ) { + this.deploymentUnitStore = deploymentUnitStore; + this.nodeName = nodeName; + this.deploymentUnitsRoot = deploymentUnitsRoot; + } + + /** + * Scans the filesystem for statically deployed units and registers their cluster and node statuses + * if they are not yet present in the store. + * + * <p>Already registered unit versions for this node are skipped. New ones are registered as DEPLOYED. + */ + public CompletableFuture<Void> searchAndDeployStaticUnits() { + LOG.info("Start search static deployment units."); + StaticUnits allUnits = collectStaticUnits(); + + return deploymentUnitStore.getNodeStatuses(nodeName).thenCompose(statuses -> { + List<CompletableFuture<?>> futures = new ArrayList<>(); + + for (UnitNodeStatus status : statuses) { + allUnits.filter(status.id(), status.version()); + } + + allUnits.forEach((id, version) -> { + LOG.info("Start processing unit {}:{}", id, version); + CompletableFuture<Boolean> future = deploymentUnitStore.createClusterStatus(id, version, Set.of(nodeName)) + .thenCompose(status -> { + if (status == null) { + return deploymentUnitStore.getClusterStatus(id, version).thenCompose(it -> + deploymentUnitStore.createNodeStatus(nodeName, id, version, it.opId(), DEPLOYED) + ); + } else { + return deploymentUnitStore.createNodeStatus(nodeName, id, version, status.opId(), DEPLOYED); + } + }) + .whenComplete((result, t) -> + LOG.info("Finished static status creating {}:{} with result {}", t, id, version, result) + ); + futures.add(future); + }); + + return allOf(futures); + }); + } + + private StaticUnits collectStaticUnits() { + StaticUnits units = new StaticUnits(); + List<Path> unitFolders = allSubdirectories(deploymentUnitsRoot); + for (Path unitFolder : unitFolders) { + List<Path> versions = allSubdirectories(unitFolder); + for (Path versionFolder : versions) { + units.register( + unitFolder.getFileName().toString(), + parseVersion(versionFolder.getFileName().toString()) + ); + } + + } + return units; + } + + private static List<Path> allSubdirectories(Path folder) { + List<Path> subfolders = new ArrayList<>(); + if (Files.notExists(folder)) { + return emptyList(); + } + try { + Files.walkFileTree(folder, Set.of(), 1, new SimpleFileVisitor<>() { + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + if (attrs.isDirectory()) { + subfolders.add(file); + } + return super.visitFile(file, attrs); + } + }); + } catch (IOException e) { + LOG.error("Failed to collect static deployment unit folders.", e); + throw new DeploymentUnitReadException(e); + } + return subfolders; Review Comment: ```suggestion if (Files.notExists(folder)) { return emptyList(); } try { List<Path> subfolders = new ArrayList<>(); Files.walkFileTree(folder, Set.of(), 1, new SimpleFileVisitor<>() { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { if (attrs.isDirectory()) { subfolders.add(file); } return super.visitFile(file, attrs); } }); return subfolders; } catch (IOException e) { LOG.error("Failed to collect static deployment unit folders: " + e.getMessage(), e); throw new DeploymentUnitReadException(e); } ``` -- 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: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
