Merge lp:~jontai/openvista-gtm-integration/bug362001 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

review: Approve

=== modified file 'packages/rpm/openvista-utils.spec'
--- packages/rpm/openvista-utils.spec	2009-04-14 07:38:10 +0000
+++ packages/rpm/openvista-utils.spec	2009-04-16 06:01:37 +0000
@@ -44,6 +44,7 @@
 install -d %{buildroot}%{_sbindir}/
 install scripts/usr/sbin/ovinstanceadd %{buildroot}%{_sbindir}/
 install scripts/usr/sbin/ovinstancedel %{buildroot}%{_sbindir}/
+install scripts/usr/sbin/ovrestore %{buildroot}%{_sbindir}/
 
 install -d %{buildroot}%{_bindir}/
 install scripts/usr/bin/openvista %{buildroot}%{_bindir}/
@@ -75,6 +76,7 @@
 %{_libdir}/openvista/functions
 %{_sbindir}/ovinstanceadd
 %{_sbindir}/ovinstancedel
+%{_sbindir}/ovrestore
 %{_bindir}/openvista
 %{_bindir}/ovtied
 %{_bindir}/ovbackup

=== modified file 'scripts/etc/bash_completion.d/openvista'
--- scripts/etc/bash_completion.d/openvista	2009-04-14 07:21:58 +0000
+++ scripts/etc/bash_completion.d/openvista	2009-04-16 06:01:37 +0000
@@ -24,11 +24,15 @@
     root="/opt/openvista"
     cur=${COMP_WORDS[COMP_CWORD]}
     if [ $COMP_CWORD -eq 1 ]; then
-        COMPREPLY=( $(compgen -W "$(ls -1 $root 2> /dev/null)" $cur ) )
+        COMPREPLY=( $(compgen -W "$(ls -1 $root 2> /dev/null)" $cur) )
+    else
+        _filedir
     fi
+    return 0
 }
 
 complete -F _openvista_instances ovinstancedel
+complete -F _openvista_instances ovrestore
 complete -F _openvista_instances openvista
 complete -F _openvista_instances ovtied
 complete -F _openvista_instances ovbackup

=== modified file 'scripts/etc/cron.d/openvista'
--- scripts/etc/cron.d/openvista	2009-04-13 22:31:11 +0000
+++ scripts/etc/cron.d/openvista	2009-04-17 05:35:20 +0000
@@ -14,9 +14,13 @@
 #
 # Example: back up the production instance at 6am, noon, 6pm, and midnight
 #          every day; purge old journals right after a successful backup
-# 0 */6 * * * openvista ovbackup production && ovpurgejournals production
+# 0 */6 * * * openvista ovbackup -q production && ovpurgejournals production
 #
 # Example: back up the training instance at 3:45am on Mondays, Wednesdays, and
-#          Fridays; let the daily cron job purge old journals
-# 45 3 * * 1,3,5 openvista ovbackup training
+#          Fridays; let the daily cron job purge old journals (Warning: because
+#          journals are being purged more often than backups are made, if the
+#          training database is busy, it's possible that you won't be able to
+#          restore a backup and then replay journals because the required
+#          journals have already been purged)
+# 45 3 * * 1,3,5 openvista ovbackup -q training
 

=== modified file 'scripts/etc/cron.daily/openvista'
--- scripts/etc/cron.daily/openvista	2009-04-15 05:16:53 +0000
+++ scripts/etc/cron.daily/openvista	2009-04-17 05:35:20 +0000
@@ -35,6 +35,7 @@
 
 
 root="/opt/openvista"
+user="openvista"
 
 for instance in `ls $root`; do
     # the default is "yes" unless the etc/backups.conf file exists and it has
@@ -50,7 +51,7 @@
             # skip backing up this instance
             ;;
         *)
-            ovbackup "$instance" || backup_failed=true
+            su -c "ovbackup -q \"$instance\"" "$user" || backup_failed=true
             ;;
     esac 
 
@@ -67,7 +68,7 @@
             # skip this instance
             ;;
         *)
-            ${backup_failed:-false} || ovpurgejournals "$instance"
+            ${backup_failed:-false} || su -c "ovpurgejournals \"$instance\"" "$user"
             ;;
     esac 
 done

