VladPolskiy/mariadb-operator
1
0
Fork 0
mirror of https://github.com/mariadb-operator/mariadb-operator.git synced 2025-07-22 13:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump podRecoveryTimeout to 5m

Browse Source
This commit is contained in:
mmontes11
2024-07-29 16:24:11 +02:00
committed by Martin Montes
parent b3f842b472
commit 3bcee41367
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1alpha1/mariadb_galera_types.go
View File

@ -239,7 +239,7 @@ func (g *GaleraRecovery) SetDefaults(mdb *MariaDB) {
g.ClusterBootstrapTimeout = ptr.To(metav1.Duration{Duration: 10 * time.Minute})
}
if g.PodRecoveryTimeout == nil {
g.PodRecoveryTimeout = ptr.To(metav1.Duration{Duration: 3 * time.Minute})
g.PodRecoveryTimeout = ptr.To(metav1.Duration{Duration: 5 * time.Minute})
}
if g.PodSyncTimeout == nil {
g.PodSyncTimeout = ptr.To(metav1.Duration{Duration: 5 * time.Minute})

4
api/v1alpha1/mariadb_galera_types_test.go
View File

@ -86,7 +86,7 @@ var _ = Describe("MariaDB Galera types", func() {
ClusterMonitorInterval: ptr.To(metav1.Duration{Duration: 10 * time.Second}),
ClusterHealthyTimeout: ptr.To(metav1.Duration{Duration: 30 * time.Second}),
ClusterBootstrapTimeout: ptr.To(metav1.Duration{Duration: 10 * time.Minute}),
PodRecoveryTimeout: ptr.To(metav1.Duration{Duration: 3 * time.Minute}),
PodRecoveryTimeout: ptr.To(metav1.Duration{Duration: 5 * time.Minute}),
PodSyncTimeout: ptr.To(metav1.Duration{Duration: 5 * time.Minute}),
},
},
@ -171,7 +171,7 @@ var _ = Describe("MariaDB Galera types", func() {
ClusterMonitorInterval: ptr.To(metav1.Duration{Duration: 10 * time.Second}),
ClusterHealthyTimeout: ptr.To(metav1.Duration{Duration: 30 * time.Second}),
ClusterBootstrapTimeout: ptr.To(metav1.Duration{Duration: 10 * time.Minute}),
PodRecoveryTimeout: ptr.To(metav1.Duration{Duration: 3 * time.Minute}),
PodRecoveryTimeout: ptr.To(metav1.Duration{Duration: 5 * time.Minute}),
PodSyncTimeout: ptr.To(metav1.Duration{Duration: 5 * time.Minute}),
},
},

4
docs/GALERA.md
View File

@ -94,8 +94,8 @@ spec:
clusterMonitorInterval: 10s
clusterHealthyTimeout: 30s
clusterBootstrapTimeout: 10m
podRecoveryTimeout: 3m
podSyncTimeout: 3m
podRecoveryTimeout: 5m
podSyncTimeout: 5m
```
The `minClusterSize` field indicates the minimum cluster size (either absolut number or percentage) for the operator to consider the cluster healthy. If the cluster is unhealthy for more than the period defined in `clusterHealthyTimeout`, a cluster recovery process is initiated by the operator. The process is explained in the [Galera documentation](https://galeracluster.com/library/documentation/crash-recovery.html) and consists of the following steps:

2
examples/manifests/mariadb_galera_full.yaml
View File

@ -69,7 +69,7 @@ spec:
clusterMonitorInterval: 10s
clusterHealthyTimeout: 30s
clusterBootstrapTimeout: 10m
podRecoveryTimeout: 3m
podRecoveryTimeout: 5m
podSyncTimeout: 5m
initContainer:
image: docker-registry3.mariadb.com/mariadb-operator/mariadb-operator:v0.0.29

4
pkg/controller/galera/recovery.go
View File

@ -248,7 +248,7 @@ func (r *GaleraReconciler) getGaleraState(ctx context.Context, mariadb *mariadbv
recovery := ptr.Deref(galera.Recovery, mariadbv1alpha1.GaleraRecovery{})
stateLogger := logger.WithValues("pod", pod.Name)
recoveryTimeout := ptr.Deref(recovery.PodRecoveryTimeout, metav1.Duration{Duration: 3 * time.Minute}).Duration
recoveryTimeout := ptr.Deref(recovery.PodRecoveryTimeout, metav1.Duration{Duration: 5 * time.Minute}).Duration
recoveryCtx, cancelRecovery := context.WithTimeout(ctx, recoveryTimeout)
defer cancelRecovery()
@ -323,7 +323,7 @@ func (r *GaleraReconciler) recoverGaleraState(ctx context.Context, mariadb *mari
}
}()
recoveryTimeout := ptr.Deref(recovery.PodRecoveryTimeout, metav1.Duration{Duration: 3 * time.Minute}).Duration
recoveryTimeout := ptr.Deref(recovery.PodRecoveryTimeout, metav1.Duration{Duration: 5 * time.Minute}).Duration
recoveryCtx, cancelRecovery := context.WithTimeout(ctx, recoveryTimeout)
defer cancelRecovery()