Skip to content

Commit

Permalink
Implemented the suggested changes for issue #19 Suggestion about the …
Browse files Browse the repository at this point in the history 
…destination path

Implemented the suggested changes for issue #23 Fix the PostgreSQL restore message
  • Loading branch information
@douglascrp
douglascrp committed May 26, 2017
1 parent 3c7c984 commit 23f1ced
Showing 1 changed file with 12 additions and 32 deletions.
44 changes: 12 additions & 32 deletions src/alfresco-bart.sh
View file
Expand Up @@ -157,15 +157,12 @@ function dbBackup {
echo "$LOG_DATE_LOG - $BART_LOG_TAG Backing up the Alfresco DB to $BACKUPTYPE" >> $ALFBRT_LOG_FILE
echo "$LOG_DATE_LOG - $BART_LOG_TAG Starting backup - Alfresco $DBTYPE DB" >> $ALFBRT_LOG_FILE
# PG dump in plain text format and compressed
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $PGSQL_BINDIR/$PGSQLDUMP_BIN --host=$DBHOST --username=$DBUSER --format=p --compress=9 --file=$LOCAL_BACKUP_DB_DIR/$DBNAME.dump $DBNAME -w" >> $ALFBRT_LOG_FILE
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $PGSQL_BINDIR/$PGSQLDUMP_BIN -Fc -w -h $DBHOST -U $DBUSER $DBNAME > $LOCAL_BACKUP_DB_DIR/$DBNAME.sql.Fc" >> $ALFBRT_LOG_FILE
export PGPASSFILE=$PGPASSFILE
export PGPASSWORD=$DBPASS
$PGSQL_BINDIR/$PGSQLDUMP_BIN --host=$DBHOST --username=$DBUSER --format=p --compress=9 --file=$LOCAL_BACKUP_DB_DIR/$DBNAME.dump $DBNAME -w
$PGSQL_BINDIR/$PGSQLDUMP_BIN -Fc -w -h $DBHOST -U $DBUSER $DBNAME > $LOCAL_BACKUP_DB_DIR/$DBNAME.sql.Fc
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN $PARAMS $LOCAL_BACKUP_DB_DIR $DEST/db" >> $ALFBRT_LOG_FILE
$DUPLICITYBIN $PARAMS $LOCAL_BACKUP_DB_DIR $DEST/db >> $ALFBRT_LOG_FILE
echo "$LOG_DATE_LOG - $BART_LOG_TAG cleaning DB backup" >> $ALFBRT_LOG_FILE
rm -fr $LOCAL_BACKUP_DB_DIR/$DBNAME.dump
echo "$LOG_DATE_LOG - $BART_LOG_TAG DB backup finished" >> $ALFBRT_LOG_FILE
;;

"oracle" )
Expand Down Expand Up @@ -308,24 +305,23 @@ function restoreIndexes (){
function restoreDb (){
restoreOptions $1 $2 $3 $4
if [ ${BACKUP_DB_ENABLED} == 'true' ]; then
echo " =========== Starting restore DB from $DEST/db to $RESTOREDIR/$DBTYPE==========="
echo "$LOG_DATE_LOG - $BART_LOG_TAG - Recovery $RESTORE_TIME_FLAG $DEST/db $RESTOREDIR/$DBTYPE" >> $ALFBRT_LOG_FILE
$DUPLICITYBIN restore --restore-time $RESTORE_TIME ${NOENCFLAG} $DEST/db $RESTOREDIR/$DBTYPE
echo " =========== Starting restore DB from $DEST/db to $RESTOREDIR/db==========="
echo "$LOG_DATE_LOG - $BART_LOG_TAG - Recovery $RESTORE_TIME_FLAG $DEST/db $RESTOREDIR/db" >> $ALFBRT_LOG_FILE
$DUPLICITYBIN restore --restore-time $RESTORE_TIME ${NOENCFLAG} $DEST/db $RESTOREDIR/db
if [ ${DBTYPE} == 'mysql' ]; then
mv $RESTOREDIR/$DBTYPE/$DBNAME.dump $RESTOREDIR/$DBTYPE/$DBNAME.dump.gz
mv $RESTOREDIR/db/$DBNAME.dump $RESTOREDIR/db/$DBNAME.dump.gz
echo ""
echo "DB from $DEST/db... DONE!"
echo ""
echo "To restore this MySQL database use next command (the existing db must be empty)"
echo "gunzip < $RESTOREDIR/$DBTYPE/$DBNAME.dump.gz | $MYSQL_BINDIR/mysql -u $DBUSER -p$DBPASS $DBNAME"
echo "gunzip < $RESTOREDIR/db/$DBNAME.dump.gz | $MYSQL_BINDIR/mysql -u $DBUSER -p$DBPASS $DBNAME"
fi
if [ ${DBTYPE} == 'postgresql' ]; then
mv $RESTOREDIR/$DBTYPE/$DBNAME.dump $RESTOREDIR/$DBTYPE/$DBNAME.dump.gz
echo ""
echo "DB from $DEST/db... DONE!"
echo ""
echo "To restore this PostgreSQL database use next command (the existing db must be empty)"
echo "$PGSQL_BINDIR/psql --host=$DBHOST -U $DBUSER -d $DBNAME -f $DBNAME.dump.gz"
echo "$PGSQL_BINDIR/pg_restore -h $DBHOST -U $DBUSER -d $DBNAME $DBNAME.sql.Fc"
fi
else
echo "No backup DB configured to backup. Nothing to restore."
Expand Down Expand Up @@ -776,26 +772,10 @@ function maintenanceCommands () {
fi

if [ ${BACKUP_DB_ENABLED} == 'true' ]; then
case $DBTYPE in
"mysql" )
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN remove-older-than $CLEAN_TIME -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force --extra-clean $DEST/db" >> $ALFBRT_LOG_FILE
$DUPLICITYBIN remove-older-than $CLEAN_TIME -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force --extra-clean $DEST/db >> $ALFBRT_LOG_FILE
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN remove-all-but-n-full $MAXFULL -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force $DEST/db" >> $ALFBRT_LOG_FILE 2>&1
$DUPLICITYBIN remove-all-inc-of-but-n-full $MAXFULL -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force $DEST/db >> $ALFBRT_LOG_FILE
;;
"postgresql" )
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN remove-older-than $CLEAN_TIME -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force --extra-clean $DEST/db" >> $ALFBRT_LOG_FILE
$DUPLICITYBIN remove-older-than $CLEAN_TIME -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force --extra-clean $DEST/db >> $ALFBRT_LOG_FILE
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN remove-all-but-n-full $MAXFULL -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force $DEST/db" >> $ALFBRT_LOG_FILE 2>&1
$DUPLICITYBIN remove-all-inc-of-but-n-full $MAXFULL -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force $DEST/db >> $ALFBRT_LOG_FILE
;;
"oracle" )
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN remove-older-than $CLEAN_TIME -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force --extra-clean $DEST/db" >> $ALFBRT_LOG_FILE
$DUPLICITYBIN remove-older-than $CLEAN_TIME -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force --extra-clean $DEST/db >> $ALFBRT_LOG_FILE
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN remove-all-but-n-full $MAXFULL -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force $DEST/db" >> $ALFBRT_LOG_FILE 2>&1
$DUPLICITYBIN remove-all-inc-of-but-n-full $MAXFULL -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force $DEST/db >> $ALFBRT_LOG_FILE
;;
esac
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN remove-older-than $CLEAN_TIME -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force --extra-clean $DEST/db" >> $ALFBRT_LOG_FILE
$DUPLICITYBIN remove-older-than $CLEAN_TIME -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force --extra-clean $DEST/db >> $ALFBRT_LOG_FILE
echo "$LOG_DATE_LOG - $BART_LOG_TAG Running command - $DUPLICITYBIN remove-all-but-n-full $MAXFULL -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force $DEST/db" >> $ALFBRT_LOG_FILE 2>&1
$DUPLICITYBIN remove-all-inc-of-but-n-full $MAXFULL -v${DUPLICITY_LOG_VERBOSITY} --log-file=${ALFBRT_LOG_FILE} --force $DEST/db >> $ALFBRT_LOG_FILE
fi

if [ ${BACKUP_CONTENTSTORE_ENABLED} == 'true' ]; then
Expand Down

3 comments on commit 23f1ced

@AlbertoRamirezLosilla
Copy link
Contributor

@AlbertoRamirezLosilla AlbertoRamirezLosilla commented on 23f1ced Dec 11, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

¿Why has been deleted this 3 lines?

echo "$LOG_DATE_LOG - $BART_LOG_TAG cleaning DB backup" >> $ALFBRT_LOG_FILE
rm -fr $LOCAL_BACKUP_DB_DIR/$DBNAME.dump
echo "$LOG_DATE_LOG - $BART_LOG_TAG DB backup finished" >> $ALFBRT_LOG_FILE

¿Maybe It's a error?

@douglascrp
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you are right, as the rm command is still present for both mysql and oracle, but not for postgresql.

Are you willing to send a PR fixing this?

@AlbertoRamirezLosilla
Copy link
Contributor

@AlbertoRamirezLosilla AlbertoRamirezLosilla commented on 23f1ced Dec 12, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I am preparing the PR

Please sign in to comment.