a
/
seaweedfs-operator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

probe volume, filer.

This commit is contained in:
Chris Lu 2020-10-18 22:56:12 -07:00
parent 1a443616b6
commit 80ba5abbae
3 changed files with 53 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
controllers/controller_filer_statefulset.go
View File

@ -6,6 +6,7 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
seaweedv1 "github.com/seaweedfs/seaweedfs-operator/api/v1" seaweedv1 "github.com/seaweedfs/seaweedfs-operator/api/v1"
) )
@ -92,43 +93,34 @@ func (r *SeaweedReconciler) createFilerStatefulSet(m *seaweedv1.Seaweed) *appsv1
Name: "swfs-s3", Name: "swfs-s3",
}, },
}, },
/* ReadinessProbe: &corev1.Probe{
ReadinessProbe: &corev1.Probe{ Handler: corev1.Handler{
Handler: corev1.Handler{ HTTPGet: &corev1.HTTPGetAction{
HTTPGet: &corev1.HTTPGetAction{ Path: "/",
Path: "/cluster/status", Port: intstr.FromInt(8888),
Port: intstr.IntOrString{ Scheme: corev1.URISchemeHTTP,
Type: 0,
IntVal: 9333,
},
Scheme: "http",
},
}, },
InitialDelaySeconds: 5,
TimeoutSeconds: 0,
PeriodSeconds: 15,
SuccessThreshold: 2,
FailureThreshold: 100,
}, },
LivenessProbe: &corev1.Probe{ InitialDelaySeconds: 10,
Handler: corev1.Handler{ TimeoutSeconds: 3,
HTTPGet: &corev1.HTTPGetAction{ PeriodSeconds: 15,
Path: "/cluster/status", SuccessThreshold: 1,
Port: intstr.IntOrString{ FailureThreshold: 100,
Type: 0, },
IntVal: 9333, LivenessProbe: &corev1.Probe{
}, Handler: corev1.Handler{
Scheme: "http", HTTPGet: &corev1.HTTPGetAction{
}, Path: "/",
Port: intstr.FromInt(8888),
Scheme: corev1.URISchemeHTTP,
}, },
InitialDelaySeconds: 20,
TimeoutSeconds: 0,
PeriodSeconds: 10,
SuccessThreshold: 1,
FailureThreshold: 6,
}, },
InitialDelaySeconds: 20,
*/ TimeoutSeconds: 3,
PeriodSeconds: 30,
SuccessThreshold: 1,
FailureThreshold: 6,
},
}}, }},
}, },
}, },

6
controllers/controller_master_statefulset.go
View File

@ -108,7 +108,7 @@ func (r *SeaweedReconciler) createMasterStatefulSet(m *seaweedv1.Seaweed) *appsv
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/cluster/status", Path: "/cluster/status",
Port: intstr.FromInt(9333), Port: intstr.FromInt(9333),
Scheme: "http", Scheme: corev1.URISchemeHTTP,
}, },
}, },
InitialDelaySeconds: 5, InitialDelaySeconds: 5,
@ -120,9 +120,9 @@ func (r *SeaweedReconciler) createMasterStatefulSet(m *seaweedv1.Seaweed) *appsv
LivenessProbe: &corev1.Probe{ LivenessProbe: &corev1.Probe{
Handler: corev1.Handler{ Handler: corev1.Handler{
HTTPGet: &corev1.HTTPGetAction{ HTTPGet: &corev1.HTTPGetAction{
Path: "/cluster/status", Path: "/cluster/status",
Port: intstr.FromInt(9333), Port: intstr.FromInt(9333),
Scheme: "http", Scheme: corev1.URISchemeHTTP,
}, },
}, },
InitialDelaySeconds: 15, InitialDelaySeconds: 15,

58
controllers/controller_volume_statefulset.go
View File

@ -6,6 +6,7 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
seaweedv1 "github.com/seaweedfs/seaweedfs-operator/api/v1" seaweedv1 "github.com/seaweedfs/seaweedfs-operator/api/v1"
) )
@ -88,43 +89,34 @@ func (r *SeaweedReconciler) createVolumeServerStatefulSet(m *seaweedv1.Seaweed)
ContainerPort: 18444, ContainerPort: 18444,
}, },
}, },
/* ReadinessProbe: &corev1.Probe{
ReadinessProbe: &corev1.Probe{ Handler: corev1.Handler{
Handler: corev1.Handler{ HTTPGet: &corev1.HTTPGetAction{
HTTPGet: &corev1.HTTPGetAction{ Path: "/status",
Path: "/cluster/status", Port: intstr.FromInt(8444),
Port: intstr.IntOrString{ Scheme: corev1.URISchemeHTTP,
Type: 0,
IntVal: 9333,
},
Scheme: "http",
},
}, },
InitialDelaySeconds: 5,
TimeoutSeconds: 0,
PeriodSeconds: 15,
SuccessThreshold: 2,
FailureThreshold: 100,
}, },
LivenessProbe: &corev1.Probe{ InitialDelaySeconds: 15,
Handler: corev1.Handler{ TimeoutSeconds: 5,
HTTPGet: &corev1.HTTPGetAction{ PeriodSeconds: 90,
Path: "/cluster/status", SuccessThreshold: 1,
Port: intstr.IntOrString{ FailureThreshold: 100,
Type: 0, },
IntVal: 9333, LivenessProbe: &corev1.Probe{
}, Handler: corev1.Handler{
Scheme: "http", HTTPGet: &corev1.HTTPGetAction{
}, Path: "/status",
Port: intstr.FromInt(8444),
Scheme: corev1.URISchemeHTTP,
}, },
InitialDelaySeconds: 20,
TimeoutSeconds: 0,
PeriodSeconds: 10,
SuccessThreshold: 1,
FailureThreshold: 6,
}, },
InitialDelaySeconds: 20,
*/ TimeoutSeconds: 5,
PeriodSeconds: 90,
SuccessThreshold: 1,
FailureThreshold: 6,
},
}}, }},
}, },
}, },