@@ -9,31 +9,35 @@ test_description="Test robustness of garbage collector"
99. lib/test-lib.sh
1010set -e
1111
12+ to_raw_cid () {
13+ ipfs cid format -b b --codec raw -v 1 " $1 "
14+ }
15+
1216test_gc_robust_part1 () {
1317
1418 test_expect_success " add a 1MB file with --raw-leaves" '
1519 random 1048576 56 > afile &&
16- HASH1=`ipfs add --raw-leaves -q afile`
20+ HASH1=`ipfs add --raw-leaves -q --cid-version 1 afile` &&
21+ REFS=`ipfs refs -r $HASH1` &&
22+ read LEAF1 LEAF2 LEAF3 LEAF4 < <(echo $REFS)
1723 '
1824
19- HASH1FILE=.ipfs/blocks/L3/CIQNIPL4GP62ZMNNSLZ2G33Z3T5VAN3YHCJTGT5FG45XWH5FGZRXL3A.data
20-
21- LEAF1=bafkreibkrcw7hf6nhr6dvwecqxc5rqc7u7pkhkti53byyznqp23dk5fc2y
22- LEAF1FILE=.ipfs/blocks/C2/AFKREIBKRCW7HF6NHR6DVWECQXC5RQC7U7PKHKTI53BYYZNQP23DK5FC2Y.data
23-
24- LEAF2=bafkreidfsuir43gjphndxxqa45gjvnrzbet3crpumyjcblk3rtn7zamq6q
25- LEAF2FILE=.ipfs/blocks/Q6/BAFKREIDFSUIR43GJPHNDXXQA45GJVNRZBET3CRPUMYJCBLK3RTN7ZAMQ6Q
26-
27- LEAF3=bafkreihsipwnaj3mrc5plg24lpy6dw2bpixl2pe5iapzvc6ct2n33uhqjm
28- LEAF4=bafkreihrzs3rh4yxel4olv54vxettu5hv6wxy3krh6huzwhjub7kusnen4
25+ test_expect_success " find data blocks for added file" '
26+ HASH1MH=`cid-fmt -b base32 "%M" $HASH1` &&
27+ LEAF1MH=`cid-fmt -b base32 "%M" $LEAF1` &&
28+ LEAF2MH=`cid-fmt -b base32 "%M" $LEAF2` &&
29+ HASH1FILE=`find .ipfs/blocks -type f | grep -i $HASH1MH` &&
30+ LEAF1FILE=`find .ipfs/blocks -type f | grep -i $LEAF1MH` &&
31+ LEAF2FILE=`find .ipfs/blocks -type f | grep -i $LEAF2MH`
32+ '
2933
3034 test_expect_success " remove a leaf node from the repo manually" '
3135 rm "$LEAF1FILE"
3236 '
3337
34- test_expect_success " check that the node is removed" '
35- test_must_fail ipfs cat $HASH1
36- '
38+ test_expect_success " check that the node is removed" '
39+ test_must_fail ipfs cat $HASH1
40+ '
3741
3842 test_expect_success " 'ipfs repo gc' should still be fine" '
3943 ipfs repo gc
@@ -69,12 +73,14 @@ test_gc_robust_part1() {
6973 grep -q "permission denied" block_rm_err
7074 '
7175
76+ # repo gc outputs raw multihashes. We chech HASH1 with block stat rather than
77+ # grepping the output since it's not a raw multihash
7278 test_expect_success " 'ipfs repo gc' should still run and remove as much as possible" '
7379 test_must_fail ipfs repo gc 2>&1 | tee repo_gc_out &&
74- grep -q "removed $HASH1" repo_gc_out &&
7580 grep -q "could not remove $LEAF2" repo_gc_out &&
76- grep -q "removed $LEAF3" repo_gc_out &&
77- grep -q "removed $LEAF4" repo_gc_out
81+ grep -q "removed $(to_raw_cid $LEAF3)" repo_gc_out &&
82+ grep -q "removed $(to_raw_cid $LEAF4)" repo_gc_out &&
83+ test_must_fail ipfs block stat $HASH1
7884 '
7985
8086 test_expect_success " fix the permission problem" '
@@ -83,7 +89,7 @@ test_gc_robust_part1() {
8389
8490 test_expect_success " 'ipfs repo gc' should be ok now" '
8591 ipfs repo gc | tee repo_gc_out
86- grep -q "removed $LEAF2" repo_gc_out
92+ grep -q "removed $(to_raw_cid $ LEAF2) " repo_gc_out
8793 '
8894}
8995
@@ -100,6 +106,7 @@ test_gc_robust_part2() {
100106 LEAF2=QmTbPEyrA1JyGUHFvmtx1FNZVzdBreMv8Hc8jV9sBRWhNA
101107 LEAF2FILE=.ipfs/blocks/WM/CIQE4EFIJN2SUTQYSKMKNG7VM75W3SXT6LWJCHJJ73UAWN73WCX3WMY.data
102108
109+
103110 test_expect_success " add some additional unpinned content" '
104111 random 1000 3 > junk1 &&
105112 random 1000 4 > junk2 &&
@@ -147,8 +154,8 @@ test_gc_robust_part2() {
147154
148155 test_expect_success " 'ipfs repo gc' should be fine now" '
149156 ipfs repo gc | tee repo_gc_out &&
150- grep -q "removed $HASH2" repo_gc_out &&
151- grep -q "removed $LEAF2" repo_gc_out
157+ grep -q "removed $(to_raw_cid $ HASH2) " repo_gc_out &&
158+ grep -q "removed $(to_raw_cid $ LEAF2) " repo_gc_out
152159 '
153160}
154161
0 commit comments