Skip to content

FIx hostname generation issue preventing distributed operations #1833

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
wants to merge 1 commit into
base: 0.25.5
Choose a base branch
from
Open

FIx hostname generation issue preventing distributed operations #1833

Show file tree
Hide file tree
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
35 changes: 24 additions & 11 deletions pkg/model/chi/namer/name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,11 @@ func (n *Namer) createStatefulSetServiceName(host *api.Host) string {

// createPodHostname returns a hostname of a Pod of a ClickHouse instance.
// Is supposed to be used where network connection to a Pod is required.
// NB: right now Pod's hostname points to a Service, through which Pod can be accessed.
// For StatefulSet pods, this returns <pod-name>.<headless-service-name> to ensure DNS resolution works.
func (n *Namer) createPodHostname(host *api.Host) string {
// Do not use Pod own hostname - point to appropriate StatefulSet's Service
return n.createStatefulSetServiceName(host)
// For StatefulSet pods, we need <pod-name>.<headless-service-name> format
// to ensure proper DNS resolution within the cluster
return fmt.Sprintf("%s.%s", n.createPodName(host), n.createStatefulSetServiceName(host))
}

// createInstanceHostname returns hostname (pod-hostname + service or FQDN) which can be used as a replica name
Expand All @@ -201,23 +202,35 @@ func (n *Namer) createInstanceHostname(host *api.Host) string {
}

// createPodFQDN creates a fully qualified domain name of a pod
// ss-1eb454-2-0.my-dev-domain.svc.cluster.local
// chi-db-clickhouse-db-0-0-0.chi-db-clickhouse-db-0-0.my-dev-namespace.svc.cluster.local
func (n *Namer) createPodFQDN(host *api.Host) string {
// FQDN can be generated either from default pattern,
// or from personal pattern provided

// Start with default pattern
pattern := patternPodFQDN

// For StatefulSet pods, the correct DNS pattern is:
// <pod-name>.<headless-service-name>.<namespace>.svc.cluster.local
// This is different from the simple pattern used for other resources

if host.GetCR().GetSpec().GetNamespaceDomainPattern().HasValue() {
// NamespaceDomainPattern has been explicitly specified
pattern = "%s." + host.GetCR().GetSpec().GetNamespaceDomainPattern().Value()
// Use custom pattern: <pod-name>.<headless-service-name>.<custom-domain>
pattern := "%s.%s." + host.GetCR().GetSpec().GetNamespaceDomainPattern().Value()
return fmt.Sprintf(
pattern,
n.createPodName(host),
n.createStatefulSetServiceName(host),
)
}

// Create FQDN based on pattern available
// Use standard Kubernetes StatefulSet DNS pattern:
// <pod-name>.<headless-service-name>.<namespace>.svc.cluster.local
// This fixes the hostname mismatch issue in remote_servers.xml where
// StatefulSet pods have names like "chi-db-clickhouse-db-0-0-0" but
// the generated hostnames were missing the headless service component
return fmt.Sprintf(
pattern,
n.createPodHostname(host),
"%s.%s.%s.svc.cluster.local",
n.createPodName(host),
n.createStatefulSetServiceName(host),
host.GetRuntime().GetAddress().GetNamespace(),
)
}
Expand Down
33 changes: 21 additions & 12 deletions pkg/model/chk/namer/name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,13 @@ func (n *Namer) createStatefulSetServiceName(host *api.Host) string {
return n.macro.Scope(host).Line(pattern)
}

// createPodHostname returns a hostname of a Pod of a ClickHouse instance.
// createPodHostname returns a hostname of a Pod of a ClickHouse Keeper instance.
// Is supposed to be used where network connection to a Pod is required.
// NB: right now Pod's hostname points to a Service, through which Pod can be accessed.
// For StatefulSet pods, this returns <pod-name>.<headless-service-name> to ensure DNS resolution works.
func (n *Namer) createPodHostname(host *api.Host) string {
// Do not use Pod own hostname - point to appropriate StatefulSet's Service
return n.createStatefulSetServiceName(host)
// For StatefulSet pods, we need <pod-name>.<headless-service-name> format
// to ensure proper DNS resolution within the cluster
return fmt.Sprintf("%s.%s", n.createPodName(host), n.createStatefulSetServiceName(host))
}

// createInstanceHostname returns hostname (pod-hostname + service or FQDN) which can be used as a replica name
Expand All @@ -200,23 +201,31 @@ func (n *Namer) createInstanceHostname(host *api.Host) string {
}

// createPodFQDN creates a fully qualified domain name of a pod
// ss-1eb454-2-0.my-dev-domain.svc.cluster.local
// chk-keeper-cluster-0-0.chk-keeper-cluster-0.my-dev-namespace.svc.cluster.local
func (n *Namer) createPodFQDN(host *api.Host) string {
// FQDN can be generated either from default pattern,
// or from personal pattern provided

// Start with default pattern
pattern := patternPodFQDN

if host.GetCR().GetSpec().GetNamespaceDomainPattern().HasValue() {
// NamespaceDomainPattern has been explicitly specified
pattern = "%s." + host.GetCR().GetSpec().GetNamespaceDomainPattern().Value()
// Use custom pattern: <pod-name>.<headless-service-name>.<custom-domain>
pattern := "%s.%s." + host.GetCR().GetSpec().GetNamespaceDomainPattern().Value()
return fmt.Sprintf(
pattern,
n.createPodName(host),
n.createStatefulSetServiceName(host),
)
}

// Create FQDN based on pattern available
// Use standard Kubernetes StatefulSet DNS pattern:
// <pod-name>.<headless-service-name>.<namespace>.svc.cluster.local
// This fixes the hostname mismatch issue in remote_servers.xml where
// StatefulSet pods have names like "chk-keeper-cluster-0-0" but
// the generated hostnames were missing the headless service component
return fmt.Sprintf(
pattern,
n.createPodHostname(host),
"%s.%s.%s.svc.cluster.local",
n.createPodName(host),
n.createStatefulSetServiceName(host),
host.GetRuntime().GetAddress().GetNamespace(),
)
}
Expand Down
Loading