diff options
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-store.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index caa607740..24a8bfb48 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -1352,6 +1352,9 @@ glusterd_store_snap_volume (glusterd_volinfo_t *volinfo, glusterd_snap_t *snap) { snap_volinfo = snap->snap_volume; + if (!snap_volinfo) + goto unlock; + ret = glusterd_store_create_snap_vol_dir (volinfo, snap->snap_name); if (ret) { @@ -2896,6 +2899,7 @@ glusterd_store_retrieve_snap_list (char *volname) gf_store_op_errno_t op_errno = GD_STORE_SUCCESS; glusterd_snap_t *snap = NULL; uint64_t count = 0; + gf_store_handle_t *shandle = NULL; priv = THIS->private; @@ -2927,6 +2931,7 @@ glusterd_store_retrieve_snap_list (char *volname) GF_FREE (value); value = NULL; + shandle = volinfo->snap_list_shandle; while (count <= volinfo->snap_count) { snap = glusterd_new_snap_object (); if (!snap) { @@ -2937,18 +2942,18 @@ glusterd_store_retrieve_snap_list (char *volname) snprintf (key, sizeof (key), "%s-%"PRIu64, GLUSTERD_STORE_KEY_SNAP_NAME, count); - ret = gf_store_iter_get_matching (iter, key, &value); + ret = gf_store_retrieve_value (shandle, key, &value); if (ret) goto out; - strncpy (snap->snap_name, value, sizeof (*value)); + strncpy (snap->snap_name, value, strlen(value)); GF_FREE (value); value = NULL; snprintf (key, sizeof (key), "%s-%"PRIu64, GLUSTERD_STORE_KEY_SNAP_STATUS, count); - ret = gf_store_iter_get_matching (iter, key, - &value); + ret = gf_store_retrieve_value (shandle, key, + &value); if (ret) goto out; @@ -2958,7 +2963,7 @@ glusterd_store_retrieve_snap_list (char *volname) snprintf (key, sizeof (key), "%s-%"PRIu64, GLUSTERD_STORE_KEY_SNAP_ID, count); - ret = gf_store_iter_get_matching (iter, key, &value); + ret = gf_store_retrieve_value (shandle, key, &value); if (ret) goto out; @@ -2968,7 +2973,7 @@ glusterd_store_retrieve_snap_list (char *volname) snprintf (key, sizeof (key), "%s-%"PRIu64, GLUSTERD_STORE_KEY_SNAP_CG_ID, count); - ret = gf_store_iter_get_matching (iter, key, &value); + ret = gf_store_retrieve_value (shandle, key, &value); if (ret) goto out; |