Skip to content

Commit 637cef8

Browse files
committed
Add new "cull unpacked tar balls" service
We now run a culling service once a day to find all unpacked tar ball directories whose age is beyond the configured maximum. We also have changed the unpacked tar balls service to only unpack tar balls less than the configured maximum age. One can keep an already unpacked tar ball by creating a `.__pbench_keep__` file in the top level of the unpacked tar ball directory. A report is generated much like the following: ``` Culled 3 unpacked tar ball directories (0 errors) in 0.00 secs Actions Taken: - controller-no-prefixes/tarball_culled_1970.01.01T00.00.00 (0 errors, 0.00 secs) $ rm results/controller-no-prefixes/tarball_culled_1970.01.01T00.00.00 # succ $ mv incoming/controller-no-prefixes/tarball_culled_1970.01.01T00.00.00 incoming/controller-no-prefixes/.delete.tarball_culled_1970.01.01T00.00.00 # succ $ rmtree incoming/controller-no-prefixes/.delete.tarball_culled_1970.01.01T00.00.00 # succ - controller-prefixes/tarball_culled-w-prefix_1970.01.01T00.00.00 (0 errors, 0.00 secs) $ rm results/controller-prefixes/pre0/pre1/pre2/tarball_culled-w-prefix_1970.01.01T00.00.00 # succ $ mv incoming/controller-prefixes/tarball_culled-w-prefix_1970.01.01T00.00.00 incoming/controller-prefixes/.delete.tarball_culled-w-prefix_1970.01.01T00.00.00 # succ $ rmtree incoming/controller-prefixes/.delete.tarball_culled-w-prefix_1970.01.01T00.00.00 # succ - controller-prefixes/tarball_culled-w-userA_1970.01.01T00.00.00 (0 errors, 0.00 secs) $ rm results/controller-prefixes/path0/path1/tarball_culled-w-userA_1970.01.01T00.00.00 # succ $ rm users/userA/controller-prefixes/path0/path1/tarball_culled-w-userA_1970.01.01T00.00.00 # succ $ mv incoming/controller-prefixes/tarball_culled-w-userA_1970.01.01T00.00.00 incoming/controller-prefixes/.delete.tarball_culled-w-userA_1970.01.01T00.00.00 # succ $ rmtree incoming/controller-prefixes/.delete.tarball_culled-w-userA_1970.01.01T00.00.00 # succ ```
1 parent 4cf1bfe commit 637cef8

27 files changed

+1171
-11
lines changed

server/bin/gold/test-0.1.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ pbench-index-tool-data: Bad LOGSDIR=/var/tmp/pbench-test-server/test-0.1/pbench-
2222
+++ Running pbench-clean-up-dangling-results-links
2323
pbench-clean-up-dangling-results-links: Bad LOGSDIR=/var/tmp/pbench-test-server/test-0.1/pbench-local/logs (config file /var/tmp/pbench-test-server/test-0.1/opt/pbench-server/lib/config/pbench-server.cfg)
2424
--- Finished pbench-clean-up-dangling-results-links (status=1)
25+
+++ Running pbench-cull-unpacked-tarballs
26+
pbench-cull-unpacked-tarballs: Bad LOGSDIR=/var/tmp/pbench-test-server/test-0.1/pbench-local/logs
27+
--- Finished pbench-cull-unpacked-tarballs (status=2)
2528
+++ Running pbench-backup-tarballs
2629
pbench-backup-tarballs: Bad LOGSDIR=/var/tmp/pbench-test-server/test-0.1/pbench-local/logs
2730
--- Finished pbench-backup-tarballs (status=1)

server/bin/gold/test-0.2.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ pbench-index-tool-data: Bad TMP=/var/tmp/pbench-test-server/test-0.2/pbench-loca
2222
+++ Running pbench-clean-up-dangling-results-links
2323
pbench-clean-up-dangling-results-links: Bad TMP=/var/tmp/pbench-test-server/test-0.2/pbench-local/tmp (config file /var/tmp/pbench-test-server/test-0.2/opt/pbench-server/lib/config/pbench-server.cfg)
2424
--- Finished pbench-clean-up-dangling-results-links (status=1)
25+
+++ Running pbench-cull-unpacked-tarballs
26+
pbench-cull-unpacked-tarballs: Bad TMP=/var/tmp/pbench-test-server/test-0.2/pbench-local/tmp
27+
--- Finished pbench-cull-unpacked-tarballs (status=2)
2528
+++ Running pbench-backup-tarballs
2629
pbench-backup-tarballs: Bad TMP=/var/tmp/pbench-test-server/test-0.2/pbench-local/tmp
2730
--- Finished pbench-backup-tarballs (status=1)

