rajiv-jain-netapp commented on code in PR #14256:
URL: https://github.com/apache/cloudstack/pull/14256#discussion_r4133609797


##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtVmwareCbtSyncCommandWrapper.java:
##########
@@ -0,0 +1,489 @@
+// 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 com.cloud.hypervisor.kvm.resource.wrapper;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.VmwareCbtMigrationAnswer;
+import com.cloud.agent.api.VmwareCbtSyncCommand;
+import com.cloud.agent.api.to.RemoteInstanceTO;
+import com.cloud.agent.api.to.VmwareCbtChangedBlockRangeTO;
+import com.cloud.agent.api.to.VmwareCbtDiskSyncResultTO;
+import com.cloud.agent.api.to.VmwareCbtDiskTO;
+import com.cloud.agent.api.to.VmwareCbtTargetStorageType;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.storage.Storage;
+import com.cloud.utils.script.OutputInterpreter;
+import com.cloud.utils.script.Script;
+
+@ResourceWrapper(handles = VmwareCbtSyncCommand.class)
+public class LibvirtVmwareCbtSyncCommandWrapper extends 
CommandWrapper<VmwareCbtSyncCommand, Answer, LibvirtComputingResource> {
+
+    private static final long DEFAULT_MAX_COPY_CHUNK_BYTES = 256L * 1024L * 
1024L;
+    private static final Pattern SHA1_FINGERPRINT_PATTERN = 
Pattern.compile("(?i)(?:SHA1\\s+)?Fingerprint\\s*=\\s*([0-9A-F:]+)");
+
+    @Override
+    public Answer execute(VmwareCbtSyncCommand cmd, LibvirtComputingResource 
serverResource) {
+        if (!serverResource.hostSupportsVddkBlockCopy(cmd.getVddkLibDir())) {
+            String msg = String.format("Cannot synchronize VMware CBT 
migration %s on host %s. VDDK, qemu-img, qemu-nbd and qemu-io are required.",
+                    cmd.getMigrationUuid(), serverResource.getPrivateIp());
+            logger.info(msg);
+            return new VmwareCbtMigrationAnswer(cmd, false, msg, 
cmd.getMigrationUuid(), cmd.getCycleNumber(),
+                    0, 0, 0, false, null);
+        }
+
+        long startTime = System.currentTimeMillis();
+        List<VmwareCbtChangedBlockRangeTO> changedBlocks = 
cmd.getChangedBlocks();
+        if (changedBlocks == null || changedBlocks.isEmpty()) {
+            long durationSeconds = Math.max(1L, (System.currentTimeMillis() - 
startTime) / 1000L);
+            String msg = String.format("VMware CBT cycle %s for migration %s 
completed with no changed blocks.",
+                    cmd.getCycleNumber(), cmd.getMigrationUuid());
+            logger.info(msg);
+            return new VmwareCbtMigrationAnswer(cmd, true, msg, 
cmd.getMigrationUuid(), cmd.getCycleNumber(),
+                    0, 0, durationSeconds, true, null);
+        }
+
+        VmwareCbtSyncPlan syncPlan = VmwareCbtSyncPlan.create(cmd.getDisks(), 
changedBlocks);
+        if (!syncPlan.isValid()) {
+            String msg = String.format("Cannot synchronize VMware CBT cycle %s 
for migration %s: %s",
+                    cmd.getCycleNumber(), cmd.getMigrationUuid(), 
syncPlan.getValidationError());
+            logger.info(msg);
+            return new VmwareCbtMigrationAnswer(cmd, false, msg, 
cmd.getMigrationUuid(), cmd.getCycleNumber(),
+                    0, 0, 0, false, null);
+        }
+
+        try {
+            validateSyncCommand(cmd);
+            String vddkLibDir = resolveVddkSetting(cmd.getVddkLibDir(), 
serverResource.getVddkLibDir());
+            if (StringUtils.isBlank(vddkLibDir)) {
+                String msg = String.format("Cannot synchronize VMware CBT 
migration %s because no VDDK library directory is configured or detected.",
+                        cmd.getMigrationUuid());
+                logger.info(msg);
+                return new VmwareCbtMigrationAnswer(cmd, false, msg, 
cmd.getMigrationUuid(), cmd.getCycleNumber(),
+                        syncPlan.getChangedBytes(), 0, 0, false, null);
+            }
+
+            RemoteInstanceTO sourceInstance = cmd.getSourceInstance();
+            String vddkThumbprint = 
resolveVddkSetting(cmd.getVddkThumbprint(), serverResource.getVddkThumbprint());
+            if (StringUtils.isBlank(vddkThumbprint)) {
+                vddkThumbprint = 
getVcenterThumbprint(sourceInstance.getVcenterHost(), getTimeout(cmd),
+                        sourceInstance.getInstanceName());
+            }
+            if (StringUtils.isBlank(vddkThumbprint)) {
+                String msg = String.format("Cannot synchronize VMware CBT 
migration %s because the vCenter SSL thumbprint could not be determined.",
+                        cmd.getMigrationUuid());
+                logger.info(msg);
+                return new VmwareCbtMigrationAnswer(cmd, false, msg, 
cmd.getMigrationUuid(), cmd.getCycleNumber(),
+                        syncPlan.getChangedBytes(), 0, 0, false, null);
+            }
+
+            KVMStoragePool targetPool = getTargetStoragePool(cmd, 
serverResource.getStoragePoolMgr());
+            if (cmd.getTargetStorageType() == 
VmwareCbtTargetStorageType.RBD_RAW) {
+                validateRbdTargetPool(cmd, targetPool);
+            } else if (cmd.getTargetStorageType() == 
VmwareCbtTargetStorageType.RAW_BLOCK_DEVICE) {
+                validateBlockDeviceTargetPool(cmd, targetPool);
+            }
+
+            String passwordFilePath = writePasswordFile(cmd);
+            try {
+                List<VmwareCbtDiskSyncResultTO> diskResults = new 
ArrayList<>();
+                for (VmwareCbtSyncPlan.DiskPlan diskPlan : 
syncPlan.getDiskPlans()) {
+                    diskResults.add(syncDiskChangedBlocks(cmd, diskPlan, 
targetPool, passwordFilePath, vddkLibDir, vddkThumbprint,
+                            
StringUtils.defaultIfBlank(cmd.getVddkTransports(), 
serverResource.getVddkTransports())));
+                }
+                long durationSeconds = Math.max(1L, 
(System.currentTimeMillis() - startTime) / 1000L);
+                long dirtyRate = 
getDirtyRateBytesPerSecond(syncPlan.getChangedBytes(), durationSeconds);
+                String msg = String.format("VMware CBT cycle %s for migration 
%s copied %s changed block range(s), " +
+                                "coalesced into %s copy range(s) across %s 
disk(s), totaling %s bytes.",
+                        cmd.getCycleNumber(), cmd.getMigrationUuid(), 
syncPlan.getChangedRangeCount(),
+                        syncPlan.getCopyRangeCount(), 
syncPlan.getDiskPlans().size(), syncPlan.getChangedBytes());
+                logger.info(msg);
+                return new VmwareCbtMigrationAnswer(cmd, true, msg, 
cmd.getMigrationUuid(), cmd.getCycleNumber(),
+                        syncPlan.getChangedBytes(), dirtyRate, 
durationSeconds, false, diskResults);
+            } finally {
+                Files.deleteIfExists(Path.of(passwordFilePath));
+            }
+        } catch (Exception e) {
+            String msg = String.format("Cannot synchronize VMware CBT cycle %s 
for migration %s: %s",
+                    cmd.getCycleNumber(), cmd.getMigrationUuid(),
+                    StringUtils.defaultIfBlank(e.getMessage(), 
e.getClass().getSimpleName()));
+            logger.error(msg, e);
+            return new VmwareCbtMigrationAnswer(cmd, false, msg, 
cmd.getMigrationUuid(), cmd.getCycleNumber(),
+                    syncPlan.getChangedBytes(), 0, 0, false, null);
+        }
+    }
+
+    private void validateSyncCommand(VmwareCbtSyncCommand cmd) {
+        RemoteInstanceTO sourceInstance = cmd.getSourceInstance();
+        if (sourceInstance == null) {
+            throw new IllegalArgumentException("source VMware instance 
information is missing");
+        }
+        if (StringUtils.isAnyBlank(sourceInstance.getVcenterHost(), 
sourceInstance.getVcenterUsername(),
+                sourceInstance.getVcenterPassword(), 
sourceInstance.getInstanceName())) {
+            throw new IllegalArgumentException("source vCenter host, username, 
password and VM name are required");
+        }
+        if (StringUtils.isBlank(sourceInstance.getVmwareMoref())) {
+            throw new IllegalArgumentException("source VMware VM managed 
object reference is missing");
+        }
+        if (StringUtils.isBlank(cmd.getSnapshotMor())) {
+            throw new IllegalArgumentException("VMware snapshot managed object 
reference is missing");
+        }
+    }
+
+    private VmwareCbtDiskSyncResultTO 
syncDiskChangedBlocks(VmwareCbtSyncCommand cmd, VmwareCbtSyncPlan.DiskPlan 
diskPlan,
+                                                            KVMStoragePool 
targetPool, String passwordFilePath, String vddkLibDir,
+                                                            String 
vddkThumbprint, String vddkTransports) throws Exception {
+        VmwareCbtDiskTO disk = diskPlan.getDisk();
+        validateDisk(cmd, disk);
+        long startTime = System.currentTimeMillis();
+        String scriptPath = writeDiskSyncScript(cmd, diskPlan, targetPool);
+        try {
+            String command = buildNbdkitDeltaSyncCommand(cmd, disk, 
passwordFilePath, vddkLibDir, vddkThumbprint,
+                    vddkTransports, scriptPath);
+            VmwareCbtCommandResult commandResult = executeLoggedBash(command, 
getTimeout(cmd),
+                    String.format("(%s) VMware CBT delta sync disk %s", 
cmd.getMigrationUuid(), disk.getDiskId()));
+            long durationSeconds = Math.max(1L, (System.currentTimeMillis() - 
startTime) / 1000L);
+            if (commandResult.getExitValue() != 0) {
+                String details = String.format("changed-block copy from VMware 
VDDK snapshot failed for source disk %s with exit code %s",
+                        disk.getDiskId(), commandResult.getExitValue());
+                throw new 
IllegalStateException(commandResult.appendLastCommandOutput(details));
+            }
+            return new VmwareCbtDiskSyncResultTO(disk.getDiskId(), 
disk.getTargetPath(), disk.getChangeId(),

Review Comment:
   It looks like we're returning the input changeId rather than an updated one. 
If that's the case, wouldn't subsequent incremental syncs continue to track 
changes from the baseline snapshot and potentially result in copying all 
changes accumulated since the baseline? It may be worth validating this 
behaviour once.
   
   One approach could be to follow the same pattern used in 
VmwareCbtMigrationManagerImpl.refreshBaselineDiskChangeIds(). After the agent 
reports a successful sync, we could read the current changeId from each disk 
backing in the cycle snapshot and persist that value as the checkpoint for the 
next incremental cycle.



-- 
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]

Reply via email to