Skip to content

Commit 8000a32

Browse files
authored
fixing a test case (#147)
Cherry-picking the changes from #137 Signed-off-by: Vishnu Itta <[email protected]>
1 parent d503791 commit 8000a32

File tree

2 files changed

+5
-28
lines changed

2 files changed

+5
-28
lines changed

cmd/uzfs_test/uzfs_test_rebuilding.c

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -207,29 +207,6 @@ uzfs_test_meta_diff_traverse_cb(off_t offset, size_t len,
207207
return (err);
208208
}
209209

210-
static void
211-
check_snapshot(zvol_state_t *zv, blk_metadata_t *md, boolean_t err)
212-
{
213-
objset_t *s_obj;
214-
char *dataset;
215-
int ret = 0;
216-
217-
dataset = kmem_asprintf("%s@%s%lu", zv->zv_name,
218-
IO_DIFF_SNAPNAME, md->io_num);
219-
220-
ret = dmu_objset_own(dataset, DMU_OST_ANY, B_TRUE, zv, &s_obj);
221-
if ((ret != 0 && err) ||
222-
(!err && ret == 0)) {
223-
printf("ret:%d\n", ret);
224-
printf("snapshot %s %s\n", dataset,
225-
(err) ? "should not be removed" : "should be removed");
226-
exit(1);
227-
}
228-
229-
if (ret == 0)
230-
dmu_objset_disown(s_obj, zv);
231-
}
232-
233210
static void
234211
fetch_modified_data(void *arg)
235212
{
@@ -258,9 +235,7 @@ fetch_modified_data(void *arg)
258235
break;
259236

260237
offset += len;
261-
if (offset != r_data->zvol->zv_volsize)
262-
check_snapshot(repl_data->zvol, &md, B_TRUE);
263-
else
238+
if (offset == r_data->zvol->zv_volsize)
264239
break;
265240
}
266241

@@ -269,8 +244,6 @@ fetch_modified_data(void *arg)
269244
exit(1);
270245
}
271246

272-
check_snapshot(repl_data->zvol, &md, B_FALSE);
273-
274247
printf("finished fetching modified data\n");
275248

276249
mutex_enter(&r_data->mtx);

include/uzfs_rebuilding.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ uzfs_zvol_create_snaprebuild_clone(zvol_state_t *zv,
6060
int
6161
uzfs_zvol_destroy_snaprebuild_clone(zvol_state_t *zv,
6262
zvol_state_t *snap_zv);
63+
int
64+
uzfs_zvol_create_internal_snapshot(zvol_state_t *zv, zvol_state_t **snap_zv,
65+
uint64_t io_num, char **snap);
66+
6367
#ifdef __cplusplus
6468
}
6569
#endif

0 commit comments

Comments
 (0)