Improvements in script for dumping and importing development data.

(Redmine issue: #7041)

Makefile

@@ -491,7 +491,7 @@ data-fetch-dbsnapshot: FORCE
 	@rm -rf ./data/var
 	@mkdir -p ./data
 	@time scp mentat-alt:/var/mentat/devsnapshots/devsnapshot-latest.tar.gz ./data/
-	@ls -alh mentat-alt:/var/mentat/devsnapshots/devsnapshot-latest.tar.gz ./data/
+	@ls -alh ./data/devsnapshot-latest.tar.gz
 	@cd ./data/ && tar -xzvf ./devsnapshot-latest.tar.gz
 	@rm -f ./data/devsnapshot-latest.tar.gz
 	@mv ./data/var/mentat/devsnapshots/devsnapshot ./data/devsnapshot
@@ -502,14 +502,12 @@ data-import-dbsnapshot: FORCE
 	@echo "\n$(GREEN)*** Importing latest production database dump ***$(NC)\n"
 
 	@sudo -u postgres pg_restore --verbose --format=d --dbname=mentat_main /vagrant/data/devsnapshot/main
-	@sudo -u postgres pg_restore --verbose --format=d --dbname=mentat_main /vagrant/data/devsnapshot/chunks/reports_events.dat
-	@sudo -u postgres pg_restore --verbose --format=d --dbname=mentat_main /vagrant/data/devsnapshot/chunks/statistics_events.dat
-	@sudo -u postgres pg_restore --verbose --format=d --dbname=mentat_main /vagrant/data/devsnapshot/chunks/changelogs_items.dat
+	@sudo -u postgres psql mentat_main -c "COPY FROM stdin;" < /vagrant/data/devsnapshot/chunks/reports_events.dat
+	@sudo -u postgres psql mentat_main -c "COPY FROM stdin;" < /vagrant/data/devsnapshot/chunks/statistics_events.dat
+	@sudo -u postgres psql mentat_main -c "COPY FROM stdin;" < /vagrant/data/devsnapshot/chunks/changelogs_items.dat
 
-	@sudo -u postgres pg_restore --verbose --format=d --dbname=mentat_events /vagrant/data/devsnapshot/events/events.dat
-	@sudo -u postgres pg_restore --verbose --format=d --dbname=mentat_events /vagrant/data/devsnapshot/events/events_json.dat
-	@sudo -u postgres pg_restore --verbose --format=d --dbname=mentat_events /vagrant/data/devsnapshot/events/events_thresholded.dat
-	@sudo -u postgres pg_restore --verbose --format=d --dbname=mentat_events /vagrant/data/devsnapshot/events/thresholds.dat
+	@sudo -u postgres psql mentat_events -c "COPY FROM stdin;" < /vagrant/data/devsnapshot/events/events.dat
+	@sudo -u postgres psql mentat_events -c "COPY FROM stdin;" < /vagrant/data/devsnapshot/events/events_json.dat
 
 	@echo ""
 	@sudo -u postgres psql mentat_main -e -c "select count(*) as user_count, min(createtime) as from_date, max(createtime) as to_date from users;"
@@ -519,6 +517,9 @@ data-import-dbsnapshot: FORCE
 	@sudo -u postgres psql mentat_main -e -c "select count(*) as report_count, min(createtime) as from_date, max(createtime) as to_date from reports_events;"
 	@sudo -u postgres psql mentat_main -e -c "select count(*) as statistics_count, min(createtime) as from_date, max(createtime) as to_date from statistics_events;"
 	@sudo -u postgres psql mentat_main -e -c "select count(*) as changelog_count, min(createtime) as from_date, max(createtime) as to_date from changelogs_items;"
+
+	@sudo -u postgres psql mentat_events -e -c "select count(*) as event_count, min(createtime) as from_date, max(storagetime) as to_date from events;"
+	@sudo -u postgres psql mentat_events -e -c "select count(*) as event_json_count, min(createtime) as from_date, max(storagetime) as to_date from events_json;"
 	@echo ""
 
 #-------------------------------------------------------------------------------

conf/scripts/devsnapshot.sh

@@ -47,6 +47,9 @@ sudo -u mentat psql mentat_events -c "copy (select * from events_thresholded joi
 print_subtitle "Dumping chunk of table thresholds from event database"
 sudo -u mentat psql mentat_events -c "copy (select * from thresholds where thresholdtime >= '${BACKUP_DATE_FROM}'::timestamptz) to stdout" > ${BACKUP_DIR}/thresholds.dat
 
+print_subtitle "Size before packaging:"
+du -csh /var/mentat/devsnapshots/devsnapshot
+print_subtitle "Packaging created database snapshots"
 cd /var/mentat
 SNAPSHOT_FILE_NAME="/var/mentat/devsnapshots/devsnapshot-${BACKUP_DATE_FROM}.tar.gz"
 LATEST_SNAPSHOT_FILE_NAME="/var/mentat/devsnapshots/devsnapshot-latest.tar.gz"