"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xlators/mgmt/glusterd/src/glusterd-store.c" between
glusterfs-8.4.tar.gz and glusterfs-8.5.tar.gz

About: GlusterFS is a network/cluster filesystem. The storage server (or each in a cluster) runs glusterfsd and the clients use mount command or glusterfs client to mount the exported filesystem. Release series 8.x.

glusterd-store.c  (glusterfs-8.4):glusterd-store.c  (glusterfs-8.5)
skipping to change at line 2643 skipping to change at line 2643
brickinfo->path); brickinfo->path);
/* No need for treating it as an error, lets continue /* No need for treating it as an error, lets continue
with just a message */ with just a message */
} else { } else {
brickinfo->statfs_fsid = brickstat.f_fsid; brickinfo->statfs_fsid = brickstat.f_fsid;
} }
} }
cds_list_add_tail(&brickinfo->brick_list, &volinfo->bricks); cds_list_add_tail(&brickinfo->brick_list, &volinfo->bricks);
brick_count++; brick_count++;
if (gf_store_iter_destroy(iter)) {
gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
iter = NULL;
goto out;
}
iter = NULL;
}
if (gf_store_iter_destroy(tmpiter)) {
gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter");
ret = -1;
tmpiter = NULL;
goto out;
} }
ret = gf_store_iter_new(volinfo->shandle, &tmpiter); ret = gf_store_iter_new(volinfo->shandle, &tmpiter);
if (ret) if (ret)
goto out; goto out;
if (volinfo->thin_arbiter_count == 1) { if (volinfo->thin_arbiter_count == 1) {
snprintf(tmpkey, sizeof(tmpkey), "%s-%d", snprintf(tmpkey, sizeof(tmpkey), "%s-%d",
GLUSTERD_STORE_KEY_VOL_TA_BRICK, 0); GLUSTERD_STORE_KEY_VOL_TA_BRICK, 0);
skipping to change at line 2812 skipping to change at line 2828
value = NULL; value = NULL;
ret = gf_store_iter_get_next(iter, &key, &value, &op_errno); ret = gf_store_iter_get_next(iter, &key, &value, &op_errno);
} }
GLUSTERD_ASSIGN_BRICKID_TO_TA_BRICKINFO(ta_brickinfo, volinfo, GLUSTERD_ASSIGN_BRICKID_TO_TA_BRICKINFO(ta_brickinfo, volinfo,
ta_brick_id); ta_brick_id);
ta_brick_id += 3; ta_brick_id += 3;
cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks); cds_list_add_tail(&ta_brickinfo->brick_list, &volinfo->ta_bricks);
ta_brick_count++; ta_brick_count++;
if (gf_store_iter_destroy(iter)) {
gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FA
IL,
"Failed to destroy store iter");
ret = -1;
iter = NULL;
goto out;
}
iter = NULL;
} }
} }
assign_brick_groups(volinfo); assign_brick_groups(volinfo);
ret = 0; ret = 0;
out: out:
if (gf_store_iter_destroy(tmpiter)) { if (gf_store_iter_destroy(tmpiter)) {
gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL, gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_STORE_ITER_DESTROY_FAIL,
"Failed to destroy store iter"); "Failed to destroy store iter");
 End of changes. 2 change blocks. 
0 lines changed or deleted 25 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)