hold pgbackrest

Author: benjaminjb

internal/collector/instance.go

@@ -13,6 +13,7 @@ import (
 	"github.com/crunchydata/postgres-operator/internal/feature"
 	"github.com/crunchydata/postgres-operator/internal/initialize"
 	"github.com/crunchydata/postgres-operator/internal/naming"
+	"github.com/crunchydata/postgres-operator/internal/shell"
 	"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
 )
 
@@ -40,7 +41,8 @@ func AddToPod(
 	inInstanceConfigMap *corev1.ConfigMap,
 	outPod *corev1.PodSpec,
 	volumeMounts []corev1.VolumeMount,
-	sqlQueryPassword string,
+	sqlQueryPassword,
+	dir string,
 	includeLogrotate bool,
 ) {
 	if !(feature.Enabled(ctx, feature.OpenTelemetryLogs) || feature.Enabled(ctx, feature.OpenTelemetryMetrics)) {
@@ -81,7 +83,7 @@ func AddToPod(
 		Name:            naming.ContainerCollector,
 		Image:           config.CollectorContainerImage(spec),
 		ImagePullPolicy: pullPolicy,
-		Command:         startCommand(includeLogrotate),
+		Command:         startCommand(dir, includeLogrotate),
 		Env: []corev1.EnvVar{
 			{
 				Name: "K8S_POD_NAMESPACE",
@@ -143,7 +145,12 @@ func AddToPod(
 }
 
 // startCommand generates the command script used by the collector container
-func startCommand(includeLogrotate bool) []string {
+func startCommand(dir string, includeLogrotate bool) []string {
+	var mkdirScript string
+	if dir != "" {
+		mkdirScript = `
+` + shell.MakeDirectories(0o775, dir, dir+"/receiver")
+	}
 	var startScript = `
 /otelcol-contrib --config /etc/otel-collector/config.yaml
 `
@@ -159,7 +166,7 @@ done
 `
 	}
 
-	wrapper := `monitor() {` + startScript + `}; export -f monitor; exec -a "$0" bash -ceu monitor`
+	wrapper := `monitor() {` + mkdirScript + startScript + `}; export -f monitor; exec -a "$0" bash -ceu monitor`
 
 	return []string{"bash", "-ceu", "--", wrapper, "collector"}
 }

internal/collector/pgbackrest.go

@@ -47,10 +47,9 @@ func NewConfigForPgBackrestRepoHostPod(
 
 		// Keep track of what log records and files have been processed.
 		// Use a subdirectory of the logs directory to stay within the same failure domain.
-		// TODO(log-rotation): Create this directory during Collector startup.
 		config.Extensions["file_storage/pgbackrest_logs"] = map[string]any{
 			"directory":        directory + "/receiver",
-			"create_directory": true,
+			"create_directory": false,
 			"fsync":            true,
 		}
 

internal/collector/postgres.go

@@ -23,10 +23,13 @@ func NewConfigForPostgresPod(ctx context.Context,
 ) *Config {
 	config := NewConfig(inCluster.Spec.Instrumentation)
 
+	// Metrics
 	EnablePostgresMetrics(ctx, inCluster, config)
 	EnablePatroniMetrics(ctx, inCluster, config)
-	EnablePatroniLogging(ctx, inCluster, config)
+
+	// Logging
 	EnablePostgresLogging(ctx, inCluster, config, outParameters)
+	EnablePatroniLogging(ctx, inCluster, config)
 
 	return config
 }

internal/controller/postgrescluster/instance.go

@@ -1205,8 +1205,9 @@ func (r *Reconciler) reconcileInstance(
 
 		// TODO: Setting the includeLogrotate argument to false for now. This
 		// should be changed when we implement log rotation for postgres
+		// TODO: add dir
 		collector.AddToPod(ctx, cluster.Spec.Instrumentation, cluster.Spec.ImagePullPolicy, instanceConfigMap, &instance.Spec.Template.Spec,
-			[]corev1.VolumeMount{postgres.DataVolumeMount()}, "", false)
+			[]corev1.VolumeMount{postgres.DataVolumeMount()}, "", "", false)
 	}
 
 	if err == nil &&
@@ -1217,8 +1218,11 @@ func (r *Reconciler) reconcileInstance(
 			r.Client.Get(ctx, client.ObjectKeyFromObject(monitoringUserSecret), monitoringUserSecret))
 
 		if err == nil {
+			// TODO: Setting the includeLogrotate argument to false for now. This
+			// should be changed when we implement log rotation for postgres
+			// TODO: add dir
 			collector.AddToPod(ctx, cluster.Spec.Instrumentation, cluster.Spec.ImagePullPolicy, instanceConfigMap, &instance.Spec.Template.Spec,
-				[]corev1.VolumeMount{postgres.DataVolumeMount()}, string(monitoringUserSecret.Data["password"]), false)
+				[]corev1.VolumeMount{postgres.DataVolumeMount()}, string(monitoringUserSecret.Data["password"]), "", false)
 		}
 	}
 

internal/controller/postgrescluster/pgbackrest.go

@@ -688,18 +688,16 @@ func (r *Reconciler) generateRepoHostIntent(ctx context.Context, postgresCluster
 
 	if pgbackrest.RepoHostVolumeDefined(postgresCluster) {
 		// add the init container to make the pgBackRest repo volume log directory
-		pgbackrest.MakePGBackrestLogDir(&repo.Spec.Template, postgresCluster)
+		pgBackRestLogPath := pgbackrest.MakePGBackrestLogDir(&repo.Spec.Template, postgresCluster)
 
 		containersToAdd := []string{naming.PGBackRestRepoContainerName}
 
 		// If OpenTelemetryLogs is enabled, we want to add the collector to the pod
 		// and also add the RepoVolumes to the container.
 		if feature.Enabled(ctx, feature.OpenTelemetryLogs) {
-			// TODO: Setting the includeLogrotate argument to false for now. This
-			// should be changed when we implement log rotation for pgbackrest
 			collector.AddToPod(ctx, postgresCluster.Spec.Instrumentation, postgresCluster.Spec.ImagePullPolicy,
 				&corev1.ConfigMap{ObjectMeta: naming.PGBackRestConfig(postgresCluster)},
-				&repo.Spec.Template.Spec, []corev1.VolumeMount{}, "", false)
+				&repo.Spec.Template.Spec, []corev1.VolumeMount{}, "", pgBackRestLogPath, true)
 
 			containersToAdd = append(containersToAdd, naming.ContainerCollector)
 		}

internal/controller/standalone_pgadmin/statefulset.go

@@ -132,7 +132,7 @@ func statefulset(
 		}
 
 		collector.AddToPod(ctx, pgadmin.Spec.Instrumentation, pgadmin.Spec.ImagePullPolicy,
-			configmap, &sts.Spec.Template.Spec, volumeMounts, "", false)
+			configmap, &sts.Spec.Template.Spec, volumeMounts, "", "", false)
 	}
 
 	return sts

internal/pgbackrest/config.go

@@ -160,7 +160,7 @@ func CreatePGBackRestConfigMapIntent(ctx context.Context, postgresCluster *v1bet
 // MakePGBackrestLogDir creates the pgBackRest default log path directory used when a
 // dedicated repo host is configured.
 func MakePGBackrestLogDir(template *corev1.PodTemplateSpec,
-	cluster *v1beta1.PostgresCluster) {
+	cluster *v1beta1.PostgresCluster) string {
 
 	var pgBackRestLogPath string
 	for _, repo := range cluster.Spec.Backups.PGBackRest.Repos {
@@ -188,6 +188,8 @@ func MakePGBackrestLogDir(template *corev1.PodTemplateSpec,
 		}
 	}
 	template.Spec.InitContainers = append(template.Spec.InitContainers, container)
+
+	return pgBackRestLogPath
 }
 
 // RestoreCommand returns the command for performing a pgBackRest restore.  In addition to calling

internal/pgbouncer/reconcile.go

@@ -192,7 +192,7 @@ func Pod(
 
 	if feature.Enabled(ctx, feature.OpenTelemetryLogs) || feature.Enabled(ctx, feature.OpenTelemetryMetrics) {
 		collector.AddToPod(ctx, inCluster.Spec.Instrumentation, inCluster.Spec.ImagePullPolicy, inConfigMap,
-			outPod, []corev1.VolumeMount{configVolumeMount}, string(inSecret.Data["pgbouncer-password"]),
+			outPod, []corev1.VolumeMount{configVolumeMount}, string(inSecret.Data["pgbouncer-password"]), "",
 			true)
 	}
 }