CLVM enhancements and fixes

api/src/main/java/com/cloud/storage/Storage.java

@@ -170,6 +170,7 @@ public static enum StoragePoolType {
         ISO(false, false, EncryptionSupport.Unsupported), // for iso image
         LVM(false, false, EncryptionSupport.Unsupported), // XenServer local LVM SR
         CLVM(true, false, EncryptionSupport.Unsupported),
+        CLVM_NG(true, false, EncryptionSupport.Hypervisor),
         RBD(true, true, EncryptionSupport.Unsupported), // http://libvirt.org/storage.html#StorageBackendRBD
         SharedMountPoint(true, true, EncryptionSupport.Hypervisor),
         VMFS(true, true, EncryptionSupport.Unsupported), // VMware VMFS storage

core/src/main/java/com/cloud/agent/api/MigrateCommand.java

@@ -26,6 +26,7 @@
 
 import com.cloud.agent.api.to.DpdkTO;
 import com.cloud.agent.api.to.VirtualMachineTO;
+import com.cloud.storage.Storage;
 
 public class MigrateCommand extends Command {
     private String vmName;
@@ -184,6 +185,8 @@ public String toString() {
         private final String sourceText;
         private final String backingStoreText;
         private boolean isSourceDiskOnStorageFileSystem;
+        private Storage.StoragePoolType sourcePoolType;
+        private Storage.StoragePoolType destPoolType;
 
         public MigrateDiskInfo(final String serialNumber, final DiskType diskType, final DriverType driverType, final Source source, final String sourceText) {
             this.serialNumber = serialNumber;
@@ -232,6 +235,22 @@ public boolean isSourceDiskOnStorageFileSystem() {
         public void setSourceDiskOnStorageFileSystem(boolean isDiskOnFileSystemStorage) {
             this.isSourceDiskOnStorageFileSystem = isDiskOnFileSystemStorage;
         }
+
+        public Storage.StoragePoolType getSourcePoolType() {
+            return sourcePoolType;
+        }
+
+        public void setSourcePoolType(Storage.StoragePoolType sourcePoolType) {
+            this.sourcePoolType = sourcePoolType;
+        }
+
+        public Storage.StoragePoolType getDestPoolType() {
+            return destPoolType;
+        }
+
+        public void setDestPoolType(Storage.StoragePoolType destPoolType) {
+            this.destPoolType = destPoolType;
+        }
     }
 
     @Override

core/src/main/java/com/cloud/agent/api/PostMigrationAnswer.java

@@ -0,0 +1,42 @@
+//
+// 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.agent.api;
+
+/**
+ * Answer for PostMigrationCommand.
+ * Indicates success or failure of post-migration operations on the destination host.
+ */
+public class PostMigrationAnswer extends Answer {
+
+    protected PostMigrationAnswer() {
+    }
+
+    public PostMigrationAnswer(PostMigrationCommand cmd, String detail) {
+        super(cmd, false, detail);
+    }
+
+    public PostMigrationAnswer(PostMigrationCommand cmd, Exception ex) {
+        super(cmd, ex);
+    }
+
+    public PostMigrationAnswer(PostMigrationCommand cmd) {
+        super(cmd, true, null);
+    }
+}

core/src/main/java/com/cloud/agent/api/PostMigrationCommand.java

@@ -0,0 +1,54 @@
+//
+// 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.agent.api;
+
+import com.cloud.agent.api.to.VirtualMachineTO;
+
+/**
+ * PostMigrationCommand is sent to the destination host after a successful VM migration.
+ * It performs post-migration tasks such as:
+ * - Claiming exclusive locks on CLVM volumes (converting from shared to exclusive mode)
+ * - Other post-migration cleanup operations
+ */
+public class PostMigrationCommand extends Command {
+    private VirtualMachineTO vm;
+    private String vmName;
+
+    protected PostMigrationCommand() {
+    }
+
+    public PostMigrationCommand(VirtualMachineTO vm, String vmName) {
+        this.vm = vm;
+        this.vmName = vmName;
+    }
+
+    public VirtualMachineTO getVirtualMachine() {
+        return vm;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return true;
+    }
+}

core/src/main/java/com/cloud/agent/api/PreMigrationCommand.java

@@ -0,0 +1,56 @@
+//
+// 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.agent.api;
+
+import com.cloud.agent.api.to.VirtualMachineTO;
+
+/**
+ * PreMigrationCommand is sent to the source host before VM migration starts.
+ * It performs pre-migration tasks such as:
+ * - Converting CLVM volume exclusive locks to shared mode so destination host can access them
+ * - Other pre-migration preparation operations on the source host
+ *
+ * This command runs on the SOURCE host before PrepareForMigrationCommand runs on the DESTINATION host.
+ */
+public class PreMigrationCommand extends Command {
+    private VirtualMachineTO vm;
+    private String vmName;
+
+    protected PreMigrationCommand() {
+    }
+
+    public PreMigrationCommand(VirtualMachineTO vm, String vmName) {
+        this.vm = vm;
+        this.vmName = vmName;
+    }
+
+    public VirtualMachineTO getVirtualMachine() {
+        return vm;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return true;
+    }
+}

core/src/main/java/org/apache/cloudstack/storage/command/ClvmLockTransferAnswer.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.cloudstack.storage.command;
+
+import com.cloud.agent.api.Answer;
+
+/**
+ * Answer for ClvmLockTransferCommand, containing lock state information.
+ * This answer includes the current lock holder information when querying lock state.
+ */
+public class ClvmLockTransferAnswer extends Answer {
+
+    private String currentLockHostname;
+    private boolean isActive;
+    private boolean isExclusive;
+    private String lvAttributes;
+
+    public ClvmLockTransferAnswer(ClvmLockTransferCommand cmd, boolean result, String details) {
+        super(cmd, result, details);
+    }
+
+    public ClvmLockTransferAnswer(ClvmLockTransferCommand cmd, boolean result, String details,
+                                  String currentLockHostname, boolean isActive, boolean isExclusive,
+                                  String lvAttributes) {
+        super(cmd, result, details);
+        this.currentLockHostname = currentLockHostname;
+        this.isActive = isActive;
+        this.isExclusive = isExclusive;
+        this.lvAttributes = lvAttributes;
+    }
+
+    /**
+     * Get the hostname of the host currently holding the lock (if any).
+     * This is parsed from the LVM "lv_host" field.
+     *
+     * @return hostname or null if no lock is held
+     */
+    public String getCurrentLockHostname() {
+        return currentLockHostname;
+    }
+
+    public void setCurrentLockHostname(String currentLockHostname) {
+        this.currentLockHostname = currentLockHostname;
+    }
+
+    /**
+     * Whether the volume is currently active on any host.
+     *
+     * @return true if active, false otherwise
+     */
+    public boolean isActive() {
+        return isActive;
+    }
+
+    public void setActive(boolean active) {
+        isActive = active;
+    }
+
+    /**
+     * Whether the lock is exclusive (as opposed to shared).
+     * Only meaningful if isActive() is true.
+     *
+     * @return true if exclusive lock, false if shared
+     */
+    public boolean isExclusive() {
+        return isExclusive;
+    }
+
+    public void setExclusive(boolean exclusive) {
+        isExclusive = exclusive;
+    }
+
+    public String getLvAttributes() {
+        return lvAttributes;
+    }
+
+    public void setLvAttributes(String lvAttributes) {
+        this.lvAttributes = lvAttributes;
+    }
+}

core/src/main/java/org/apache/cloudstack/storage/command/ClvmLockTransferCommand.java

@@ -0,0 +1,100 @@
+// 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.cloudstack.storage.command;
+
+import com.cloud.agent.api.Command;
+
+/**
+ * Command to transfer CLVM (Clustered LVM) exclusive lock between hosts.
+ * This enables lightweight volume migration for CLVM storage pools where volumes
+ * reside in the same Volume Group (VG) but need to be accessed from different hosts.
+ *
+ * <p>Instead of copying volume data (traditional migration), this command simply
+ * deactivates the LV on the source host and activates it exclusively on the destination host.
+ *
+ * <p>This is significantly faster (10-100x) than traditional migration and uses no network bandwidth.
+ */
+public class ClvmLockTransferCommand extends Command {
+
+    /**
+     * Operation to perform on the CLVM volume.
+     * Maps to lvchange flags for LVM operations.
+     */
+    public enum Operation {
+        /** Deactivate the volume on this host (-an) */
+        DEACTIVATE("-an", "deactivate"),
+
+        /** Activate the volume exclusively on this host (-aey) */
+        ACTIVATE_EXCLUSIVE("-aey", "activate exclusively"),
+
+        /** Activate the volume in shared mode on this host (-asy) */
+        ACTIVATE_SHARED("-asy", "activate in shared mode"),
+
+        /** Query the current lock state (lvs -o lv_attr,lv_host) */
+        QUERY_LOCK_STATE("query", "query lock state");
+
+        private final String lvchangeFlag;
+        private final String description;
+
+        Operation(String lvchangeFlag, String description) {
+            this.lvchangeFlag = lvchangeFlag;
+            this.description = description;
+        }
+
+        public String getLvchangeFlag() {
+            return lvchangeFlag;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    private String lvPath;
+    private Operation operation;
+    private String volumeUuid;
+
+    public ClvmLockTransferCommand() {
+        // For serialization
+    }
+
+    public ClvmLockTransferCommand(Operation operation, String lvPath, String volumeUuid) {
+        this.operation = operation;
+        this.lvPath = lvPath;
+        this.volumeUuid = volumeUuid;
+        // Execute in sequence to ensure lock safety
+        setWait(30);
+    }
+
+    public String getLvPath() {
+        return lvPath;
+    }
+
+    public Operation getOperation() {
+        return operation;
+    }
+
+    public String getVolumeUuid() {
+        return volumeUuid;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return true;
+    }
+}