X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7abc7ca38954acd4eaa53c9280504e06a76b8d71..c04ba156f832774ace933d4fc001cb18ad4164c3:/lib/boot/postgresql.go

diff --git a/lib/boot/postgresql.go b/lib/boot/postgresql.go
index 86328e110c..df98904151 100644
--- a/lib/boot/postgresql.go
+++ b/lib/boot/postgresql.go
@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"context"
 	"database/sql"
+	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -18,83 +19,86 @@ import (
 	"github.com/lib/pq"
 )
 
-func runPostgres(ctx context.Context, boot *Booter, ready chan<- bool) error {
-	buf := bytes.NewBuffer(nil)
-	err := boot.RunProgram(ctx, boot.tempdir, buf, nil, "pg_config", "--bindir")
+// Run a postgresql server in a private data directory. Set up a db
+// user, database, and TCP listener that match the supervisor's
+// configured database connection info.
+type runPostgreSQL struct{}
+
+func (runPostgreSQL) String() string {
+	return "postgresql"
+}
+
+func (runPostgreSQL) Run(ctx context.Context, fail func(error), super *Supervisor) error {
+	err := super.wait(ctx, createCertificates{})
 	if err != nil {
 		return err
 	}
-	datadir := filepath.Join(boot.tempdir, "pgdata")
 
-	err = os.Mkdir(datadir, 0755)
+	buf := bytes.NewBuffer(nil)
+	err = super.RunProgram(ctx, super.tempdir, buf, nil, "pg_config", "--bindir")
 	if err != nil {
 		return err
 	}
 	bindir := strings.TrimSpace(buf.String())
 
-	err = boot.RunProgram(ctx, boot.tempdir, nil, nil, filepath.Join(bindir, "initdb"), "-D", datadir)
+	datadir := filepath.Join(super.tempdir, "pgdata")
+	err = os.Mkdir(datadir, 0755)
 	if err != nil {
 		return err
 	}
-
-	err = boot.RunProgram(ctx, boot.tempdir, nil, nil, "cp", "server.crt", "server.key", datadir)
+	err = super.RunProgram(ctx, super.tempdir, nil, nil, filepath.Join(bindir, "initdb"), "-D", datadir)
 	if err != nil {
 		return err
 	}
 
-	port := boot.cluster.PostgreSQL.Connection["port"]
+	err = super.RunProgram(ctx, super.tempdir, nil, nil, "cp", "server.crt", "server.key", datadir)
+	if err != nil {
+		return err
+	}
 
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
+	port := super.cluster.PostgreSQL.Connection["port"]
 
+	super.waitShutdown.Add(1)
 	go func() {
-		for {
-			if ctx.Err() != nil {
-				return
-			}
-			if exec.CommandContext(ctx, "pg_isready", "--timeout=10", "--host="+boot.cluster.PostgreSQL.Connection["host"], "--port="+port).Run() == nil {
-				break
-			}
-			time.Sleep(time.Second / 2)
-		}
-		db, err := sql.Open("postgres", arvados.PostgreSQLConnection{
-			"host":   datadir,
-			"port":   port,
-			"dbname": "postgres",
-		}.String())
-		if err != nil {
-			boot.logger.WithError(err).Error("db open failed")
-			cancel()
-			return
-		}
-		defer db.Close()
-		conn, err := db.Conn(ctx)
-		if err != nil {
-			boot.logger.WithError(err).Error("db conn failed")
-			cancel()
-			return
-		}
-		defer conn.Close()
-		_, err = conn.ExecContext(ctx, `CREATE USER `+pq.QuoteIdentifier(boot.cluster.PostgreSQL.Connection["user"])+` WITH SUPERUSER ENCRYPTED PASSWORD `+pq.QuoteLiteral(boot.cluster.PostgreSQL.Connection["password"]))
-		if err != nil {
-			boot.logger.WithError(err).Error("createuser failed")
-			cancel()
-			return
-		}
-		_, err = conn.ExecContext(ctx, `CREATE DATABASE `+pq.QuoteIdentifier(boot.cluster.PostgreSQL.Connection["dbname"]))
-		if err != nil {
-			boot.logger.WithError(err).Error("createdb failed")
-			cancel()
-			return
-		}
-		close(ready)
-		return
+		defer super.waitShutdown.Done()
+		fail(super.RunProgram(ctx, super.tempdir, nil, nil, filepath.Join(bindir, "postgres"),
+			"-l",          // enable ssl
+			"-D", datadir, // data dir
+			"-k", datadir, // socket dir
+			"-p", super.cluster.PostgreSQL.Connection["port"],
+		))
 	}()
 
-	return boot.RunProgram(ctx, boot.tempdir, nil, nil, filepath.Join(bindir, "postgres"),
-		"-l",          // enable ssl
-		"-D", datadir, // data dir
-		"-k", datadir, // socket dir
-		"-p", boot.cluster.PostgreSQL.Connection["port"],
-	)
+	for {
+		if ctx.Err() != nil {
+			return ctx.Err()
+		}
+		if exec.CommandContext(ctx, "pg_isready", "--timeout=10", "--host="+super.cluster.PostgreSQL.Connection["host"], "--port="+port).Run() == nil {
+			break
+		}
+		time.Sleep(time.Second / 2)
+	}
+	db, err := sql.Open("postgres", arvados.PostgreSQLConnection{
+		"host":   datadir,
+		"port":   port,
+		"dbname": "postgres",
+	}.String())
+	if err != nil {
+		return fmt.Errorf("db open failed: %s", err)
+	}
+	defer db.Close()
+	conn, err := db.Conn(ctx)
+	if err != nil {
+		return fmt.Errorf("db conn failed: %s", err)
+	}
+	defer conn.Close()
+	_, err = conn.ExecContext(ctx, `CREATE USER `+pq.QuoteIdentifier(super.cluster.PostgreSQL.Connection["user"])+` WITH SUPERUSER ENCRYPTED PASSWORD `+pq.QuoteLiteral(super.cluster.PostgreSQL.Connection["password"]))
+	if err != nil {
+		return fmt.Errorf("createuser failed: %s", err)
+	}
+	_, err = conn.ExecContext(ctx, `CREATE DATABASE `+pq.QuoteIdentifier(super.cluster.PostgreSQL.Connection["dbname"]))
+	if err != nil {
+		return fmt.Errorf("createdb failed: %s", err)
+	}
+	return nil
 }