Merge pull request #641 from google/postgres_upgrade

* Upgrades PostGRES and PostGIS bundled utilities and libraries to newer versions.

earth_enterprise/SConstruct

@@ -87,6 +87,7 @@ installdirs = {
    'server_lib':        inst_server_dir('lib'),
    'server_root':       Dir('server/', installdir),
    'server_share':      inst_server_dir('share'),
+   'server_sql':        inst_server_dir('share/opengee-server/sql'),
 
    'httpd':             inst_server_dir('gehttpd'),
    'httpdmodules':      inst_server_dir('gehttpd/modules'),
@@ -100,9 +101,6 @@ installdirs = {
    'maps':              inst_server_dir('gehttpd/htdocs/maps'),
    'httpddocs':         inst_server_dir('gehttpd/htdocs/shared_assets/docs'),
 
-
-   'getomcat_webapps':           inst_server_dir('getomcat/webapps'),
-   'getomcat_lib':           inst_server_dir('getomcat/lib'),
    'search_plugins':    inst_server_dir('search/plugins'),
    'search_tabs':       inst_server_dir('search/tabs'),
    'search_api':        inst_server_dir('search/api'),

earth_enterprise/Upgrade.md

@@ -0,0 +1,20 @@
+# Upgrading Earth Enterprise Fusion and Server to version 5.2.1
+
+Upgrading to GEE 5.2.1 is supported from Earth Enterprise 5.2.0 version using the following steps:
+
+1. Do NOT uninstall GEE 5.2.0. We recommend that you upgrade GEE 5.2.0 by simply installing GEE 5.2.1. Installing GEE 5.2.1 on top of GEE 5.2.0 will ensure that your PostgreSQL databases are backed up and upgraded correctly to the new PostgreSQL version used by GEE 5.2.1. [Install Fusion or Earth Server](https://github.com/google/earthenterprise/wiki/Install-Fusion-or-Earth-Server). This can be achieved by running the scripts to install fusion and earth server:
+
+```bash
+cd earth_enterprise/src/installer
+sudo ./install_fusion.sh 
+sudo ./install_server.sh
+```
+
+Alternatively, instead of using scripts, on Redhat and Centos, you can upgrade GEE 5.2.0 to GEE 5.2.1 using [RPM packages](https://github.com/google/earthenterprise/blob/master/earth_enterprise/BUILD_RPMS.md)
+
+1. If you decide that you want to uninstall GEE 5.2.0 before installing GEE 5.2.1, first make sure to backup your PostgreSQL databases. Please keep in mind that the database backup, made by 5.2.0, would not be compatible with GEE 5.2.1 PostgreSQL databases.
+
+    * Create a backup folder: `mkdir -p /tmp/MyBackupFolder`
+    * Make gepguser owner of the created folder: `chown gepguser /tmp/MyBackupFolder`
+    * Dump PostGreSQL databases using '/opt/google/bin/geresetpgdb' script. This script needs to be run under user 'gepguser'. 
+    This can be achieved by switching to user 'gepguser' then executing: `/opt/google/bin/geresetpgdb backup /tmp/MyBackupFolder`

earth_enterprise/geplaces/geplaces

@@ -32,10 +32,8 @@ then
     exit 0
   fi
   $BINDIR/createdb -U geuser --owner=geuser geplaces
-  $BINDIR/createlang -U geuser plpgsql geplaces
-  $BINDIR/psql -q -U geuser -d geplaces -f $SQLDIR/postgis.sql 2>/dev/null >/dev/null
-#  $BINDIR/psql -q -U geuser -d geplaces -f $SQLDIR/postgis_upgrade.sql 2>/dev/null >/dev/null
-  $BINDIR/psql -q -U geuser -d geplaces -f $SQLDIR/spatial_ref_sys.sql 2>/dev/null >/dev/null
+  $BINDIR/psql -U geuser -d geplaces -c "CREATE EXTENSION postgis"
+
   zcat $SHAREDIR/geplaces/geplaces_db.gz | $BINDIR/psql -q -U geuser -d geplaces 2>/dev/null >/dev/null
 
   # Create new cities view

earth_enterprise/rpms/build.gradle

@@ -91,6 +91,8 @@ def stagedInstallDir_server_geplaces =
     new File(stagedInstallDir, 'geplaces/opt/google/share/geplaces')
 def stagedInstallDir_server_user_magic =
     new File(stagedInstallDir, 'server/user_magic')
+def stagedInstallDir_server_version =
+    new File(stagedInstallDir, 'server/opt/google/gehttpd/htdocs/earth/gee_long_version.txt')
 def stagedInstallDir_fusion = new File(stagedInstallDir, 'fusion')
 def packageInstallRootDir = new File('/')
 
@@ -139,7 +141,7 @@ task stageOpenGeeInstall(type: Exec, dependsOn: 'compileOpenGee') {
 task openGeePostGisRpm(type: GeeRpm) {
     packageName = 'opengee-postgis'
     release = "1.${rpmPlatformString}"
-    version = '1.5.8'
+    version = '2.3.4'
     user = 'root'
     permissionGroup = 'root'
     packageGroup = 'Application/Productivity'
@@ -269,6 +271,8 @@ task openGeeCommonRpm(type: GeeRpm, dependsOn: openGeeSharedFiles) {
     requires('chkconfig')
     requires('shadow-utils')
     requires('sudo')
+    conflicts('opengee-postgis', '2.0', LESS )
+    conflicts('opengee-postgis', '2.4', GREATER | EQUAL)
 
     requiresCommands(packageSharedCommands +
         ['cat', 'cut', 'getent', 'grep' ])
@@ -341,8 +345,9 @@ task openGeeServerRpm (type: GeeRpm, dependsOn: openGeeSharedFiles) {
     autoFindProvides = true
     autoFindRequires = true
 
-    requires('opengee-postgis', '1.5.8', GREATER | EQUAL)
-    conflicts('opengee-postgis', '2.0', GREATER | EQUAL)
+    requires('opengee-postgis', '2.3.4', GREATER | EQUAL)
+    conflicts('opengee-postgis', '2.0', LESS )
+    conflicts('opengee-postgis', '2.4', GREATER | EQUAL)
     requires('opengee-common', openGeeVersion, GREATER | EQUAL)
     requiresPre('opengee-common', openGeeVersion, GREATER | EQUAL)
 
@@ -358,6 +363,9 @@ task openGeeServerRpm (type: GeeRpm, dependsOn: openGeeSharedFiles) {
     // Prefix variable definitions to all install scripts:
     installUtils = file('build/shared/install-utils.sh')
 
+    // Add geresetpgdb script:
+    installUtils = file(new File(stagedInstallDir_server_opt, 'google/bin/gepgcommon'))
+
     preInstall = file('opengee-server/pre-install.sh')
     postInstall = file('opengee-server/post-install.sh')
     preUninstall = file('opengee-server/pre-uninstall.sh')

earth_enterprise/rpms/opengee-server/post-install.sh

@@ -21,6 +21,7 @@ umask 002
 # Definitions
 PUBLISHER_ROOT="/gevol/published_dbs"
 INITSCRIPTUPDATE="/usr/sbin/update-rc.d"
+PGSQL="/var/opt/google/pgsql"
 PGSQL_DATA="/var/opt/google/pgsql/data"
 PGSQL_LOGS="/var/opt/google/pgsql/logs"
 PGSQL_PROGRAM="/opt/google/bin/pg_ctl"
@@ -170,7 +171,15 @@ fix_postinstall_filepermissions()
 reset_pgdb()
 {
     # a) Always do an upgrade of the psql db
-    echo 2 | run_as_user "$GEPGUSER" "/opt/google/bin/geresetpgdb upgrade"
+    DB_BACKUP=""
+    DB_BACKUP_LATEST="$(ls -td -- $PGSQL/data.backup_dump*/ | head -n 1)"
+    echo "Latest backup: $DB_BACKUP_LATEST"
+    if [ -d "$DB_BACKUP_LATEST" ]; then
+        DB_BACKUP="$DB_BACKUP_LATEST"
+        echo "Restoring data backup from: $DB_BACKUP"
+    fi
+
+    echo 2 | run_as_user "$GEPGUSER" "/opt/google/bin/geresetpgdb upgrade $DB_BACKUP"
     echo -e "upgrade done"
 
     # b) Check for Success of PostGresDb

earth_enterprise/rpms/opengee-server/pre-install.sh

@@ -35,7 +35,12 @@ main_preinstall()
     if [ "$NEW_INSTALL" = "true" ] ; then
         check_username "$GEAPACHEUSER"
         check_username "$GEPGUSER"
+
     fi
+
+    # Dump database if it exists
+    database_backup
+
 }
 
 #-----------------------------------------------------------------
@@ -54,6 +59,15 @@ check_username()
         # user already exists -- update primary group
         usermod -g "$GEGROUP" "$1"
     fi
+
+}
+
+database_backup()
+{
+    # If the GEE data directory exists and PostgreSQL is installed
+    if [ -d "$BASEINSTALLDIR_VAR/pgsql/data" ] && [ -f "$BASEINSTALLDIR_OPT/bin/psql" ]; then
+        do_dump
+    fi
 }
 
 #-----------------------------------------------------------------

earth_enterprise/searchexample/searchexample

@@ -32,10 +32,7 @@ then
     exit 0
   fi
   $BINDIR/createdb -U geuser --owner=geuser searchexample
-  $BINDIR/createlang -U geuser plpgsql searchexample
-  $BINDIR/psql -q -U geuser -d searchexample -f $SQLDIR/postgis.sql 2>/dev/null >/dev/null
-#  $BINDIR/psql -q -U geuser -d searchexample -f $SQLDIR/postgis_upgrade.sql 2>/dev/null >/dev/null
-  $BINDIR/psql -q -U geuser -d searchexample -f $SQLDIR/spatial_ref_sys.sql 2>/dev/null >/dev/null
+  $BINDIR/psql -U geuser -d searchexample -c "CREATE EXTENSION postgis"
   zcat $SHAREDIR/searchexample/searchexample_db.gz | $BINDIR/psql -q -U geuser -d searchexample 2>/dev/null >/dev/null
 else
   if [ $1 == "delete" ]

earth_enterprise/src/SConstruct

@@ -357,6 +357,7 @@ installdirs = {
     'server_root': Dir('server/', installdir),
     'server_share': InstServerDir('share'),
     'server_search': InstServerDir('search'),
+    'server_sql': InstServerDir('share/opengee-server/sql'),
 
     'httpd': InstServerDir('gehttpd'),
     'httpdmodules': InstServerDir('gehttpd/modules'),