Skip to content

Fix comparison of Long objects to use primitives#9079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JSpon wants to merge 5 commits into from
Closed

Fix comparison of Long objects to use primitives #9079

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e41e1cb
Fix comparison of Long objects to use primitives
JSpon May 14, 2024
6da8548
Prevent NPE
JSpon Jun 10, 2024
1a2a39e
Update plugins/integrations/kubernetes-service/src/main/java/com/clou…
yadvr Sep 4, 2024
b854266
Update plugins/integrations/kubernetes-service/src/main/java/com/clou…
weizhouapache Sep 4, 2024
a61b2bd
Under certain circumstances, Long objects may differ even though they…
JSpon Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...c/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterActionWorker.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,7 +360,8 @@ protected IpAddress getVpcTierKubernetesPublicIp(Network network) {
return null;
}
IpAddress address = ipAddressDao.findByUuid(detailsVO.getValue());
if (address == null || !Objects.equals(network.getVpcId(), address.getVpcId())) {
// Under certain circumstances, Long objects may differ even though they have the same primitive value. Compare the primitive values
if (address == null || network.getVpcId() == null || address.getVpcId() == null || network.getVpcId().longValue() != address.getVpcId().longValue()) {
Comment on lines 363 to 364

@DaanHooglandDaanHooglandJan 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@winterhazelwinterhazelFeb 18, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

@CodeBleuCodeBleuFeb 18, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.
image

@winterhazelwinterhazelFeb 18, 2025•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CodeBleunetwork.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()) {

logger.warn(String.format("Public IP with ID: %s linked to the Kubernetes cluster: %s is not usable", detailsVO.getValue(), kubernetesCluster.getName()));
return null;
}
Expand Down