You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2024/04/23 09:54:43 UTC

(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.19'

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 93d4816ee8e1d5dd5b4ab4b416bb8337e63841c0
Merge: bf9fdaddbd2 0fa71f56966
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Apr 23 15:24:19 2024 +0530

    Merge remote-tracking branch 'origin/4.19'
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
    
     Conflicts:
            plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java

 .../hypervisor/kvm/resource/LibvirtVMDef.java      |  4 +--
 .../kvm/storage/LinstorStorageAdaptor.java         | 33 +++++++++++++------
 .../storage/datastore/util/LinstorUtil.java        | 19 +++++++++++
 .../com/cloud/network/IpAddressManagerImpl.java    | 38 +++++++++++++++++-----
 ui/src/components/view/DetailSettings.vue          | 14 +++++---
 5 files changed, 81 insertions(+), 27 deletions(-)

diff --cc plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index 794abfd2a38,d560c4ee806..864a07801ae
--- a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
+++ b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@@ -266,18 -283,9 +288,9 @@@ public class LinstorStorageAdaptor impl
  
          try
          {
-             // allow 2 primaries for live migration, should be removed by disconnect on the other end
-             ResourceDefinitionModify rdm = new ResourceDefinitionModify();
-             Properties props = new Properties();
-             props.put("DrbdOptions/Net/allow-two-primaries", "yes");
-             rdm.setOverrideProps(props);
-             ApiCallRcList answers = api.resourceDefinitionModify(rscName, rdm);
-             if (answers.hasError()) {
-                 logger.error("Unable to set 'allow-two-primaries' on " + rscName);
-                 // do not fail here as adding allow-two-primaries property is only a problem while live migrating
-             }
+             allow2PrimariesIfInUse(api, rscName);
          } catch (ApiException apiEx) {
 -            s_logger.error(apiEx);
 +            logger.error(apiEx);
              // do not fail here as adding allow-two-primaries property is only a problem while live migrating
          }
          return true;