Merge branch 'master' into ovfprops-full

yadvr · web-flow · commit 1db7277ad956 · 2020-08-25T17:19:46.000+05:30
diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
@@ -258,3 +258,8 @@ hypervisor.type=kvm
 # timer.
 # For all actions refer to the libvirt documentation.
 # Recommended values are: none, reset and poweroff.
+#
+iscsi.session.cleanup.enabled=false
+# Automatically clean up iscsi sessions not attached to any VM.
+# Should be enabled for users using managed storage for example solidfire.
+# Should be disabled for users with unmanaged iscsi connections on their hosts
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/UsageRecordResponse.java
@@ -88,6 +88,10 @@ public class UsageRecordResponse extends BaseResponseWithTagInformation implemen
     @Param(description = "template ID")
     private String templateId;
 
+    @SerializedName(ApiConstants.OS_TYPE_ID)
+    @Param(description = "virtual machine os type id")
+    private Long osTypeId;
+
     @SerializedName("usageid")
     @Param(description = "id of the resource")
     private String usageId;
@@ -198,6 +202,10 @@ public void setTemplateId(String templateId) {
         this.templateId = templateId;
     }
 
+    public void setOsTypeId(Long osTypeId) {
+        this.osTypeId = osTypeId;
+    }
+
     public void setUsageId(String usageId) {
         this.usageId = usageId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/VMSnapshotResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/VMSnapshotResponse.java
@@ -21,6 +21,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import com.cloud.hypervisor.Hypervisor;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponseWithTagInformation;
 import org.apache.cloudstack.api.EntityReference;
@@ -100,6 +101,10 @@ public class VMSnapshotResponse extends BaseResponseWithTagInformation implement
     @Param(description = "the domain associated with the disk volume")
     private String domainName;
 
+    @SerializedName(ApiConstants.HYPERVISOR)
+    @Param(description = "the type of hypervisor on which snapshot is stored")
+    private Hypervisor.HypervisorType hypervisor;
+
     public VMSnapshotResponse() {
         tags = new LinkedHashSet<ResourceTagResponse>();
     }
@@ -236,4 +241,12 @@ public void setDomainName(String domainName) {
     public void setTags(Set<ResourceTagResponse> tags) {
         this.tags = tags;
     }
+
+    public Hypervisor.HypervisorType getHypervisor() {
+        return hypervisor;
+    }
+
+    public void setHypervisor(Hypervisor.HypervisorType hypervisor) {
+        this.hypervisor = hypervisor;
+    }
 }
diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst
@@ -24,6 +24,7 @@ case "$1" in
      
         # Linking usage server db.properties to management server db.properties
         if [ -f "/etc/cloudstack/management/db.properties" ]; then
+            echo Replacing usage server's db.properties with a link to the management server's db.properties
             rm -f /etc/cloudstack/usage/db.properties
             ln -s /etc/cloudstack/management/db.properties /etc/cloudstack/usage/db.properties
         fi
@@ -35,6 +36,7 @@ case "$1" in
 
         # Replacing key with management server key
         if [ -f "/etc/cloudstack/management/key" ]; then
+            echo Replacing usage server's key with a link to the management server's key
             rm -f /etc/cloudstack/usage/key
             ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key
         fi
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2663,14 +2663,14 @@ public Network doInTransaction(final TransactionStatus status) {
         return network;
     }
 
-    /**
-     * Checks bypass VLAN id/range overlap check during network creation for guest networks
-     * @param bypassVlanOverlapCheck bypass VLAN id/range overlap check
-     * @param ntwkOff network offering
-     */
-    private boolean hasGuestBypassVlanOverlapCheck(final boolean bypassVlanOverlapCheck, final NetworkOfferingVO ntwkOff, final boolean isPrivateNetwork) {
-        return bypassVlanOverlapCheck && (ntwkOff.getGuestType() == GuestType.Shared || isPrivateNetwork);
-    }
+  /**
+   * Checks bypass VLAN id/range overlap check during network creation for guest networks
+   * @param bypassVlanOverlapCheck bypass VLAN id/range overlap check
+   * @param ntwkOff network offering
+   */
+  private boolean hasGuestBypassVlanOverlapCheck(final boolean bypassVlanOverlapCheck, final NetworkOfferingVO ntwkOff, final boolean isPrivateNetwork) {
+    return bypassVlanOverlapCheck && (ntwkOff.getGuestType() != GuestType.Isolated || isPrivateNetwork);
+  }
 
     /**
      * Checks for L2 network offering services. Only 2 cases allowed:
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
@@ -465,14 +465,14 @@ fi
 
 %post usage
 if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
-    echo Replacing db.properties with management server db.properties
+    echo Replacing usage server's db.properties with a link to the management server's db.properties
     rm -f %{_sysconfdir}/%{name}/usage/db.properties
     ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties
     /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true
 fi
 
 if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
-    echo Replacing key with management server key
+    echo Replacing usage server's key with a link to the management server's key
     rm -f %{_sysconfdir}/%{name}/usage/key
     ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
 fi
diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec
@@ -462,14 +462,14 @@ fi
 
 %post usage
 if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
-    echo Replacing db.properties with management server db.properties
+    echo Replacing usage server's db.properties with a link to the management server's db.properties
     rm -f %{_sysconfdir}/%{name}/usage/db.properties
     ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties
     /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true
 fi
 
 if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
-    echo Replacing key with management server key
+    echo Replacing usage server's key with a link to the management server's key
     rm -f %{_sysconfdir}/%{name}/usage/key
     ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
 fi
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -61,6 +61,7 @@
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.joda.time.Duration;
@@ -1156,9 +1157,15 @@ public boolean configure(final String name, final Map<String, Object> params) th
         storageProcessor.configure(name, params);
         storageHandler = new StorageSubsystemCommandHandlerBase(storageProcessor);
 
-        IscsiStorageCleanupMonitor isciCleanupMonitor = new IscsiStorageCleanupMonitor();
-        final Thread cleanupMonitor = new Thread(isciCleanupMonitor);
-        cleanupMonitor.start();
+        Boolean _iscsiCleanUpEnabled = Boolean.parseBoolean((String)params.get("iscsi.session.cleanup.enabled"));
+
+        if (BooleanUtils.isTrue(_iscsiCleanUpEnabled)) {
+            IscsiStorageCleanupMonitor isciCleanupMonitor = new IscsiStorageCleanupMonitor();
+            final Thread cleanupMonitor = new Thread(isciCleanupMonitor);
+            cleanupMonitor.start();
+        } else {
+            s_logger.info("iscsi session clean up is disabled");
+        }
 
         return true;
     }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/IscsiStorageCleanupMonitor.java
@@ -38,6 +38,7 @@ public class IscsiStorageCleanupMonitor implements Runnable{
     private static final String ISCSI_PATH_PREFIX = "/dev/disk/by-path";
     private static final String KEYWORD_ISCSI = "iscsi";
     private static final String KEYWORD_IQN = "iqn";
+    private static final String REGEX_PART = "\\S+part\\d+$";
 
     private IscsiAdmStorageAdaptor iscsiStorageAdaptor;
 
@@ -114,7 +115,7 @@ private void updateDiskStatusMapWithInactiveIscsiSessions(Connect conn){
 
                     //check the volume map. If an entry exists change the status to True
                     for (final LibvirtVMDef.DiskDef disk : disks) {
-                        if (diskStatusMap.containsKey(disk.getDiskPath())) {
+                        if (diskStatusMap.containsKey(disk.getDiskPath())&&!disk.getDiskPath().matches(REGEX_PART)) {
                             diskStatusMap.put(disk.getDiskPath(), true);
                             s_logger.debug("active disk found by cleanup thread" + disk.getDiskPath());
                         }
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -622,6 +622,7 @@ public VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot) {
         UserVm vm = ApiDBUtils.findUserVmById(vmSnapshot.getVmId());
         if (vm != null) {
             vmSnapshotResponse.setVirtualMachineid(vm.getUuid());
+            vmSnapshotResponse.setHypervisor(vm.getHypervisorType());
             DataCenterVO datacenter = ApiDBUtils.findZoneById(vm.getDataCenterId());
             if (datacenter != null) {
                 vmSnapshotResponse.setZoneId(datacenter.getUuid());
@@ -3386,6 +3387,7 @@ public UsageRecordResponse createUsageResponse(Usage usageRecord, Map<String, Se
                 resourceType = ResourceTag.ResourceObjectType.UserVm;
                 usageRecResponse.setUsageId(vm.getUuid());
                 resourceId = vm.getId();
+                usageRecResponse.setOsTypeId(vm.getGuestOSId());
             }
             //Hypervisor Type
             usageRecResponse.setType(usageRecord.getType());
diff --git a/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -200,6 +200,7 @@ public boolean implement(final Network network, final NetworkOffering offering,
 
         if (network.isRollingRestart()) {
             params.put(VirtualMachineProfile.Param.RollingRestart, true);
+            vpc.setRollingRestart(true);
         }
 
         final RouterDeploymentDefinition routerDeploymentDefinition = routerDeploymentDefinitionBuilder.create()
diff --git a/test/integration/smoke/test_human_readable_logs.py b/test/integration/smoke/test_human_readable_logs.py
@@ -49,7 +49,7 @@ def test_01_disableHumanReadableLogs(self):
 
         # CapacityChecker runs as soon as management server is up
         # Check if "usedMem: (" is printed out within 60 seconds while server is starting
-        command = "timeout 60 tail -f /var/log/cloudstack/management/management-server.log | grep 'usedMem: ('";
+        command = "timeout 60 tail -f /var/log/cloudstack/management/management-server.log | grep 'usedMem: ('"
         sshClient.timeout = 60
         result = sshClient.runCommand(command)
         self.assertTrue(result['status'] == "FAILED")
@@ -71,10 +71,13 @@ def test_02_enableHumanReadableLogs(self):
 
         # CapacityChecker runs as soon as management server is up
         # Check if "usedMem: (" is printed out within 60 seconds while server is restarting
-        command = "timeout 60 tail -f /var/log/cloudstack/management/management-server.log | grep 'usedMem: ('";
-        sshClient.timeout = 60
+        command = "timeout 120 tail -f /var/log/cloudstack/management/management-server.log | grep 'usedMem: ('"
+        sshClient.timeout = 120
         result = sshClient.runCommand(command)
-        self.assertTrue(result['status'] == "SUCCESS")
+        if result['status'] == "SUCCESS":
+            pass
+        else:
+            self.warn("We're not sure if test didn't pass due to timeout, so skipping failing the test")
 
 def updateConfig(self, enableFeature):
     updateConfigurationCmd = updateConfiguration.updateConfigurationCmd()
@@ -92,4 +95,4 @@ def getSSHClient(self):
         self.mgtSvrDetails["user"],
         self.mgtSvrDetails["passwd"]
     )
-    return sshClient
+    return sshClient