=== modified file 'scripts/etc/init.d/openvista_early'
--- scripts/etc/init.d/openvista_early	2009-04-15 05:14:43 +0000
+++ scripts/etc/init.d/openvista_early	2009-04-17 02:51:59 +0000
@@ -58,7 +58,7 @@
 
     logger -p user.info -t "openvista_early[$$]" -- Performing recovery on $instance database
 
-    mupip journal -recover -backward "$root/$instance/journals/default.mjl" 2>&1 \
+    mupip journal -recover -backward '*' 2>&1 \
       | grep -v '^$' \
       | logger -p user.info -t "openvista_early[$$]"
     retval=${PIPESTATUS[0]}

=== modified file 'scripts/usr/bin/ovbackup'
--- scripts/usr/bin/ovbackup	2009-04-15 17:31:43 +0000
+++ scripts/usr/bin/ovbackup	2009-04-17 05:16:08 +0000
@@ -27,19 +27,25 @@
 . /usr/lib/openvista/functions
 
 # parse arguments
-while getopts hy option; do
+while getopts hq option; do
     case $option in
         h)
-            echo "Usage: ovbackup INSTANCE_NAME"
+            echo "Usage: ovbackup [-q] INSTANCE_NAME"
             echo "   or  ovbackup -h"
             echo
+            echo "  -q  quiet; suppress status messages"
             echo "  -h  display this help text"
             exit 0
             ;;
+        q)
+            skip_status=true
+            ;;
     esac
 done
 shift `expr $OPTIND - 1`
 
+: ${skip_status:=false}
+
 # check command syntax
 if [ -z "$1" ]; then
     echo "ovbackup: missing operand" >&2
@@ -70,56 +76,38 @@
         ;;
 esac 
 
-logger -p user.info -t "ovbackup[$$]" -- Starting backup of $instance requested by $USER
+print_status "ovbackup" "Starting backup of $instance" "$skip_status"
 
-# it would be great if we could put these two calls in a subshell, but while
-# that would make the umask call temporary (good), it would also make the
-# tempdir variable temporary (bad)
+# we can't use a subshell to isolate the umask call because $tempdir wouldn't
+# survive, so save/restore the umask instead
+old_umask=`umask`
 umask 077
-tempdir=`mktemp -d -p "$root/$instance/backups" .ovbackup.XXXXXXXXXX` || {
-    logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Unable to create temporary backup directory
-    echo "ovbackup: Unable to create temporary backup directory" >&2
-    exit 1
-}
+tempdir=`mktemp -d -p "$root/$instance/backups" .ovbackup.XXXXXXXXXX` || 
+exit_with_error "ovbackup" "Unable to create temporary directory"
+umask "$old_umask"
 
 # the EXIT handler may or may not run if we're interrupted or killed depending
 # on the shell used (from what I've read, it does run on bash, but not on
 # dash); use $exit to exit with the correct status in both cases
-trap '[ -z "$exit" ] && rm -rf $tempdir; exit ${exit:-0}' EXIT
+trap '[ -z "$exit" ] && rm -rf "$tempdir"; exit ${exit:-0}' EXIT
 
-trap 'logger -p user.info -t "ovbackup[$$]" -- Caught SIGINT, exiting; rm -rf $tempdir; exit ${exit:=130}' INT
-trap 'logger -p user.info -t "ovbackup[$$]" -- Caught SIGTERM, exiting; rm -rf $tempdir; exit ${exit:=143}' TERM
+trap 'print_status "ovbackup" "Caught SIGINT, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=130}' INT
+trap 'print_status "ovbackup" "Caught SIGTERM, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=143}' TERM
 
 # this signal is used to indicate failure of mupip backup, which is run in the background below
