Restart postgresql before trying to create missing collation.

[arvados.git] / lib / install / deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 507815c9ddda13cae78070719527f3babf2650f4..eee41901162b9175f16801550cb076eaeda687c5 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -314,16 +314,9 @@ rm ${zip}
                                logger.Info("sent SIGTERM; waiting for postgres to shut down")
                                cmd.Wait()
                        }()
-                       for deadline := time.Now().Add(10 * time.Second); ; {
-                               output, err2 := exec.Command("pg_isready").CombinedOutput()
-                               if err2 == nil {
-                                       break
-                               } else if time.Now().After(deadline) {
-                                       err = fmt.Errorf("timed out waiting for pg_isready (%q)", output)
-                                       return 1
-                               } else {
-                                       time.Sleep(time.Second)
-                               }
+                       err = waitPostgreSQLReady()
+                       if err != nil {
+                               return 1
                        }
                }
 
@@ -348,6 +341,20 @@ rm ${zip}
                        if strings.Contains(string(out), "1") {
                                logger.Infof("postgresql supports collation %s", collname)
                        } else {
+                               // In order for CREATE COLLATION to
+                               // work, the locale must have existed
+                               // when PostgreSQL started up. In most
+                               // cases, either this is already true
+                               // because we just started postgresql
+                               // ourselves above, or systemd is here
+                               // and we can force a restart.
+                               if os.Getpid() != 1 {
+                                       if err = runBash(`sudo systemctl restart postgresql`, stdout, stderr); err != nil {
+                                               logger.Warn("`systemctl restart postgresql` failed; hoping postgresql does not need to be restarted")
+                                       } else if err = waitPostgreSQLReady(); err != nil {
+                                               return 1
+                                       }
+                               }
                                cmd = exec.Command("sudo", "-u", "postgres", "psql", "-c", "CREATE COLLATION \""+collname+"\" (LOCALE = \"en_US.UTF-8\")")
                                cmd.Stdout = stdout
                                cmd.Stderr = stderr
@@ -358,6 +365,7 @@ rm ${zip}
                                        return 1
                                }
                        }
+
                }
 
                withstuff := "WITH LOGIN SUPERUSER ENCRYPTED PASSWORD " + pq.QuoteLiteral(devtestDatabasePassword)
@@ -434,6 +442,19 @@ func identifyOS() (osversion, error) {
        return osv, nil
 }
 
+func waitPostgreSQLReady() error {
+       for deadline := time.Now().Add(10 * time.Second); ; {
+               output, err := exec.Command("pg_isready").CombinedOutput()
+               if err == nil {
+                       return nil
+               } else if time.Now().After(deadline) {
+                       return fmt.Errorf("timed out waiting for pg_isready (%q)", output)
+               } else {
+                       time.Sleep(time.Second)
+               }
+       }
+}
+
 func runBash(script string, stdout, stderr io.Writer) error {
        cmd := exec.Command("bash", "-")
        cmd.Stdin = bytes.NewBufferString("set -ex -o pipefail\n" + script)