From bbe56ae2838217cfdc68654177b985895cd1904a Mon Sep 17 00:00:00 2001 From: Vishesh Date: Tue, 27 Feb 2024 11:46:20 +0530 Subject: [PATCH 1/5] Update actions/setup-java from v3 to v4 (#8709) --- .github/workflows/build.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/codecov.yml | 2 +- .github/workflows/main-sonar-check.yml | 2 +- .github/workflows/rat.yml | 2 +- .github/workflows/sonar-check.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ae08f7ba84..c90c37c1c61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94ebf10d456..087e2575f73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -193,7 +193,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 778acf0ae61..fcbcf9b8bfc 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up JDK11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' diff --git a/.github/workflows/main-sonar-check.yml b/.github/workflows/main-sonar-check.yml index d036577b90b..a651daada73 100644 --- a/.github/workflows/main-sonar-check.yml +++ b/.github/workflows/main-sonar-check.yml @@ -33,7 +33,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' diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml index 81a9573eb70..70b29eecd31 100644 --- a/.github/workflows/rat.yml +++ b/.github/workflows/rat.yml @@ -29,7 +29,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' diff --git a/.github/workflows/sonar-check.yml b/.github/workflows/sonar-check.yml index 71ca75bb554..652c6b2173e 100644 --- a/.github/workflows/sonar-check.yml +++ b/.github/workflows/sonar-check.yml @@ -38,7 +38,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' From 4e34e6b334883fb468fd994af2bd17aa176c90cd Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 27 Feb 2024 07:24:05 +0100 Subject: [PATCH 2/5] console proxy client sleep more generic (#8694) * Make wait in the noVNC console proxy client more generic * Update services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java Co-authored-by: Wei Zhou --------- Co-authored-by: Wei Zhou --- .../cloud/consoleproxy/ConsoleProxyNoVncClient.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java index 27fabb53124..cfa62114c3d 100644 --- a/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java +++ b/services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java @@ -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) { From 56e0450526639513a68176fbc8ab87e738b3f8d8 Mon Sep 17 00:00:00 2001 From: dahn Date: Wed, 28 Feb 2024 10:59:35 +0100 Subject: [PATCH 3/5] Logging improvements on migration in the VmwareResource (#8300) --- .../hypervisor/vmware/resource/VmwareResource.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 22d0a796e14..b65a7847675 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -4766,7 +4766,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); @@ -4777,6 +4783,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) { @@ -4788,7 +4797,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); } } From 52d5b271617a5d220308f1948fbf2e9142c7e9b5 Mon Sep 17 00:00:00 2001 From: Vishesh Date: Wed, 28 Feb 2024 16:04:03 +0530 Subject: [PATCH 4/5] UI: Add button to show public IPs associated with vlanid (#8717) --- ui/src/config/section/infra/phynetworks.js | 5 +++++ ui/src/views/infra/network/IpRangesTabPublic.vue | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ui/src/config/section/infra/phynetworks.js b/ui/src/config/section/infra/phynetworks.js index 92d1e9abec8..578a12516fa 100644 --- a/ui/src/config/section/infra/phynetworks.js +++ b/ui/src/config/section/infra/phynetworks.js @@ -42,6 +42,11 @@ export default { name: 'guestnetwork', title: 'label.guest.networks', param: 'physicalnetworkid' + }, + { + name: 'publicip', + title: 'label.public.ip.addresses', + param: 'physicalnetworkid' }], actions: [ { diff --git a/ui/src/views/infra/network/IpRangesTabPublic.vue b/ui/src/views/infra/network/IpRangesTabPublic.vue index d7f743fda13..dc5589785ab 100644 --- a/ui/src/views/infra/network/IpRangesTabPublic.vue +++ b/ui/src/views/infra/network/IpRangesTabPublic.vue @@ -53,6 +53,12 @@
+ + + Date: Wed, 28 Feb 2024 19:00:56 +0530 Subject: [PATCH 5/5] UI: Fix error message in zone wizard (#8721) --- ui/public/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index e464d2ac1ed..d94ca7cce81 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -2845,7 +2845,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.",