diff options
| -rw-r--r-- | src/checkpoint.c | 8 | ||||
| -rw-r--r-- | test/test_e2e.py | 32 |
2 files changed, 35 insertions, 5 deletions
diff --git a/src/checkpoint.c b/src/checkpoint.c index 22dfbad..d81e08d 100644 --- a/src/checkpoint.c +++ b/src/checkpoint.c @@ -276,7 +276,7 @@ int checkpoint_save(const char *pathname, int dir, const char *user, const char pool_for_each(path_pool, p, i) { if (p->state == FILE_STATE_DONE) continue; - if (checkpoint_write_path(fd, p, i) < 0) + if (checkpoint_write_path(fd, p, nr_paths) < 0) return -1; nr_paths++; } @@ -349,7 +349,8 @@ static int checkpoint_load_path(struct checkpoint_obj_hdr *hdr, pool *path_pool) return -1; } - pr_info("checkpoint:file: %s -> %s", p->path, p->dst_path); + pr_info("checkpoint:file: idx=%u %s -> %s", ntohl(path->idx), + p->path, p->dst_path); return 0; } @@ -375,7 +376,8 @@ static int checkpoint_load_chunk(struct checkpoint_obj_hdr *hdr, pool *path_pool return -1; } - pr_debug("checkpoint:chunk: %s 0x%lx-0x%lx", p->path, c->off, c->off + c->len); + pr_debug("checkpoint:chunk: idx=%u %s 0x%lx-0x%lx", ntohl(chunk->idx), + p->path, c->off, c->off + c->len); return 0; } diff --git a/test/test_e2e.py b/test/test_e2e.py index 9b1bc4a..e1c2cf3 100644 --- a/test/test_e2e.py +++ b/test/test_e2e.py @@ -628,9 +628,9 @@ def test_checkpoint_dump_and_resume(mscp, src_prefix, dst_prefix): dst2.cleanup() os.remove("checkpoint") -@pytest.mark.parametrize("timeout", [1, 2, 3, 4, 5, 6]) +@pytest.mark.parametrize("timeout", [ 1, 2, 3, 4, 5 ]) @pytest.mark.parametrize("src_prefix, dst_prefix", param_remote_prefix) -def test_checkpoint_interrupt_and_resume(mscp, timeout, src_prefix, dst_prefix): +def test_checkpoint_interrupt_large_file(mscp, timeout, src_prefix, dst_prefix): """Copy two 100MB files with 200Mbps -> 4 sec + 4 sec """ src1 = File("src1", size = 100 * 1024 * 1024).make() src2 = File("src2", size = 100 * 1024 * 1024).make() @@ -650,3 +650,31 @@ def test_checkpoint_interrupt_and_resume(mscp, timeout, src_prefix, dst_prefix): dst2.cleanup() os.remove("checkpoint") +@pytest.mark.parametrize("timeout", [ 1, 2, 3, 4, 5 ]) +@pytest.mark.parametrize("src_prefix, dst_prefix", param_remote_prefix) +def test_checkpoint_interrupt_many_files(mscp, timeout, src_prefix, dst_prefix): + """Copy 100 1-MB files with 4 connections, and interrupt and + resume the transfer + """ + + files = [] + for x in range(100): + files.append(( + File("src/{:03d}".format(x), size = 1024 * 1024).make(), + File("dst/{:03d}".format(x)) + )) + + run2ng([mscp, "-vv", "-W", "checkpoint", "-L", "80m", "-n", 4, + src_prefix + "src", dst_prefix + "dst"], + timeout = timeout) + assert os.path.exists("checkpoint") + + run2ok([mscp, "-vv", "-R", "checkpoint"]) + + for src, dst in files: + assert check_same_md5sum(src, dst) + src.cleanup() + dst.cleanup() + + os.remove("checkpoint") + |