Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3d4a85f

Browse files
committed
Fix get time in last second.
1 parent558d4a3 commit3d4a85f

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

‎sql/common.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,8 @@ EOF
8383
# init backup catalog
8484
init_catalog
8585
}
86+
87+
functionget_time_last_backup()
88+
{
89+
pg_arman -B${BACKUP_PATH} show| tail -n +4| head -n 1| awk'{print($1, $2)}'
90+
}

‎sql/delete.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
init_backup
1111
echo'###### DELETE COMMAND TEST-0001 ######'
1212
echo'###### delete full backups ######'
13-
FIRST_BACKUP_DATE=`date +"%Y-%m-%d %H:%M:%S"`
1413
pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet
14+
FIRST_BACKUP_DATE=$(get_time_last_backup)
1515
pgbench -p${TEST_PGPORT}>>${TEST_BASE}/pgbench.log2>&1
16-
SECOND_BACKUP_DATE=`date +"%Y-%m-%d %H:%M:%S"`
1716
pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet
17+
SECOND_BACKUP_DATE=$(get_time_last_backup)
1818
pgbench -p${TEST_PGPORT}>>${TEST_BASE}/pgbench.log2>&1
19-
THIRD_BACKUP_DATE=`date +"%Y-%m-%d %H:%M:%S"`
2019
pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet
20+
THIRD_BACKUP_DATE=$(get_time_last_backup)
2121
pg_arman validate -B${BACKUP_PATH} --quiet
2222

2323
echo"try to delete the oldest backup"
@@ -32,18 +32,18 @@ echo "Number of deleted backups should be 1, is it so?: ${NUM_OF_DELETED_BACKUPS
3232
init_backup
3333
echo'###### DELETE COMMAND TEST-0002 ######'
3434
echo'###### keep backups which are necessary for recovery ######'
35-
FIRST_BACKUP_DATE=`date +"%Y-%m-%d %H:%M:%S"`
3635
pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet
36+
FIRST_BACKUP_DATE=$(get_time_last_backup)
3737
pgbench -p${TEST_PGPORT}>>${TEST_BASE}/pgbench.log2>&1
38-
SECOND_BACKUP_DATE=`date +"%Y-%m-%d %H:%M:%S"`
3938
pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet
39+
SECOND_BACKUP_DATE=$(get_time_last_backup)
4040
pg_arman validate -B${BACKUP_PATH} --quiet
4141
pgbench -p${TEST_PGPORT}>>${TEST_BASE}/pgbench.log2>&1
42-
THIRD_BACKUP_DATE=`date +"%Y-%m-%d %H:%M:%S"`
4342
pg_arman backup -B${BACKUP_PATH} -b page -p${TEST_PGPORT} -d postgres --quiet
43+
THIRD_BACKUP_DATE=$(get_time_last_backup)
4444
pg_arman validate -B${BACKUP_PATH} --quiet
45-
FOURTH_BACKUP_DATE=`date +"%Y-%m-%d %H:%M:%S"`
4645
pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet
46+
FOURTH_BACKUP_DATE=$(get_time_last_backup)
4747
pg_arman validate -B${BACKUP_PATH} --quiet
4848

4949
echo"try to delete before third backup"

‎sql/show.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ echo '###### Status DELETED ######'
7070
init_catalog
7171
pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet;echo$?
7272
pg_arman validate -B${BACKUP_PATH} --quiet> /dev/null2>&1;echo$?
73-
DELETE_DATE=`date +"%Y-%m-%d %H:%M:%S"`
7473
pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet;echo$?
74+
DELETE_DATE=$(get_time_last_backup)
7575
pg_arman validate -B${BACKUP_PATH} --quiet> /dev/null2>&1;echo$?
7676
pg_arman delete${DELETE_DATE} -B${BACKUP_PATH}> /dev/null2>&1;echo$?
7777
pg_arman show -B${BACKUP_PATH}>${TEST_BASE}/TEST-0004-show.out2>&1

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp