Skip to content

[k8sops] Remove liveness probes from DB #286

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

Merged
merged 1 commit into from
Apr 26, 2021
Merged

[k8sops] Remove liveness probes from DB #286

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
3 changes: 1 addition & 2 deletions pkg/k8sops/m3db/generators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ const (
_probeInitialDelaySeconds = 10
_probeFailureThreshold = 15

_probePathHealth = "/health"
_probePathReady = "/bootstrappedinplacementornoplacement"
_probePathReady = "/bootstrappedinplacementornoplacement"

_dataDirectory = "/var/lib/m3db/"
_dataVolumeName = "m3db-data"
Expand Down
14 changes: 0 additions & 14 deletions pkg/k8sops/m3db/generators_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,6 @@ func TestGenerateStatefulSet(t *testing.T) {

ssName := StatefulSetName(clusterName, 0)

health := &v1.Probe{
TimeoutSeconds: _probeTimeoutSeconds,
InitialDelaySeconds: _probeInitialDelaySeconds,
FailureThreshold: _probeFailureThreshold,
Handler: v1.Handler{
HTTPGet: &v1.HTTPGetAction{
Port: intstr.FromInt(PortM3DBHTTPNode),
Path: _probePathHealth,
Scheme: v1.URISchemeHTTP,
},
},
}

readiness := &v1.Probe{
TimeoutSeconds: _probeTimeoutSeconds,
InitialDelaySeconds: _probeInitialDelaySeconds,
Expand Down Expand Up @@ -172,7 +159,6 @@ func TestGenerateStatefulSet(t *testing.T) {
Containers: []v1.Container{
{
Name: ssName,
LivenessProbe: health,
ReadinessProbe: readiness,
SecurityContext: &v1.SecurityContext{
RunAsUser: pointer.Int64Ptr(20),
Expand Down
17 changes: 0 additions & 17 deletions pkg/k8sops/m3db/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,6 @@ func NewBaseStatefulSet(ssName, isolationGroup string, cluster *myspec.M3DBClust

objAnnotations := annotations.PodAnnotations(cluster)

// TODO(schallert): we're currently using the health of the coordinator for
// liveness probes until https://github.com/m3db/m3/issues/996 is fixed. Move
// to the dbnode's health endpoint once fixed.
probeHealth := &v1.Probe{
TimeoutSeconds: _probeTimeoutSeconds,
InitialDelaySeconds: _probeInitialDelaySeconds,
FailureThreshold: _probeFailureThreshold,
Handler: v1.Handler{
HTTPGet: &v1.HTTPGetAction{
Port: intstr.FromInt(PortM3DBHTTPNode),
Path: _probePathHealth,
Scheme: v1.URISchemeHTTP,
},
},
}

probeReady := &v1.Probe{
TimeoutSeconds: _probeTimeoutSeconds,
InitialDelaySeconds: _probeInitialDelaySeconds,
Expand Down Expand Up @@ -110,7 +94,6 @@ func NewBaseStatefulSet(ssName, isolationGroup string, cluster *myspec.M3DBClust
Name: ssName,
SecurityContext: specSecurityCtx,
ReadinessProbe: probeReady,
LivenessProbe: probeHealth,
Command: []string{
"m3dbnode",
},
Expand Down