-trap 'logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Unable to copy database files; echo "ovbackup: Unable to copy database files" >&2; rm -rf $tempdir; exit ${exit:=1}' USR1
-
-{
-    install -m 2750 -d "$tempdir/etc" &&
-    cp -a "$root/$instance/etc/"*.conf "$tempdir/etc/"
-} || {
-    logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Unable to copy configuration files
-    echo "ovbackup: Unable to copy configuration files" >&2
-    exit 1
-}
+trap 'logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Unable to copy default.dat database file; echo "ovbackup: Unable to copy default.dat database file" >&2; rm -rf "$tempdir"; exit ${exit:=1}' USR1
+
+print_status "ovbackup" "Copying routines" "$skip_status"
+
+cp -a "$root/$instance/routines" "$tempdir" || 
+exit_with_error "ovbackup" "Unable to copy routines"
+
+print_status "ovbackup" "Copying database files" "$skip_status"
 
 {
     install -m 2750 -d "$tempdir/globals" &&
     cp -a "$root/$instance/globals/mumps.gld" "$tempdir/globals/"
-} || {
-    logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Unable to copy global directory file
-    echo "ovbackup: Unable to copy global directory file" >&2
-    exit 1
-}
-
-logger -p user.info -t "ovbackup[$$]" -- Copying routines
-
-cp -a "$root/$instance/routines" "$tempdir" || {
-    logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Unable to copy routines
-    echo "ovbackup: Unable to copy routines" >&2
-    exit 1
-}
-
-logger -p user.info -t "ovbackup[$$]" -- Copying database files
+} || exit_with_error "ovbackup" "Unable to copy mumps.gld global directory file"
 
 # save this timestamp - this is the timestamp that the backup is consistent to.
 # we will use this timestamp to name the final backup file.
@@ -157,49 +145,27 @@
 # FIXME: if the routines did change, we should probably try again instead of
 # just aborting - rsync the routines, then re-run the database backup
 output=`rsync -ai --delete --dry-run "$root/$instance/routines/" "$tempdir/routines/"`
-[ -z "$output" ] || {
-    logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Routines changed during backup
-    echo "ovbackup: Routines changed during backup" >&2
-    exit 1
-}
+[ -z "$output" ] || exit_with_error "ovbackup" "Routines changed during backup"
 
 # if we get here, that means that the routines haven't changed, and either the
 # mupip backup is still running, or it completed successfully.  make sure it's
 # done before we move on.
 wait $child_pid 2> /dev/null
 
-logger -p user.info -t "ovbackup[$$]" -- Checking backup integrity
+print_status "ovbackup" "Checking backup integrity" "$skip_status"
 
 mupip integ -file "$tempdir/globals/default.dat" 2>&1 \
   | grep -v '^$' \
   | logger -p user.info -t "ovbackup[$$]"
 retval=${PIPESTATUS[0]}
-[ $retval -eq 0 ] || {
-    logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Database file failed integrity check
-    echo "ovbackup: Database file failed integrity check" >&2
-    exit 1
-}
-
-logger -p user.info -t "ovbackup[$$]" -- Compressing backup
-
-# if available, use pbzip2 (parallel bzip2) - the author claims near linear
-# performance gains.  testing on my Core 2 Duo laptop, it was 4m17s vs. 5m36s
-# (clearly not 200% better), but the task was clearly I/O bound.  note that
-# pbzip2 did not support being called from tar until version 1.0.4
-if [ -x /usr/bin/pbzip2 ] && [ `pbzip2 -V 2>&1 | head -n1 | awk '{ print $3 }'` ">" "v1.0.3" ]; then
-    bzip2="--use-compress-prog=pbzip2"
-else
-    bzip2="--bzip2"
-fi
+[ $retval -eq 0 ] || exit_with_error "ovbackup" "Database file failed integrity check"
+
+print_status "ovbackup" "Compressing backup" "$skip_status"
 
 (
     umask 007
-    tar -c --remove-files $bzip2 -f "$tempdir/${instance}-$timestamp.tar.bz2" -C "$tempdir" etc routines globals
-) || {
-    logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Unable to compress temporary backup directory
-    echo "ovbackup: Unable to compress temporary backup directory"
-    exit 1
-}
+    tar -c --remove-files `choose_bzip2` -f "$tempdir/${instance}-$timestamp.tar.bz2" -C "$tempdir" routines globals
+) || exit_with_error "ovbackup" "Unable to compress temporary backup directory"
 
 # since redirection is not safe (it follows symlinks), create the file in the
 # temporary directory first, then move it into place.  if for whatever reason
@@ -210,13 +176,10 @@
     mv "$tempdir/${instance}-$timestamp.tar.bz2.md5" "$root/$instance/backups/${instance}-$timestamp.tar.bz2.md5"
 )
 
-mv "$tempdir/${instance}-$timestamp.tar.bz2" "$root/$instance/backups/${instance}-$timestamp.tar.bz2" || {
-    logger -p user.info -t "ovbackup[$$]" -- Backup of $instance failed: Unable to rename backup file
-    echo "ovbackup: Unable to rename backup file"
-    exit 1
-}
+mv "$tempdir/${instance}-$timestamp.tar.bz2" "$root/$instance/backups/${instance}-$timestamp.tar.bz2" || 
+exit_with_error "ovbackup" "Unable to rename backup file"
 