server/bin/gold/test-0.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ pbench-index-tool-data: Bad TOP=/var/tmp/pbench-test-server/test-0/pbench
2222
+++ Running pbench-clean-up-dangling-results-links
2323
pbench-clean-up-dangling-results-links: Bad TOP=/var/tmp/pbench-test-server/test-0/pbench (config file /var/tmp/pbench-test-server/test-0/opt/pbench-server/lib/config/pbench-server.cfg)
2424
--- Finished pbench-clean-up-dangling-results-links (status=1)
25+
+++ Running pbench-cull-unpacked-tarballs
26+
pbench-cull-unpacked-tarballs: Bad TOP=/var/tmp/pbench-test-server/test-0/pbench
27+
--- Finished pbench-cull-unpacked-tarballs (status=2)
2528
+++ Running pbench-backup-tarballs
2629
pbench-backup-tarballs: Bad TOP=/var/tmp/pbench-test-server/test-0/pbench
2730
--- Finished pbench-backup-tarballs (status=1)

server/bin/gold/test-1.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ pbench-copy-sosreports: Bad ARCHIVE=/var/tmp/pbench-test-server/test-1/pbench/ar
2020
+++ Running pbench-clean-up-dangling-results-links
2121
pbench-clean-up-dangling-results-links: Bad ARCHIVE=/var/tmp/pbench-test-server/test-1/pbench/archive/fs-version-001
2222
--- Finished pbench-clean-up-dangling-results-links (status=1)
23+
+++ Running pbench-cull-unpacked-tarballs
24+
--- Finished pbench-cull-unpacked-tarballs (status=4)
2325
+++ Running pbench-backup-tarballs
2426
--- Finished pbench-backup-tarballs (status=3)
2527
+++ Running pbench-verify-backup-tarballs
@@ -88,6 +90,8 @@ drwxrwxr-x - public_html/users
8890
drwxrwxr-x - logs
8991
drwxrwxr-x - logs/pbench-backup-tarballs
9092
-rw-rw-r-- 280 logs/pbench-backup-tarballs/pbench-backup-tarballs.log
93+
drwxrwxr-x - logs/pbench-cull-unpacked-tarballs
94+
-rw-rw-r-- 226 logs/pbench-cull-unpacked-tarballs/pbench-cull-unpacked-tarballs.log
9195
drwxrwxr-x - logs/pbench-index
9296
drwxrwxr-x - logs/pbench-index-tool-data
9397
-rw-rw-r-- 178 logs/pbench-index-tool-data/pbench-index-tool-data.log
@@ -143,6 +147,9 @@ drwxrwxr-x - tmp
143147
+++++ pbench-backup-tarballs/pbench-backup-tarballs.log
144148
1970-01-01T00:00:42.000000 ERROR pbench-backup-tarballs.pbench-backup-tarballs sanity_check -- The ARCHIVE directory /var/tmp/pbench-test-server/test-1/pbench/archive/fs-version-001, does not resolve /var/tmp/pbench-test-server/test-1/pbench/archive/fs-version-001 to a directory
145149
----- pbench-backup-tarballs/pbench-backup-tarballs.log
150+
+++++ pbench-cull-unpacked-tarballs/pbench-cull-unpacked-tarballs.log
151+
1970-01-01T00:00:42.000000 ERROR pbench-cull-unpacked-tarballs.pbench-cull-unpacked-tarballs main -- The configured ARCHIVE directory, /var/tmp/pbench-test-server/test-1/pbench/archive/fs-version-001, is not a valid directory
152+
----- pbench-cull-unpacked-tarballs/pbench-cull-unpacked-tarballs.log
146153
+++++ pbench-index-tool-data/pbench-index-tool-data.log
147154
1970-01-01T00:00:42.000000 ERROR pbench-index-tool-data.pbench-index main -- pbench-index-tool-data: Bad ARCHIVE=/var/tmp/pbench-test-server/test-1/pbench/archive/fs-version-001
148155
----- pbench-index-tool-data/pbench-index-tool-data.log

