Merge branch 'mount-points' into 'master'

fix volume paths for socket mount points
- compare with mount point directory by a prefix
- add a new line to recovery configuration
- mount a socket directory even if the prefix does not match exactly

See merge request postgres-ai/database-lab!177

Author: agneum

pkg/retrieval/engine/postgres/logical/dump.go

@@ -361,8 +361,7 @@ func (d *DumpJob) buildHostConfig(ctx context.Context) (*container.HostConfig, e
 		NetworkMode: d.getContainerNetworkMode(),
 	}
 
-	if err := tools.AddVolumesToHostConfig(ctx, d.dockerClient, hostConfig,
-		d.globalCfg.MountDir, d.globalCfg.DataDir()); err != nil {
+	if err := tools.AddVolumesToHostConfig(ctx, d.dockerClient, hostConfig, d.globalCfg.DataDir()); err != nil {
 		return nil, err
 	}
 

pkg/retrieval/engine/postgres/logical/restore.go

@@ -215,8 +215,7 @@ func (r *RestoreJob) buildContainerConfig(password string) *container.Config {
 func (r *RestoreJob) buildHostConfig(ctx context.Context) (*container.HostConfig, error) {
 	hostConfig := &container.HostConfig{}
 
-	if err := tools.AddVolumesToHostConfig(ctx, r.dockerClient, hostConfig,
-		r.globalCfg.MountDir, r.globalCfg.DataDir()); err != nil {
+	if err := tools.AddVolumesToHostConfig(ctx, r.dockerClient, hostConfig, r.globalCfg.DataDir()); err != nil {
 		return nil, err
 	}
 

pkg/retrieval/engine/postgres/physical/custom.go

@@ -38,6 +38,7 @@ func (c *custom) GetRecoveryConfig() []byte {
 	buffer := bytes.Buffer{}
 
 	if c.options.RestoreCommand != "" {
+		buffer.WriteString("\n")
 		buffer.WriteString("standby_mode = 'on'\n")
 		buffer.WriteString(fmt.Sprintf("restore_command = '%s'\n", c.options.RestoreCommand))
 	}

pkg/retrieval/engine/postgres/physical/physical.go

@@ -392,8 +392,7 @@ func (r *RestoreJob) buildContainerConfig(password, label string) *container.Con
 func (r *RestoreJob) buildHostConfig(ctx context.Context) (*container.HostConfig, error) {
 	hostConfig := &container.HostConfig{}
 
-	if err := tools.AddVolumesToHostConfig(ctx, r.dockerClient, hostConfig,
-		r.globalCfg.MountDir, r.globalCfg.DataDir()); err != nil {
+	if err := tools.AddVolumesToHostConfig(ctx, r.dockerClient, hostConfig, r.globalCfg.DataDir()); err != nil {
 		return nil, err
 	}
 

pkg/retrieval/engine/postgres/physical/wal_g.go

@@ -39,6 +39,7 @@ func (w *walg) GetRestoreCommand() string {
 func (w *walg) GetRecoveryConfig() []byte {
 	buffer := bytes.Buffer{}
 
+	buffer.WriteString("\n")
 	buffer.WriteString("standby_mode = 'on'\n")
 	buffer.WriteString("restore_command = 'wal-g wal-fetch %f %p'\n")
 

pkg/retrieval/engine/postgres/snapshot/physical.go

@@ -518,8 +518,7 @@ func (p *PhysicalInitial) buildHostConfig(ctx context.Context, clonePath string)
 		Sysctls: p.options.Sysctls,
 	}
 
-	if err := tools.AddVolumesToHostConfig(ctx, p.dockerClient, hostConfig,
-		p.globalCfg.MountDir, clonePath); err != nil {
+	if err := tools.AddVolumesToHostConfig(ctx, p.dockerClient, hostConfig, clonePath); err != nil {
 		return nil, err
 	}
 

pkg/retrieval/engine/postgres/tools/tools.go

@@ -116,7 +116,7 @@ func StartingPostgresConfig(pgDataDir, pgVersion string) types.ExecConfig {
 
 // AddVolumesToHostConfig adds volumes to container host configuration depends on process environment.
 func AddVolumesToHostConfig(ctx context.Context, dockerClient *client.Client, hostConfig *container.HostConfig,
-	mountDir, dataDir string) error {
+	dataDir string) error {
 	hostInfo, err := host.Info()
 	if err != nil {
 		return errors.Wrap(err, "failed to get host info")
@@ -130,7 +130,7 @@ func AddVolumesToHostConfig(ctx context.Context, dockerClient *client.Client, ho
 			return err
 		}
 
-		hostConfig.Mounts = GetMountsFromMountPoints(mountDir, dataDir, inspection.Mounts)
+		hostConfig.Mounts = GetMountsFromMountPoints(dataDir, inspection.Mounts)
 
 		log.Dbg(hostConfig.Mounts)
 	} else {
@@ -145,12 +145,12 @@ func AddVolumesToHostConfig(ctx context.Context, dockerClient *client.Client, ho
 }
 
 // GetMountsFromMountPoints creates a list of mounts.
-func GetMountsFromMountPoints(mountDir, dataDir string, mountPoints []types.MountPoint) []mount.Mount {
+func GetMountsFromMountPoints(dataDir string, mountPoints []types.MountPoint) []mount.Mount {
 	mounts := make([]mount.Mount, 0, len(mountPoints))
 
 	for _, mountPoint := range mountPoints {
 		// Rewrite mounting to data directory.
-		if mountDir == mountPoint.Destination {
+		if strings.HasPrefix(dataDir, mountPoint.Destination) {
 			suffix := strings.TrimPrefix(dataDir, mountPoint.Destination)
 			mountPoint.Source = path.Join(mountPoint.Source, suffix)
 			mountPoint.Destination = dataDir

pkg/services/provision/docker/docker.go

@@ -79,15 +79,18 @@ func buildMountVolumes(r runners.Runner, c *resources.AppConfig, containerID str
 		return nil, errors.Wrap(err, "failed to interpret mount paths")
 	}
 
-	mounts := tools.GetMountsFromMountPoints(c.MountDir, c.DataDir(), mountPoints)
+	mounts := tools.GetMountsFromMountPoints(c.DataDir(), mountPoints)
 	volumes := make([]string, 0, len(mounts))
 
-	for _, mount := range mounts {
+	for _, mountPoint := range mountPoints {
 		// Add extra mount for socket directories.
-		if mount.Target == c.DataDir() && strings.HasPrefix(c.UnixSocketCloneDir, c.MountDir) {
-			volumes = append(volumes, buildSocketMount(c, mount.Source))
+		if strings.HasPrefix(c.UnixSocketCloneDir, mountPoint.Destination) {
+			volumes = append(volumes, buildSocketMount(c.UnixSocketCloneDir, mountPoint.Source, mountPoint.Destination))
+			break
 		}
+	}
 
+	for _, mount := range mounts {
 		volume := fmt.Sprintf("--volume %s:%s", mount.Source, mount.Target)
 
 		if mount.BindOptions != nil && mount.BindOptions.Propagation != "" {
@@ -101,13 +104,11 @@ func buildMountVolumes(r runners.Runner, c *resources.AppConfig, containerID str
 }
 
 // buildSocketMount builds a socket directory mounting rely on dataDir mounting.
-func buildSocketMount(c *resources.AppConfig, hostDataDir string) string {
-	socketPath := strings.TrimPrefix(c.UnixSocketCloneDir, c.MountDir)
-	dataPath := strings.TrimPrefix(c.DataDir(), c.MountDir)
-	externalMount := strings.TrimSuffix(hostDataDir, dataPath)
-	hostSocketDir := path.Join(externalMount, socketPath)
+func buildSocketMount(socketDir, hostDataDir, destinationDir string) string {
+	socketPath := strings.TrimPrefix(socketDir, destinationDir)
+	hostSocketDir := path.Join(hostDataDir, socketPath)
 
-	return fmt.Sprintf(" --volume %s:%s:rshared", hostSocketDir, c.UnixSocketCloneDir)
+	return fmt.Sprintf(" --volume %s:%s:rshared", hostSocketDir, socketDir)
 }
 
 func createSocketCloneDir(socketCloneDir string) error {