-logger -p user.info -t "ovbackup[$$]" -- Backup of $instance written to "$root/$instance/backups/${instance}-$timestamp.tar.bz2"
+print_status "ovbackup" "Backup of $instance written to $root/$instance/backups/${instance}-$timestamp.tar.bz2" "$skip_status"
 
 # remove the oldest backup file until there are only $num_backups remaining
 until [ `find "$root/$instance/backups" -type f -name "*.tar.bz2" | wc -l` -le $num_backups ]; do

=== modified file 'scripts/usr/bin/ovpurgejournals'
--- scripts/usr/bin/ovpurgejournals	2009-04-14 07:56:28 +0000
+++ scripts/usr/bin/ovpurgejournals	2009-04-17 05:09:15 +0000
@@ -24,7 +24,7 @@
 . /usr/lib/openvista/functions
 
 # parse arguments
-while getopts hy option; do
+while getopts h option; do
     case $option in
         h)
             echo "Usage: ovpurgejournals INSTANCE_NAME"

=== modified file 'scripts/usr/lib/openvista/functions'
--- scripts/usr/lib/openvista/functions	2009-04-14 16:13:47 +0000
+++ scripts/usr/lib/openvista/functions	2009-04-17 05:09:55 +0000
@@ -94,3 +94,37 @@
 
     return 1
 }
+
+# write a status message to syslog and stderr. the first argument is the name
+# of the calling program, the second argument is the message.  if a third
+# argument is given and is "true", the message is not written to stderr.
+print_status()
+{
+    logger -p user.info -t "$1[$$]" -- "$2"
+    "$3" || echo "`date '+%b %d %H:%M:%S'` - $2" >&2
+}
+
+# write an error message to syslog and stderr, then exit 1. the first argument
+# is the name of the calling program, the second argument is the message
+exit_with_error()
+{
+    logger -p user.info -t "$1[$$]" -- "$2"
+    echo "$1: $2" >&2
+    exit 1
+}
+
+# if available, use pbzip2 (parallel bzip2) - the author claims near linear
+# performance gains.  testing on my Core 2 Duo laptop, it was 4m17s vs. 5m36s
+# (clearly not 200% better), but the task was clearly I/O bound.  note that
+# pbzip2 did not support being called from tar until version 1.0.4
+#
+# example usage: tar -x `choose_bzip2` -f archive.tar.bz2
+choose_bzip2()
+{
+    if [ -x /usr/bin/pbzip2 ] && [ `pbzip2 -V 2>&1 | head -n1 | awk '{ print $3 }'` ">" "v1.0.3" ]; then
+        echo "--use-compress-prog=pbzip2"
+    else
+        echo "--bzip2"
+    fi
+}
+

=== modified file 'scripts/usr/sbin/ovinstanceadd'
--- scripts/usr/sbin/ovinstanceadd	2009-04-14 19:22:56 +0000
+++ scripts/usr/sbin/ovinstanceadd	2009-04-16 21:35:40 +0000
@@ -201,9 +201,7 @@
 # create the global directory file, mumps.gld
 (
     umask 027
-    # mumps doesn't exit non-zero even if something goes wrong in ^GDE, so grep for
-    # the "success" message and exit if we don't find it
-    ( mumps -run ^GDE 2>&1 | grep '%GDE-I-GDCREATE' > /dev/null ) <<EOF
+    mumps -run ^GDE > /dev/null 2>&1 <<EOF
 CHANGE -SEGMENT DEFAULT -ACCESS_METHOD=BG -BLOCK_SIZE=4096 -ALLOCATION=1024 -EXTENSION_COUNT=1024 -GLOBAL_BUFFER_COUNT=4096 -FILE=$root/$instance/globals/default.dat
 CHANGE -REGION DEFAULT -RECORD_SIZE=4080 -KEY_SIZE=255 -JOURNAL=(BEFORE_IMAGE,FILE_NAME="$root/$instance/journals/default.mjl") -DYNAMIC_SEGMENT=DEFAULT
 TEMPLATE -SEGMENT -ACCESS_METHOD=BG -BLOCK_SIZE=4096 -ALLOCATION=1024 -EXTENSION_COUNT=1024 -GLOBAL_BUFFER_COUNT=4096
@@ -216,7 +214,11 @@
 TEMPLATE -REGION -RECORD_SIZE=4080 -KEY_SIZE=255 -JOURNAL=BEFORE_IMAGE
 EXIT
 EOF
-) || {
+)
+
+# mumps doesn't exit non-zero even if something goes wrong in ^GDE, so look for
+# the mumps.gld to determine success
+[ -f "$root/$instance/globals/mumps.gld" ] || {
     echo "ovinstanceadd: Unable to create global directory file" >&2
     exit 1
 }

