Skip to content

CASSSIDECAR-417 falling back to host equality test in CdcManager.getInstanceId #329

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

Open
smiklosovic wants to merge 1 commit into
base: trunk
Choose a base branch
from
+14 −1
Open

CASSSIDECAR-417 falling back to host equality test in CdcManager.getInstanceId #329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion server/src/main/java/org/apache/cassandra/sidecar/cdc/CdcManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,23 @@ private Integer getInstanceId(String instanceIp)
for (InstanceMetadata instance : instanceFetcher.allLocalInstances())
{
String configuredIpAddress = instance.ipAddress();
String configuredHost = instance.host();

// Option 1a: Normalize both to InetAddress and compare
LOGGER.info("Matching instanceIp={} against instance id={} host={} ipAddress={}",
instanceIp, instance.id(), configuredHost, configuredIpAddress);

// Try IP-based comparison first
if (resolveToSameAddress(instanceIp, configuredIpAddress))
{
LOGGER.info("Matched instance id={} by IP address", instance.id());
return instance.id();
}

// Fallback: try comparing against the configured hostname
if (resolveToSameAddress(instanceIp, configuredHost))
{
LOGGER.info("Matched instance id={} by hostname={} (IP comparison failed for cachedIp={})",
instance.id(), configuredHost, configuredIpAddress);
return instance.id();
}
}
Expand Down