Skip to content

fix: correct default healthcheck probe logic and enable probes by default #20

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

fix: correct default healthcheck probe logic and enable probes by default #20

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
7 changes: 3 additions & 4 deletions apis/druid/v1alpha1/druid_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,10 @@ type DruidSpec struct {
// +kubebuilder:default:=true
RollingDeploy bool `json:"rollingDeploy"`

// DefaultProbes If set to true this will add default probes (liveness / readiness / startup) for all druid components
// but it won't override existing probes
// DefaultProbes defaults to true. When enabled, adds default probes (liveness / readiness / startup)
// for all druid components but won't override existing probes. Set to false to disable.
// +optional
// +kubebuilder:default:=true
DefaultProbes bool `json:"defaultProbes"`
DefaultProbes *bool `json:"defaultProbes,omitempty"`

// Zookeeper IGNORED (Future API): In order to make Druid dependency setup extensible from within Druid operator.
// +optional
Expand Down
32 changes: 23 additions & 9 deletions controllers/druid/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,33 +954,33 @@ func getAffinity(nodeSpec *v1alpha1.DruidNodeSpec, m *v1alpha1.Druid) *v1.Affini
}

func setLivenessProbe(nodeSpec *v1alpha1.DruidNodeSpec, m *v1alpha1.Druid) *v1.Probe {
probeType := "liveness"
probeType := probeTypeLiveness
livenessProbe := updateDefaultPortInProbe(
firstNonNilValue(nodeSpec.LivenessProbe, m.Spec.LivenessProbe).(*v1.Probe),
nodeSpec.DruidPort)
if livenessProbe == nil && m.Spec.DefaultProbes {
if livenessProbe == nil && (m.Spec.DefaultProbes == nil || *m.Spec.DefaultProbes) {
livenessProbe = setDefaultProbe(nodeSpec.DruidPort, nodeSpec.NodeType, probeType)
}
return livenessProbe
}

func setReadinessProbe(nodeSpec *v1alpha1.DruidNodeSpec, m *v1alpha1.Druid) *v1.Probe {
probeType := "readiness"
probeType := probeTypeReadiness
readinessProbe := updateDefaultPortInProbe(
firstNonNilValue(nodeSpec.ReadinessProbe, m.Spec.ReadinessProbe).(*v1.Probe),
nodeSpec.DruidPort)
if readinessProbe == nil && m.Spec.DefaultProbes {
if readinessProbe == nil && (m.Spec.DefaultProbes == nil || *m.Spec.DefaultProbes) {
readinessProbe = setDefaultProbe(nodeSpec.DruidPort, nodeSpec.NodeType, probeType)
}
return readinessProbe
}

func setStartUpProbe(nodeSpec *v1alpha1.DruidNodeSpec, m *v1alpha1.Druid) *v1.Probe {
probeType := "startup"
probeType := probeTypeStartup
startUpProbe := updateDefaultPortInProbe(
firstNonNilValue(nodeSpec.StartUpProbe, m.Spec.StartUpProbe).(*v1.Probe),
nodeSpec.DruidPort)
if startUpProbe == nil && m.Spec.DefaultProbes {
if startUpProbe == nil && (m.Spec.DefaultProbes == nil || *m.Spec.DefaultProbes) {
startUpProbe = setDefaultProbe(nodeSpec.DruidPort, nodeSpec.NodeType, probeType)
}
return startUpProbe
Expand Down Expand Up @@ -1166,20 +1166,34 @@ func setDefaultProbe(defaultPort int32, nodeType string, probeType string) *v1.P
FailureThreshold: 10,
}

if nodeType == historical && probeType != "liveness" {
// Liveness probes use the default /status/health for all node types.
if probeType == probeTypeLiveness {
return probe
}

if probeType == probeTypeReadiness && nodeType == historical {
probe.HTTPGet.Path = "/druid/historical/v1/readiness"
probe.FailureThreshold = 20
}
if nodeType == broker && probeType != "liveness" {

if probeType == probeTypeReadiness && nodeType == broker {
probe.HTTPGet.Path = "/druid/broker/v1/readiness"
probe.FailureThreshold = 20
}

if nodeType == historical && probeType == "startup" {
if probeType == probeTypeStartup && nodeType == historical {
probe.HTTPGet.Path = "/druid/historical/v1/readiness"
probe.InitialDelaySeconds = 180
probe.PeriodSeconds = 30
probe.TimeoutSeconds = 10
probe.FailureThreshold = 20
}

if probeType == probeTypeStartup && nodeType == broker {
probe.HTTPGet.Path = "/druid/broker/v1/readiness"
probe.FailureThreshold = 20
}

return probe
}

Expand Down
4 changes: 4 additions & 0 deletions controllers/druid/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@ const (
indexer = "indexer"
historical = "historical"
router = "router"

probeTypeLiveness = "liveness"
probeTypeReadiness = "readiness"
probeTypeStartup = "startup"
)
Loading