=== modified file 'scripts/usr/sbin/ovinstancedel'
--- scripts/usr/sbin/ovinstancedel	2009-04-14 19:22:56 +0000
+++ scripts/usr/sbin/ovinstancedel	2009-04-17 04:09:48 +0000
@@ -2,7 +2,7 @@
 
 # This script deletes an OpenVista instance.  All routines, database files,
 # journals, backups, and tied accounts associated with the instance are
-# permanently removed.
+# permanently deleted.
 
 
 # Copyright (C) 2009 Medsphere Systems Corporation
@@ -44,6 +44,8 @@
 done
 shift `expr $OPTIND - 1`
 
+: ${skip_confirmation:=false}
+
 # check command syntax
 if [ -z "$1" ]; then
     echo "ovinstancedel: missing operand" >&2
@@ -53,7 +55,7 @@
 
 # check permissions
 if [ `id -u` -ne 0 ]; then
-    echo "ovinstancedel: Only root may remove an OpenVista instance from the system" >&2
+    echo "ovinstancedel: Only root may delete an OpenVista instance from the system" >&2
     exit 1
 fi
 
@@ -76,11 +78,11 @@
     exit 1
 fi
 
-${skip_confirmation:-false} || {
+$skip_confirmation || {
     echo "All routines, database files, journals, backups, and tied accounts associated" >&2
-    echo "with this OpenVista instance will be PERMANENTLY removed." >&2
-    echo
-    printf "Are you sure you want to remove this OpenVista instance (yes/no)? " >&2
+    echo "with '$instance' will be PERMANENTLY deleted." >&2
+    echo >&2
+    printf "Are you sure you want to delete '$instance' (yes/no)? " >&2
     while [ 1 ]; do
         read response
         case $response in

=== added file 'scripts/usr/sbin/ovrestore'
--- scripts/usr/sbin/ovrestore	1970-01-01 00:00:00 +0000
+++ scripts/usr/sbin/ovrestore	2009-04-17 05:34:28 +0000
@@ -0,0 +1,269 @@
+#!/bin/bash
+
+# This script restores routines and database files from a backup file into an
+# OpenVista instance.
+
+
+# Copyright (C) 2009 Medsphere Systems Corporation
+#
+# This program is free software; you can redistribute it and/or modify it solely
+# under the terms of the GNU Affero General Public License version 3 as published
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+# for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses>.
+# 
+# You can contact Medsphere Systems Corporation headquarters at 1917 Palomar 
+# Oaks Way, Suite 200, Carlsbad, CA 92008 or at [e-mail].
+
+
+# common functions
+. /usr/lib/openvista/functions
+
+# parse arguments
+while getopts hyqjf option; do
+    case $option in
+        h)
+            echo "Usage: ovrestore [-y] [-q] [-j] [-f] INSTANCE_NAME BACKUP_FILE"
+            echo "   or  ovrestore -h"
+            echo
+            echo "  -y  do not ask for confirmation"
+            echo "  -q  quiet; suppress status messages"
+            echo "  -j  after restoring the backup, apply journal entries"
+            echo "  -f  force; kill any processes accessing the database before restore"
+            echo "  -h  display this help text"
+            exit 0
+            ;;
+        y)
+            skip_confirmation=true
+            ;;
+        q)
+            skip_status=true
+            ;;
+        j)
+            apply_journals=true
+            ;;
+        f)
+            force=true
+            ;;
+    esac
+done
+shift `expr $OPTIND - 1`
+
+: ${skip_confirmation:=false}
+: ${skip_status:=false}
+: ${apply_journals:=false}
+: ${force:=false}
+
+# check command syntax
+if [ -z "$1" ] || [ -z "$2" ]; then
+    echo "ovrestore: missing operand" >&2
+    echo "Try 'ovrestore -h' for more information" >&2
+    exit 2
+fi
+
+# check permissions
+if [ `id -u` -ne 0 ]; then
+    echo "ovrestore: root privileges are required to restore backups" >&2
+    exit 1
+fi
+
+# check for for valid arguments (requires correct permissions to do; must happen after permission checks)
+set_gtm_env "$1" || {
+    echo "ovrestore: $instance: Not an OpenVista instance" >&2
+    exit 3
+}
+
+backup_file=$2
+
+if [ ! -f "$backup_file" ]; then
+    echo "ovrestore: $backup_file: No such file" >&2
+    exit 3
+fi
+
+if $apply_journals; then
+    backup_instance=`basename "$backup_file" | awk -F '-' '{ print $1 }'`
+    [ "$instance" = "$backup_instance" ] || {
+        echo "ovrestore: Cannot apply journals when restoring backup from another instance" >&2
+        exit 3
+    }
+fi
+
+$skip_confirmation || {
+    echo "Routines and database files in '$instance' will be OVERWRITTEN with" >&2
+    echo "the versions in '$backup_file'" >&2
+    echo >&2
+    printf "Are you sure you want to restore this backup to '$instance' (yes/no)? " >&2
+    while [ 1 ]; do
+        read response
+        case $response in
+            yes)
+                break
+                ;;
+            no)
+                exit 0
+                ;;
+        esac
+        printf "Please type 'yes' or 'no': " >&2
+    done
+
+    $skip_status || echo >&2
+}
+
+print_status "ovrestore" "Starting restore of $backup_file to $instance" "$skip_status"
+
+# we can't use a subshell to isolate the umask call because $tempdir wouldn't
+# survive, so save/restore the umask instead
+old_umask=`umask`
+umask 077
+tempdir=`mktemp -d -p "$root/$instance/backups" .ovrestore.XXXXXXXXXX` || 
+exit_with_error "ovrestore" "Unable to create temporary directory"
+umask "$old_umask"
+
+# the EXIT handler may or may not run if we're interrupted or killed depending
+# on the shell used (from what I've read, it does run on bash, but not on
+# dash); use $exit to exit with the correct status in both cases
+trap '[ -z "$exit" ] && rm -rf "$tempdir"; exit ${exit:-0}' EXIT
+
+trap 'print_status "ovrestore" "Caught SIGINT, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=130}' INT
+trap 'print_status "ovrestore" "Caught SIGTERM, exiting" "$skip_status"; rm -rf "$tempdir"; exit ${exit:=143}' TERM
+
+print_status "ovrestore" "Extracting contents of backup file" "$skip_status"
+
+# extract backup file before doing anything else.  that way, if the file is
+# corrupted, we can abort and we don't affect the current database.
+# unfortunately, this requires more disk space, but we're doing the same thing
+# during the backup backup process anyway.
+tar -x `choose_bzip2` -f "$backup_file" -C "$tempdir" || 
+exit_with_error "ovrestore" "Unable to extract contents of backup file"
+
+[ -d "$tempdir/routines" ]            || exit_with_error "ovrestore" "Backup file does not contain routines"
+[ -f "$tempdir/globals/mumps.gld" ]   || exit_with_error "ovrestore" "Backup file does not contain mumps.gld global directory file"
+[ -f "$tempdir/globals/default.dat" ] || exit_with_error "ovrestore" "Backup file does not contain default.dat database file"
+
+# at this point, we're committed... we're about to kill processes, lock the
+# instance, overwrite files, etc.
+
+print_status "ovrestore" "Attempting to acquire exclusive access to database" "$skip_status"
+
+if $force; then
+    # find all processes using this database and kill them
+    for pid in `ls /proc`; do
+        [ -L "/proc/$pid/cwd" ] || continue
+        cwd=`readlink "/proc/$pid/cwd"`
+        [ "$root/$instance/tmp" = "$cwd" ] || continue
+
+        [ -L "/proc/$pid/exe" ] || continue
+        exe=`readlink "/proc/$pid/exe"`
+        exe_base=`basename "$exe"`
+        [ "mumps" = "$exe_base" ] || continue
+
+        mupip stop "$pid" 2>&1 \
+          | grep -v '^$' \
+          | logger -p user.info -t "ovrestore[$$]"
+    done
+fi
+
+# check to see if the database is in use
+mupip rundown -region '*' 2>&1 \
+  | grep -v '^$' \
+  | logger -p user.info -t "ovrestore[$$]"
+retval=${PIPESTATUS[0]}
+[ $retval -eq 200 ] && exit_with_error "ovrestore" "Database currently in use"
+
+# close this instance off so nobody can use it
+chmod 700 "$root/$instance"
+
+print_status "ovrestore" "Restoring routines" "$skip_status"
+
+rsync -a --delete "$tempdir/routines/" "$root/$instance/routines/" || 
+exit_with_error "ovrestore" "Unable to restore routines"
+
+(
+    find "$root/$instance/objects" -type f -name '*.o' -exec rm -f {} \; &&
+    umask 007 &&
+    cd "$root/$instance/objects" &&
+    find "$root/$instance/routines" -type f -name '*.m' -exec mumps {} \; 2> /dev/null
+) || exit_with_error "ovrestore" "Unable to recompile routines"
+
+# if we're not applying journals, shut off journaling on the old database so
+# that there's a clean break, then move the journal file out of the way
+$apply_journals || {
+    print_status "ovrestore" "Disabling journaling on old database" "$skip_status"
+
+    mupip set -journal="OFF" -region DEFAULT 2>&1 \
+      | grep -v '^$' \
+      | logger -p user.info -t "ovrestore[$$]"
+
+    mupip set -nojournal -region DEFAULT 2>&1 \
+      | grep -v '^$' \
+      | logger -p user.info -t "ovrestore[$$]"
+
+    mv -f "$root/$instance/journals/default.mjl" "$root/$instance/journals/default.mjl_`date +%Y%j%H%M%S`_ovrestore"
+}
+
+print_status "ovrestore" "Restoring database files" "$skip_status"
+
+mv -f "$tempdir/globals/mumps.gld" "$root/$instance/globals/mumps.gld" || 
+exit_with_error "ovrestore" "Unable to restore mumps.gld global directory file"
+
+# update locations of databases in the global directory file, mumps.gld
+(
+    umask 027
+    mumps -run ^GDE > /dev/null 2>&1 <<EOF
+CHANGE -REGION DEFAULT -JOURNAL=(BEFORE_IMAGE,FILE_NAME="$root/$instance/journals/default.mjl")
+CHANGE -SEGMENT DEFAULT -FILE=$root/$instance/globals/default.dat
+CHANGE -SEGMENT SCRATCH -FILE=$root/$instance/globals/scratch.dat
+EXIT
+EOF
+)
+
+# mumps doesn't exit non-zero even if something goes wrong in ^GDE, so re-run
+# ^GDE and look for the new paths to determine success
+(
+    ( mumps -run ^GDE 2>&1 | grep -F "$root/$instance/globals/default.dat" > /dev/null ) <<EOF
+SHOW -SEGMENT DEFAULT
+QUIT
+EOF
+) || exit_with_error "ovrestore" "Unable to update mumps.gld global directory file"
+
+mv -f "$tempdir/globals/default.dat" "$root/$instance/globals/default.dat" || 
+exit_with_error "ovrestore" "Unable to restore default.dat database file"
+
+{
+    mv -f "$root/$instance/globals/scratch.dat" "$root/$instance/globals/scratch.dat~" && 
+    mupip create -region=SCRATCH 2>&1 \
+      | grep -v '^$' \
+      | logger -p user.info -t "ovrestore[$$]"
+    retval=${PIPESTATUS[0]}
+    [ $retval -eq 0 ]
+} || exit_with_error "ovrestore" "Unable to recreate scratch.dat database file"
+
+if $apply_journals; then
+    print_status "ovrestore" "Applying journal entries" "$skip_status"
+
+    mupip journal -recover -forward '*' 2>&1 \
+      | grep -v '^$' \
+      | logger -p user.info -t "ovrestore[$$]"
+    retval=${PIPESTATUS[0]}
+    [ $retval -eq 0 ] || exit_with_error "ovrestore" "Unable to apply journal entries"
+fi
+
+print_status "ovrestore" "Enabling journaling on new database" "$skip_status"
+
+mupip set -journal="ENABLE,ON,BEFORE_IMAGES,FILE=\"$root/$instance/journals/default.mjl\"" -region DEFAULT 2>&1 \
+  | grep -v '^$' \
+  | logger -p user.info -t "ovrestore[$$]"
+retval=${PIPESTATUS[0]}
+[ $retval -eq 0 ] || exit_with_error "ovrestore" "Unable to enable journaling on new database"
+
+# re-open this instance for general use
+chmod 2750 "$root/$instance"
+
+print_status "ovrestore" "Finished restoring $backup_file to $instance" "$skip_status"
+