etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'apache/4.18' into 4.19

This commit is contained in:
Abhishek Kumar 2024-03-01 17:34:27 +05:30
parent 813d53d031 9bd359a039
commit 9fd410be36
11 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -33,7 +33,7 @@ jobs:
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'

2
.github/workflows/ci.yml vendored
View File

@ -210,7 +210,7 @@ jobs:
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'

2
.github/workflows/codecov.yml vendored
View File

@ -37,7 +37,7 @@ jobs:
fetch-depth: 0
- name: Set up JDK11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'

2
.github/workflows/main-sonar-check.yml vendored
View File

@ -37,7 +37,7 @@ jobs:
fetch-depth: 0
- name: Set up JDK11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'

2
.github/workflows/rat.yml vendored
View File

@ -32,7 +32,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'adopt'

2
.github/workflows/sonar-check.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
fetch-depth: 0
- name: Set up JDK11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'

12
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -4771,7 +4771,13 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
final String vmName = cmd.getVmName();
try {
VmwareHypervisorHost hyperHost = getHyperHost(getServiceContext());
if (hyperHost == null) {
throw new CloudRuntimeException("no hypervisor host found for migrate command");
}
ManagedObjectReference morDc = hyperHost.getHyperHostDatacenter();
if (morDc == null) {
throw new CloudRuntimeException("no Managed Object Reference for the Data Center found for migrate command");
}
// find VM through datacenter (VM is not at the target host yet)
VirtualMachineMO vmMo = hyperHost.findVmOnPeerHyperHost(vmName);
@ -4782,6 +4788,9 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
}
VmwareHypervisorHost destHyperHost = getTargetHyperHost(new DatacenterMO(hyperHost.getContext(), morDc), cmd.getDestinationIp());
if (destHyperHost == null) {
throw new CloudRuntimeException("no destination Hypervisor Host found for migrate command");
}
ManagedObjectReference morTargetPhysicalHost = destHyperHost.findMigrationTarget(vmMo);
if (morTargetPhysicalHost == null) {
@ -4793,7 +4802,8 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
}
return new MigrateAnswer(cmd, true, "migration succeeded", null);
} catch (Throwable e) {
} catch (Exception e) {
s_logger.info(String.format("migrate command for %s failed due to %s", vmName, e.getLocalizedMessage()));
return new MigrateAnswer(cmd, false, createLogMessageException(e, cmd), null);
}
}

10
services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
View File

@ -114,11 +114,6 @@ public class ConsoleProxyNoVncClient implements ConsoleProxyClient {
updateFrontEndActivityTime();
}
connectionAlive = session.isOpen();
try {
Thread.sleep(1);
} catch (InterruptedException e) {
s_logger.error("Error on sleep for vnc over websocket", e);
}
} else if (client.isVncOverNioSocket()) {
byte[] bytesArr;
int nextBytes = client.getNextBytes();
@ -139,6 +134,11 @@ public class ConsoleProxyNoVncClient implements ConsoleProxyClient {
connectionAlive = false;
}
}
try {
Thread.sleep(1);
} catch (InterruptedException e) {
s_logger.error("Error on sleep for vnc sessions", e);
}
}
s_logger.info(String.format("Connection with client [%s] is dead.", clientId));
} catch (IOException e) {

2
ui/public/locales/en.json
View File

@ -3056,7 +3056,7 @@
"message.remove.vpc": "Please confirm that you want to remove the VPC",
"message.request.failed": "Request failed.",
"message.required.add.least.ip": "Please add at least 1 IP Range",
"message.required.traffic.type": "All required traffic types should be added and with multiple physical networks each network should have a label.",
"message.required.traffic.type": "All required traffic types should be added and with multiple physical networks each traffic type should have a label.",
"message.required.tagged.physical.network": "There can only be one untagged physical network with guest traffic type.",
"message.reset.vpn.connection": "Please confirm that you want to reset VPN connection.",
"message.resize.volume.failed": "Failed to resize volume.",

5
ui/src/config/section/infra/phynetworks.js
View File

@ -42,6 +42,11 @@ export default {
name: 'guestnetwork',
title: 'label.guest.networks',
param: 'physicalnetworkid'
},
{
name: 'publicip',
title: 'label.public.ip.addresses',
param: 'physicalnetworkid'
}],
actions: [
{

6
ui/src/views/infra/network/IpRangesTabPublic.vue
View File

@ -54,6 +54,12 @@
<div
class="actions"
style="text-align: right" >
<router-link :to="{ name: 'publicip', query: { vlanid: record.id }}" target="_blank">
<tooltip-button
tooltipPlacement="bottom"
:tooltip="$t('label.view') + ' ' + $t('label.public.ip.addresses')"
icon="environment-outlined"/>
</router-link>
<tooltip-button
v-if="!record.domain && !basicGuestNetwork && record.gateway && !record.ip6gateway"
tooltipPlacement="bottom"