Skip to content

Commit 55a92a0

Browse files
committed
Enable actual use of rsync
We post-process the rsync output to make it comparable for unit tests. This also adds a test, 6.6, to show that rsync does not copy corrupted files.
1 parent b606d38 commit 55a92a0

File tree

11 files changed

+256
-62
lines changed

11 files changed

+256
-62
lines changed

server/pbench/bin/gold/test-6.4.txt

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
/var/tmp/pbench-test-server/pbench
55
/var/tmp/pbench-test-server/pbench/archive
66
/var/tmp/pbench-test-server/pbench/archive.backup
7-
/var/tmp/pbench-test-server/pbench/archive.backup/fs-version-001
8-
/var/tmp/pbench-test-server/pbench/archive.backup/fs-version-001/foo
9-
/var/tmp/pbench-test-server/pbench/archive.backup/fs-version-001/foo/fio__2016-08-18_15:47:09.tar.xz
10-
/var/tmp/pbench-test-server/pbench/archive.backup/fs-version-001/foo/fio__2016-08-18_15:47:09.tar.xz.md5
11-
/var/tmp/pbench-test-server/pbench/archive.backup/fs-version-001/foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz
12-
/var/tmp/pbench-test-server/pbench/archive.backup/fs-version-001/foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz.md5
7+
/var/tmp/pbench-test-server/pbench/archive.backup/foo
8+
/var/tmp/pbench-test-server/pbench/archive.backup/foo/fio__2016-08-18_15:47:09.tar.xz
9+
/var/tmp/pbench-test-server/pbench/archive.backup/foo/fio__2016-08-18_15:47:09.tar.xz.md5
10+
/var/tmp/pbench-test-server/pbench/archive.backup/foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz
11+
/var/tmp/pbench-test-server/pbench/archive.backup/foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz.md5
1312
/var/tmp/pbench-test-server/pbench/archive/fs-version-001
1413
/var/tmp/pbench-test-server/pbench/archive/fs-version-001/foo
1514
/var/tmp/pbench-test-server/pbench/archive/fs-version-001/foo/fio__2016-08-18_15:47:09.tar.xz
@@ -27,30 +26,44 @@
2726
--- pbench tree state
2827
+++ pbench log file contents
2928
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:start-1900-01-01T00:00:00-UTC
29+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:sending incremental file list
30+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:./
31+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:
32+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Number of files: 6
33+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Number of files transferred: 0
34+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total file size: # bytes
35+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total transferred file size: # bytes
36+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Literal data: # bytes
37+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Matched data: # bytes
38+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list size: #
39+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list generation time: #.### seconds
40+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list transfer time: #.### seconds
41+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total bytes sent: #
42+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total bytes received: #
43+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:
44+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:sent # bytes received # bytes #.### bytes/sec
45+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:total size is # speedup is #.##
3046
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:end-1900-01-01T00:00:00-UTC
3147
--- pbench log file contents
3248
+++ test-execution.log file contents
3349
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/opt/pbench-server/unittest-scripts/rsync -va --stats --exclude=TODO --exclude=TO-UNPACK --exclude=TO-COPY-SOS --exclude=TO-SYNC --exclude=SYNCED --exclude=TO-LINK --exclude=TO-INDEX --exclude=TO-BACKUP --exclude=INDEXED --exclude=WONT-INDEX --exclude=DONE --exclude=BAD-MD5 --exclude=SATELLITE-MD5-PASSED --exclude=SATELLITE-MD5-FAILED --exclude=TO-DELETE --exclude=SATELLITE-DONE --exclude=TO-UNPACK --exclude=UNPACKED --exclude=MOVED-UNPACKED /var/tmp/pbench-test-server/pbench/archive/fs-version-001/ /var/tmp/pbench-test-server/pbench/archive.backup
34-
/var/tmp/pbench-test-server/test-execution.log:
35-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Number of files: 1 (dir: 1)
36-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Number of created files: 0
37-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Number of deleted files: 0
38-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Number of regular files transferred: 0
39-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total file size: 0 bytes
40-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total transferred file size: 0 bytes
41-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Literal data: 0 bytes
42-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Matched data: 0 bytes
43-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list size: 0
44-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list generation time: 0.001 seconds
45-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list transfer time: 0.000 seconds
46-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total bytes sent: 54
47-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total bytes received: 19
48-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:
49-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:sent ### bytes received ### bytes ###.## bytes/sec
50-
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:total size is 0 speedup is 0.00
51-
/var/tmp/pbench-test-server/test-execution.log:
5250
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/opt/pbench-server/unittest-scripts/pbench-report-status --name pbench-backup-tarballs --timestamp run-1900-01-01T00:00:00-UTC --type status /var/tmp/pbench-test-server/pbench/tmp/pbench-backup-tarballs.NNNN/index_mail_contents
5351
--- test-execution.log file contents
5452
+++ test-report-status.log file contents
5553
/var/tmp/pbench-test-server/test-report-status.log:pbench-backup-tarballs.run-1900-01-01T00:00:00-UTC(unit-test)
54+
/var/tmp/pbench-test-server/test-report-status.log:
55+
/var/tmp/pbench-test-server/test-report-status.log:Number of files: 6
56+
/var/tmp/pbench-test-server/test-report-status.log:Number of files transferred: 0
57+
/var/tmp/pbench-test-server/test-report-status.log:Total file size: # bytes
58+
/var/tmp/pbench-test-server/test-report-status.log:Total transferred file size: # bytes
59+
/var/tmp/pbench-test-server/test-report-status.log:Literal data: # bytes
60+
/var/tmp/pbench-test-server/test-report-status.log:Matched data: # bytes
61+
/var/tmp/pbench-test-server/test-report-status.log:File list size: #
62+
/var/tmp/pbench-test-server/test-report-status.log:File list generation time: #.### seconds
63+
/var/tmp/pbench-test-server/test-report-status.log:File list transfer time: #.### seconds
64+
/var/tmp/pbench-test-server/test-report-status.log:Total bytes sent: #
65+
/var/tmp/pbench-test-server/test-report-status.log:Total bytes received: #
66+
/var/tmp/pbench-test-server/test-report-status.log:
67+
/var/tmp/pbench-test-server/test-report-status.log:sent # bytes received # bytes #.### bytes/sec
68+
/var/tmp/pbench-test-server/test-report-status.log:total size is # speedup is #.##
5669
--- test-report-status.log file contents
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
+++ Running pbench-backup-tarballs
2+
--- Finished pbench-backup-tarballs (status=0)
3+
+++ pbench tree state
4+
/var/tmp/pbench-test-server/pbench
5+
/var/tmp/pbench-test-server/pbench/archive
6+
/var/tmp/pbench-test-server/pbench/archive.backup
7+
/var/tmp/pbench-test-server/pbench/archive.backup/foo
8+
/var/tmp/pbench-test-server/pbench/archive.backup/foo/fio__2016-08-18_15:47:09.tar.xz
9+
/var/tmp/pbench-test-server/pbench/archive.backup/foo/fio__2016-08-18_15:47:09.tar.xz.md5
10+
/var/tmp/pbench-test-server/pbench/archive.backup/foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz
11+
/var/tmp/pbench-test-server/pbench/archive.backup/foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz.md5
12+
/var/tmp/pbench-test-server/pbench/archive/fs-version-001
13+
/var/tmp/pbench-test-server/pbench/archive/fs-version-001/foo
14+
/var/tmp/pbench-test-server/pbench/archive/fs-version-001/foo/fio__2016-08-18_15:47:09.tar.xz
15+
/var/tmp/pbench-test-server/pbench/archive/fs-version-001/foo/fio__2016-08-18_15:47:09.tar.xz.md5
16+
/var/tmp/pbench-test-server/pbench/archive/fs-version-001/foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz
17+
/var/tmp/pbench-test-server/pbench/archive/fs-version-001/foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz.md5
18+
/var/tmp/pbench-test-server/pbench/logs
19+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs
20+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.error
21+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log
22+
/var/tmp/pbench-test-server/pbench/public_html
23+
/var/tmp/pbench-test-server/pbench/public_html/incoming
24+
/var/tmp/pbench-test-server/pbench/public_html/results
25+
/var/tmp/pbench-test-server/pbench/tmp
26+
--- pbench tree state
27+
+++ pbench log file contents
28+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:start-1900-01-01T00:00:00-UTC
29+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:sending incremental file list
30+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:./
31+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:foo/
32+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:foo/fio__2016-08-18_15:47:09.tar.xz
33+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:foo/fio__2016-08-18_15:47:09.tar.xz.md5
34+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz
35+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:foo/pbench-user-benchmark__2016-08-24_21:32:01.tar.xz.md5
36+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:
37+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Number of files: 6
38+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Number of files transferred: 4
39+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total file size: # bytes
40+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total transferred file size: # bytes
41+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Literal data: # bytes
42+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Matched data: # bytes
43+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list size: #
44+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list generation time: #.### seconds
45+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:File list transfer time: #.### seconds
46+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total bytes sent: #
47+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:Total bytes received: #
48+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:
49+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:sent # bytes received # bytes #.### bytes/sec
50+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:total size is # speedup is #.##
51+
/var/tmp/pbench-test-server/pbench/logs/pbench-backup-tarballs/pbench-backup-tarballs.log:end-1900-01-01T00:00:00-UTC
52+
--- pbench log file contents
53+
+++ test-execution.log file contents
54+
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/opt/pbench-server/unittest-scripts/rsync -va --stats --exclude=TODO --exclude=TO-UNPACK --exclude=TO-COPY-SOS --exclude=TO-SYNC --exclude=SYNCED --exclude=TO-LINK --exclude=TO-INDEX --exclude=TO-BACKUP --exclude=INDEXED --exclude=WONT-INDEX --exclude=DONE --exclude=BAD-MD5 --exclude=SATELLITE-MD5-PASSED --exclude=SATELLITE-MD5-FAILED --exclude=TO-DELETE --exclude=SATELLITE-DONE --exclude=TO-UNPACK --exclude=UNPACKED --exclude=MOVED-UNPACKED /var/tmp/pbench-test-server/pbench/archive/fs-version-001/ /var/tmp/pbench-test-server/pbench/archive.backup
55+
/var/tmp/pbench-test-server/test-execution.log:/var/tmp/pbench-test-server/opt/pbench-server/unittest-scripts/pbench-report-status --name pbench-backup-tarballs --timestamp run-1900-01-01T00:00:00-UTC --type status /var/tmp/pbench-test-server/pbench/tmp/pbench-backup-tarballs.NNNN/index_mail_contents
56+
--- test-execution.log file contents
57+
+++ test-report-status.log file contents
58+
/var/tmp/pbench-test-server/test-report-status.log:pbench-backup-tarballs.run-1900-01-01T00:00:00-UTC(unit-test)
59+
/var/tmp/pbench-test-server/test-report-status.log:
60+
/var/tmp/pbench-test-server/test-report-status.log:Number of files: 6
61+
/var/tmp/pbench-test-server/test-report-status.log:Number of files transferred: 4
62+
/var/tmp/pbench-test-server/test-report-status.log:Total file size: # bytes
63+
/var/tmp/pbench-test-server/test-report-status.log:Total transferred file size: # bytes
64+
/var/tmp/pbench-test-server/test-report-status.log:Literal data: # bytes
65+
/var/tmp/pbench-test-server/test-report-status.log:Matched data: # bytes
66+
/var/tmp/pbench-test-server/test-report-status.log:File list size: #
67+
/var/tmp/pbench-test-server/test-report-status.log:File list generation time: #.### seconds
68+
/var/tmp/pbench-test-server/test-report-status.log:File list transfer time: #.### seconds
69+
/var/tmp/pbench-test-server/test-report-status.log:Total bytes sent: #
70+
/var/tmp/pbench-test-server/test-report-status.log:Total bytes received: #
71+
/var/tmp/pbench-test-server/test-report-status.log:
72+
/var/tmp/pbench-test-server/test-report-status.log:sent # bytes received # bytes #.### bytes/sec
73+
/var/tmp/pbench-test-server/test-report-status.log:total size is # speedup is #.##
74+
--- test-report-status.log file contents

0 commit comments

Comments
 (0)