postgres setup enhancements (#1599)

- mount a memory based volumen for `/dev/shm`
- extend `terminationGracePeriodSeconds` to 70 seconds
- configure `pg_stat_statements.track = all` to track all types of queries when enabled.

Signed-off-by: Danny Zaken <dannyzaken@gmail.com>

Author: dannyzaken

deploy/internal/configmap-postgres-db.yaml

@@ -24,3 +24,4 @@ data:
     min_wal_size = 2GB
     max_wal_size = 8GB
     shared_preload_libraries = 'pg_stat_statements'
+    pg_stat_statements.track = all

deploy/internal/statefulset-postgres-db.yaml

@@ -58,10 +58,15 @@ spec:
               mountPath: /var/lib/pgsql
             - name: noobaa-postgres-config-volume
               mountPath: /opt/app-root/src/postgresql-cfg
+            - name: shm
+              mountPath: /dev/shm
       volumes:
         - name: noobaa-postgres-config-volume
           configMap:
             name: noobaa-postgres-config
+        - name: shm
+          emptyDir:
+            medium: Memory
       securityContext:
         runAsUser: 10001
         runAsGroup: 0

pkg/bundle/deploy.go

@@ -3834,7 +3834,7 @@ metadata:
 data: {}
 `
 
-const Sha256_deploy_internal_configmap_postgres_db_yaml = "afe8a865abf2b033229df9dcea392abc1cb27df965d5ff0181f6d931504dce4e"
+const Sha256_deploy_internal_configmap_postgres_db_yaml = "9e522258577e9b24d289e005e74c8125cffcd56652533fe30ee109c7fb4b95e0"
 
 const File_deploy_internal_configmap_postgres_db_yaml = `apiVersion: v1
 kind: ConfigMap
@@ -3862,6 +3862,7 @@ data:
     min_wal_size = 2GB
     max_wal_size = 8GB
     shared_preload_libraries = 'pg_stat_statements'
+    pg_stat_statements.track = all
 `
 
 const Sha256_deploy_internal_deployment_endpoint_yaml = "21b206c9119e37c4ebba84d5c1e2b1d45b06c716b4def69db9ba9268ef75e1e1"
@@ -5114,7 +5115,7 @@ spec:
                   resource: limits.memory
 `
 
-const Sha256_deploy_internal_statefulset_postgres_db_yaml = "37a6c36928ba426ca04fd89e1eb2685e10d1a5f65c63ebb40c68a4f5c37645de"
+const Sha256_deploy_internal_statefulset_postgres_db_yaml = "d0242805c8719ef45290746b42706fb69805cfd40be6258986454d256112fa7c"
 
 const File_deploy_internal_statefulset_postgres_db_yaml = `apiVersion: apps/v1
 kind: StatefulSet
@@ -5176,10 +5177,15 @@ spec:
               mountPath: /var/lib/pgsql
             - name: noobaa-postgres-config-volume
               mountPath: /opt/app-root/src/postgresql-cfg
+            - name: shm
+              mountPath: /dev/shm
       volumes:
         - name: noobaa-postgres-config-volume
           configMap:
             name: noobaa-postgres-config
+        - name: shm
+          emptyDir:
+            medium: Memory
       securityContext:
         runAsUser: 10001
         runAsGroup: 0

pkg/system/phase2_creating.go

@@ -145,13 +145,13 @@ func (r *Reconciler) ReconcilePhaseCreatingForMainClusters() error {
 
 	// create notification log pvc if bucket notifications is enabled and pvc was not set explicitly
 	if r.NooBaa.Spec.BucketNotifications.Enabled {
-			if err := r.ReconcileODFPersistentLoggingPVC(
-				"bucketNotifications.pvc",
-				"InvalidBucketNotificationConfiguration",
-				"Bucket notifications requires a Persistent Volume Claim (PVC) with ReadWriteMany (RWX) access mode. Please specify the 'bucketNotifications.pvc'.",
-				r.NooBaa.Spec.BucketNotifications.PVC,
-				r.BucketNotificationsPVC); err != nil {
-				return err
+		if err := r.ReconcileODFPersistentLoggingPVC(
+			"bucketNotifications.pvc",
+			"InvalidBucketNotificationConfiguration",
+			"Bucket notifications requires a Persistent Volume Claim (PVC) with ReadWriteMany (RWX) access mode. Please specify the 'bucketNotifications.pvc'.",
+			r.NooBaa.Spec.BucketNotifications.PVC,
+			r.BucketNotificationsPVC); err != nil {
+			return err
 		}
 	}
 
@@ -287,10 +287,15 @@ func (r *Reconciler) SetDesiredNooBaaDB() error {
 					},
 				},
 			}
-
 		}
 	}
 
+	// set terminationGracePeriodSeconds to 70 seconds to allow for graceful shutdown
+	// we set 70 to account for the 60 seconds timeout of the fast shutdow in preStop,  plus some slack
+	// see here: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#hook-handler-execution
+	gracePeriod := int64(70)
+	podSpec.TerminationGracePeriodSeconds = &gracePeriod
+
 	if r.NooBaa.Spec.ImagePullSecret == nil {
 		podSpec.ImagePullSecrets =
 			[]corev1.LocalObjectReference{}
@@ -472,10 +477,10 @@ func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) {
 
 	if r.NooBaa.Spec.BucketNotifications.Enabled {
 		envVar := corev1.EnvVar{
-			Name: "NOTIFICATION_LOG_DIR",
+			Name:  "NOTIFICATION_LOG_DIR",
 			Value: "/var/logs/notifications",
 		}
-		util.MergeEnvArrays(&c.Env, &[]corev1.EnvVar{envVar});
+		util.MergeEnvArrays(&c.Env, &[]corev1.EnvVar{envVar})
 	}
 
 }
@@ -555,10 +560,10 @@ func (r *Reconciler) SetDesiredCoreApp() error {
 				}}
 				util.MergeVolumeMountList(&c.VolumeMounts, &notificationVolumeMounts)
 
-				notificationVolumes := []corev1.Volume {{
+				notificationVolumes := []corev1.Volume{{
 					Name: notificationsVolume,
-					VolumeSource: corev1.VolumeSource {
-						PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource {
+					VolumeSource: corev1.VolumeSource{
+						PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
 							ClaimName: r.BucketNotificationsPVC.Name,
 						},
 					},
@@ -1230,8 +1235,8 @@ func (r *Reconciler) ReconcileDBConfigMap(cm *corev1.ConfigMap, desiredFunc func
 	return r.isObjectUpdated(result), nil
 }
 
-//ReconcileODFPersistentLoggingPVC ensures a persistent logging pvc (either for bucket logging or bucket notificatoins)
-//is properly configured. If needed and possible, allocate one from CephFS
+// ReconcileODFPersistentLoggingPVC ensures a persistent logging pvc (either for bucket logging or bucket notificatoins)
+// is properly configured. If needed and possible, allocate one from CephFS
 func (r *Reconciler) ReconcileODFPersistentLoggingPVC(
 	fieldName string,
 	errorName string,
@@ -1243,7 +1248,7 @@ func (r *Reconciler) ReconcileODFPersistentLoggingPVC(
 
 	// Return if persistent logging PVC already exists
 	if pvcName != nil {
-		pvc.Name = *pvcName;
+		pvc.Name = *pvcName
 		log.Infof("PersistentLoggingPVC %s already exists and supports RWX access mode. Skipping ReconcileODFPersistentLoggingPVC.", *pvcName)
 		return nil
 	}
@@ -1257,7 +1262,7 @@ func (r *Reconciler) ReconcileODFPersistentLoggingPVC(
 	if !r.preparePersistentLoggingPVC(pvc, fieldName) {
 		return util.NewPersistentError(errorName, errorText)
 	}
-	r.Own(pvc);
+	r.Own(pvc)
 
 	log.Infof("Persistent logging PVC %s does not exist. Creating...", pvc.Name)
 	err := r.Client.Create(r.Ctx, pvc)
@@ -1269,7 +1274,7 @@ func (r *Reconciler) ReconcileODFPersistentLoggingPVC(
 
 }
 
-//prepare persistent logging pvc
+// prepare persistent logging pvc
 func (r *Reconciler) preparePersistentLoggingPVC(pvc *corev1.PersistentVolumeClaim, fieldName string) bool {
 	pvc.Spec.AccessModes = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteMany}
 
@@ -1282,9 +1287,9 @@ func (r *Reconciler) preparePersistentLoggingPVC(pvc *corev1.PersistentVolumeCla
 	if util.KubeCheck(sc) {
 		r.Logger.Infof("%s not provided, defaulting to 'cephfs' storage class %s to create persistent logging pvc", fieldName, sc.Name)
 		pvc.Spec.StorageClassName = &sc.Name
-		return true;
+		return true
 	} else {
-		return false;
+		return false
 	}
 }