server/bin/gold/test-2.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ pbench-copy-sosreports: Bad INCOMING=/var/tmp/pbench-test-server/test-2/pbench/p
100100
--- Finished pbench-index (status=3)
101101
+++ Running pbench-clean-up-dangling-results-links
102102
--- Finished pbench-clean-up-dangling-results-links (status=0)
103+
+++ Running pbench-cull-unpacked-tarballs
104+
--- Finished pbench-cull-unpacked-tarballs (status=4)
103105
+++ Running pbench-backup-tarballs
104106
Template: pbench-unittests.v3.server-reports
105107
Index: pbench-unittests.v3.server-reports.1970-01 1
@@ -228,6 +230,8 @@ drwxrwxr-x - logs/pbench-backup-tarballs
228230
drwxrwxr-x - logs/pbench-clean-up-dangling-results-links
229231
-rw-rw-r-- 0 logs/pbench-clean-up-dangling-results-links/pbench-clean-up-dangling-results-links.error
230232
-rw-rw-r-- 0 logs/pbench-clean-up-dangling-results-links/pbench-clean-up-dangling-results-links.log
233+
drwxrwxr-x - logs/pbench-cull-unpacked-tarballs
234+
-rw-rw-r-- 225 logs/pbench-cull-unpacked-tarballs/pbench-cull-unpacked-tarballs.log
231235
drwxrwxr-x - logs/pbench-dispatch
232236
-rw-rw-r-- 0 logs/pbench-dispatch/pbench-dispatch.error
233237
-rw-rw-r-- 576 logs/pbench-dispatch/pbench-dispatch.log
@@ -307,6 +311,9 @@ drwxrwxr-x - tmp
307311
----- pbench-clean-up-dangling-results-links/pbench-clean-up-dangling-results-links.error
308312
+++++ pbench-clean-up-dangling-results-links/pbench-clean-up-dangling-results-links.log
309313
----- pbench-clean-up-dangling-results-links/pbench-clean-up-dangling-results-links.log
314+
+++++ pbench-cull-unpacked-tarballs/pbench-cull-unpacked-tarballs.log
315+
1970-01-01T00:00:42.000000 ERROR pbench-cull-unpacked-tarballs.pbench-cull-unpacked-tarballs main -- The configured INCOMING directory, /var/tmp/pbench-test-server/test-2/pbench/public_html/incoming, is not a valid directory
316+
----- pbench-cull-unpacked-tarballs/pbench-cull-unpacked-tarballs.log
310317
+++++ pbench-dispatch/pbench-dispatch.error
311318
----- pbench-dispatch/pbench-dispatch.error
312319
+++++ pbench-dispatch/pbench-dispatch.log

server/bin/gold/test-24.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ [email protected]
1414
* * * * * flock -n /var/tmp/pbench-test-server/test-24/opt/pbench-server/lib/locks/pbench-unpack-tarballs-medium.lock /var/tmp/pbench-test-server/test-24/opt/pbench-server/bin/pbench-unpack-tarballs medium
1515
* * * * * flock -n /var/tmp/pbench-test-server/test-24/opt/pbench-server/lib/locks/pbench-unpack-tarballs-large.lock /var/tmp/pbench-test-server/test-24/opt/pbench-server/bin/pbench-unpack-tarballs large
1616
* * * * * flock -n /var/tmp/pbench-test-server/test-24/opt/pbench-server/lib/locks/pbench-unpack-tarballs-huge.lock /var/tmp/pbench-test-server/test-24/opt/pbench-server/bin/pbench-unpack-tarballs huge
17+
1 2 * * * flock -n /var/tmp/pbench-test-server/test-24/opt/pbench-server/lib/locks/pbench-cull-unpacked-tarballs.lock /var/tmp/pbench-test-server/test-24/opt/pbench-server/bin/pbench-cull-unpacked-tarballs
1718
1 3 * * * flock -n /var/tmp/pbench-test-server/test-24/opt/pbench-server/lib/locks/pbench-audit-server.lock /var/tmp/pbench-test-server/test-24/opt/pbench-server/bin/pbench-audit-server
1819
23 * * * * flock -n /var/tmp/pbench-test-server/test-24/opt/pbench-server/lib/locks/pbench-copy-sosreports.lock /var/tmp/pbench-test-server/test-24/opt/pbench-server/bin/pbench-copy-sosreports
1920
* * * * * flock -n /var/tmp/pbench-test-server/test-24/opt/pbench-server/lib/locks/pbench-index.lock /var/tmp/pbench-test-server/test-24/opt/pbench-server/bin/pbench-index

0 commit comments

Comments
 (0)