Fix comparison of Long objects to use primitives by JSpon · Pull Request #9079 · apache/cloudstack · GitHub

Description

This PR...

fixes a bug that compares two Long objects, instead of their primitives. The comparison of two Long objects with the same underlying long value returned as not equal, throwing an error even though the public IP address was correctly assigned to the VPC associated with the guest network. This issue does not occur when comparing the primitives.

When this issue occurs, any cluster using a guest network in a particular VPC will always throw the error.

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

BLOCKER
Critical
Major
Minor
Trivial

Screenshots (if appropriate):

How Has This Been Tested?

In a test environment, any attempt to create a CKS cluster on a specific VPC always returned the error "Public IP with ID: ... linked to the Kubernetes cluster: ... is not usable". The public IP address was correctly attached, and debugging showed that they had the same long value. The code was compiled with this update and put in a jar earlier in the classpath, and the CKS cluster was created successfully.

How did you try to break this feature and the system with this change?

Congratulations on your first Pull Request and welcome to the Apache CloudStack community! If you have any issues or are unsure about any anything please check our Contribution Guide (https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md)
Here are some useful points:

In case of a new feature add useful documentation (raise doc PR at https://github.com/apache/cloudstack-documentation)
Be patient and persistent. It might take some time to get a review or get the final approval from the committers.
Pay attention to the quality of your code, ensure tests are passing and your PR doesn't have conflicts.
Please follow ASF Code of Conduct for all communication including (but not limited to) comments on Pull Requests, Issues, Mailing list and Slack.
Be sure to read the CloudStack Coding Conventions.
Apache CloudStack is a community-driven project and together we are making it better 🚀.
In case of doubts contact the developers at:
Mailing List: dev@cloudstack.apache.org (https://cloudstack.apache.org/mailing-lists.html)
Slack: https://apachecloudstack.slack.com/

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 4.01%. Comparing base (d1cf453) to head (a61b2bd).
⚠️ Report is 1073 commits behind head on main.

❗ There is a different number of reports uploaded between BASE (d1cf453) and HEAD (a61b2bd). Click for more details.
HEAD has 1 upload less than BASE

Flag BASE (d1cf453) HEAD (a61b2bd)

unittests 1 0

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #9079       +/-   ##
============================================
- Coverage     16.07%   4.01%   -12.07%     
============================================
  Files          5642     394     -5248     
  Lines        494087   32406   -461681     
  Branches      59931    5726    -54205     
============================================
- Hits          79425    1301    -78124     
+ Misses       405844   30957   -374887     
+ Partials       8818     148     -8670

Flag	Coverage Δ
uitests	4.01% <ø> (ø)
unittests	?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

clgtm

Is there something I should do to get this progressed? If there are any concerns, please let me know. Thanks.

@JSpon , well, you could find a 3rd party tester and a second reviewer. the rules are two reviews of which one did a test. I'll at least run some regression tests.

also see https://github.com/apache/cloudstack/actions/runs/9072065551/job/25241922319?pr=9079#step:7:5497
I think there are some errors in the github actions.

@blueorangutan package

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 9777

@blueorangutan test

@DaanHoogland a [SL] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[SF] Trillian test result (tid-10344)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 48222 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9079-t10344-kvm-centos7.zip
Smoke tests completed. 130 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_02_trigger_shutdown	Failure	351.99	test_safe_shutdown.py
test_hostha_enable_ha_when_host_disabled	Error	3.15	test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance	Error	303.18	test_hostha_kvm.py

…d/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java Co-authored-by: dahn <daan.hoogland@gmail.com>

@blueorangutan package

@rohityadavcloud a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 10943

…d/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java

@blueorangutan package

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10949

@blueorangutan test

… have the same primitive value

What cerconstances are those @JSpon ? as both network.getVpcId() and address.getVpcId() return an object of type Long, this should work with the Long.equals() method.

It seems that the issue was already fixed on 4.20.0+ with #8906, but it wasn't ported to 4.19.

@JSpon, could you target 4.19 and backport the code from main?

It seems that the issue was already fixed on 4.20.0+ with #8906, but it wasn't ported to 4.19.

@JSpon, could you target 4.19 and backport the code from main?

@winterhazel that to me doesn't look like the code that is in this PR. I still think 4.20+ needs this change. Unless I'm looking at it wrong.

I'm basically just looking at this file, since this is the file I changed and re-compiled and deployed and it worked for me. plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java

#8906 shows these changes which is different from above.

@CodeBleu network.getVpcId() == null || address.getVpcId() == null || network.getVpcId().longValue() != address.getVpcId().longValue() (the changes in this PR) and !Objects.equals(network.getVpcId(), address.getVpcId()) (the existing code in main and 4.20) will have the same result here.

See the code in the 4.19 branch, its comparing the Long objects instead, resulting in the issue that the comment mentions:

cloudstack/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java

Line 363 in 212f2a3

if (address == null || network.getVpcId() != address.getVpcId()) {

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@JSpon @DaanHoogland FYI - I was able to take this code change and build it into a .jar file and run it on the management server and was also able to successfully create the K8S cluster in the VPC

@JSpon @DaanHoogland FYI - I was able to take this code change and build it into a .jar file and run it on the management server and was also able to successfully create the K8S cluster in the VPC

I would say that sounds as a successful test ;)

There is a conflict @JSpon , could you resolve that.

Also de we feel this needs to go on another release branch than main? (i.e. 4.19 or 4.20?)

o a .jar file and run it on the management server and was also able to successfully create the K8S cluster in the VPC

I would say that sounds as a successful test ;)

There is a conflict @JSpon , could you resolve that.

Also de we feel this needs to go on another release branch than main? (i.e. 4.19 or 4.20?)

if the issue exists in 4.19 or 4.20, it would be better to rebase with 4.19/4.20

hi @JSpon please resolve the conflicts.

@JSpon can you address the conflicts on this please?

@DaanHoogland what is the status of this. I was looking into creating CKS cluster in a VPC again and noticed this is now in Draft. Isn't this what is needed to be able to deploy a CKS cluster in a VPC? What is the minimum version of Cloudstack this will be in?

CC: @harikrishna-patnala ( I see you changed the milestone on this, so maybe you have some insight into this as well? )

@JSpon can you address the conflicts on this please?

@DaanHoogland what is the status of this. I was looking into creating CKS cluster in a VPC again and noticed this is now in Draft. Isn't this what is needed to be able to deploy a CKS cluster in a VPC? What is the minimum version of Cloudstack this will be in?

Depending on the branch the conflict will be resolved against?! I suppose 4.22 is good. It needs work though (hence the draft status)

CC: @harikrishna-patnala ( I see you changed the milestone on this, so maybe you have some insight into this as well? )

@harikrishna-patnala changed the milestone to the minor version following the one that was just released, @CodeBleu . Just an administrative action on his part, no policy decision.

@JSpon Since this is for the 4.22.1 release, could you retarget the PR to the 4.22 branch?

@JSpon , it seems this never got the attention it needed. I am closing it. Can you re-evaluate and re-open if needed?
cc @shwstppr @CodeBleu @winterhazel @weizhouapache

Fix comparison of Long objects to use primitives

e41e1cb

boring-cyborg Bot added the component:kubernetes label May 14, 2024

DaanHoogland approved these changes May 22, 2024

View reviewed changes

DaanHoogland closed this Jun 4, 2024

DaanHoogland reopened this Jun 4, 2024

shwstppr reviewed Jun 5, 2024

View reviewed changes

Comment thread .../src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java Outdated

Prevent NPE

6da8548

winterhazel reviewed Jun 28, 2024

View reviewed changes

Comment thread .../src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java Outdated

Update plugins/integrations/kubernetes-service/src/main/java/com/clou…

1a2a39e

…d/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java Co-authored-by: dahn <daan.hoogland@gmail.com>

yadvr approved these changes Sep 4, 2024

View reviewed changes

yadvr added this to the 4.20.0.0 milestone Sep 4, 2024

weizhouapache reviewed Sep 4, 2024

View reviewed changes

Comment thread .../src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java Outdated

Update plugins/integrations/kubernetes-service/src/main/java/com/clou…

b854266

…d/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java

JoaoJandre added this to the 4.21.0.0 milestone Sep 10, 2024

Under certain circumstances, Long objects may differ even though they…

a61b2bd

… have the same primitive value

github-actions Bot removed the status:has-conflicts label Jan 6, 2025

DaanHoogland reviewed Jan 7, 2025

View reviewed changes

github-actions Bot added the status:has-conflicts label Feb 12, 2025

CodeBleu mentioned this pull request Feb 17, 2025

cks: k8s cluster on vpc tier #7479 is fixed but still same error #7950

Closed

sureshanaparti added this to Apache CloudStack 4.21.0 Jun 5, 2025

sureshanaparti moved this to In Progress in Apache CloudStack 4.21.0 Jun 5, 2025

sureshanaparti moved this from In Progress to Done in Apache CloudStack 4.21.0 Jul 14, 2025

weizhouapache modified the milestones: 4.21.0, 4.22.0 Aug 29, 2025

sureshanaparti removed this from Apache CloudStack 4.21.0 Aug 29, 2025

sureshanaparti added this to Apache CloudStack 4.22.0 Aug 29, 2025

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.0 Aug 29, 2025

DaanHoogland marked this pull request as draft October 10, 2025 08:40

harikrishna-patnala modified the milestones: 4.22.0, 4.22.1 Nov 12, 2025

harikrishna-patnala removed this from Apache CloudStack 4.22.0 Nov 12, 2025

rajujith added this to Apache CloudStack 4.22.1 Jan 5, 2026

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.1 Jan 7, 2026

DaanHoogland closed this Jan 27, 2026

Fix comparison of Long objects to use primitives by JSpon · Pull Request #9079 · apache/cloudstack · GitHub

Uh oh!

Fix comparison of Long objects to use primitives - #9079

Fix comparison of Long objects to use primitives#9079JSpon wants to merge 5 commits intoapache:mainapache/cloudstack:mainfrom JSpon:fix-long-object-compareJSpon/cloudstack:fix-long-object-compareCopy head branch name to clipboard

Conversation

JSpon commented May 14, 2024

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

boring-cyborg Bot commented May 14, 2024

Uh oh!

codecov Bot commented May 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

JSpon commented Jun 3, 2024

Uh oh!

DaanHoogland commented Jun 4, 2024

Uh oh!

DaanHoogland commented Jun 4, 2024

Uh oh!

blueorangutan commented Jun 4, 2024

Uh oh!

blueorangutan commented Jun 4, 2024

Uh oh!

DaanHoogland commented Jun 4, 2024

Uh oh!

blueorangutan commented Jun 4, 2024

Uh oh!

Uh oh!

blueorangutan commented Jun 5, 2024

Uh oh!

Uh oh!

yadvr commented Sep 4, 2024

Uh oh!

blueorangutan commented Sep 4, 2024

Uh oh!

blueorangutan commented Sep 4, 2024

Uh oh!

Uh oh!

weizhouapache commented Sep 4, 2024

Uh oh!

blueorangutan commented Sep 4, 2024

Uh oh!

blueorangutan commented Sep 4, 2024

Uh oh!

yadvr commented Sep 5, 2024

Uh oh!

DaanHoogland Jan 7, 2025

Choose a reason for hiding this comment

Uh oh!

winterhazel Feb 18, 2025

Choose a reason for hiding this comment

Uh oh!

CodeBleu Feb 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

winterhazel Feb 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Feb 12, 2025

Uh oh!

CodeBleu commented Feb 18, 2025

Uh oh!

DaanHoogland commented Feb 18, 2025

Uh oh!

weizhouapache commented Feb 18, 2025

Uh oh!

sureshanaparti commented Jun 5, 2025

Fix comparison of Long objects to use primitives#9079
JSpon wants to merge 5 commits into
apache:mainfrom
JSpon:fix-long-object-compare

codecov Bot commented May 21, 2024 •
edited
Loading

CodeBleu Feb 18, 2025 •
edited
Loading

winterhazel Feb 18, 2025 •
edited
Loading