diff options
author | Pranith K <pranithk@gluster.com> | 2011-03-10 21:49:04 +0000 |
---|---|---|
committer | Vijay Bellur <vijay@dev.gluster.com> | 2011-03-14 03:08:50 -0700 |
commit | 05dbcd0cb2415bb218221eccc1e7005645aa318b (patch) | |
tree | 1cb7324001287a01a70e52cb3617d34c53da69e2 /xlators/mgmt/glusterd/src/glusterd-op-sm.c | |
parent | 5a8edf3fc4deb4713d390690b144342e24659f8c (diff) |
mgmt/glusterd: remodel glusterd store
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1754 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1754
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index a1bd2b43f8e..5fbf7c845cc 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -2153,10 +2153,9 @@ glusterd_op_create_volume (dict_t *dict, char **op_errstr) i++; } list_add_tail (&volinfo->vol_list, &priv->volumes); - volinfo->version++; volinfo->defrag_status = 0; - ret = glusterd_store_create_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -2224,10 +2223,9 @@ glusterd_op_add_brick (dict_t *dict, char **op_errstr) goto out; } - volinfo->version++; volinfo->defrag_status = 0; - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -3321,7 +3319,6 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) goto out; } - volinfo->version++; volinfo->defrag_status = 0; ret = glusterd_check_generate_start_nfs (volinfo); @@ -3330,7 +3327,8 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict) "Failed to generate nfs volume file"); } - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, + GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -3462,7 +3460,7 @@ glusterd_options_reset (glusterd_volinfo_t *volinfo) goto out; } - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -3884,7 +3882,7 @@ glusterd_set_marker_gsync (char *master, char *value) goto out; } - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -4131,7 +4129,7 @@ glusterd_op_set_volume (dict_t *dict) } } - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -4167,7 +4165,8 @@ glusterd_op_set_volume (dict_t *dict) } } - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, + GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -4247,10 +4246,9 @@ glusterd_op_remove_brick (dict_t *dict) if (ret) goto out; - volinfo->version++; volinfo->defrag_status = 0; - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -4331,7 +4329,7 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr) glusterd_set_volume_status (volinfo, GLUSTERD_STATUS_STARTED); - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -4612,7 +4610,7 @@ glusterd_op_stop_volume (dict_t *dict) glusterd_set_volume_status (volinfo, GLUSTERD_STATUS_STOPPED); - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; @@ -4830,7 +4828,8 @@ glusterd_op_stats_volume (dict_t *dict, char **op_errstr, goto out; } - ret = glusterd_store_update_volume (volinfo); + ret = glusterd_store_volinfo (volinfo, + GLUSTERD_VOLINFO_VER_AC_INCREMENT); if (ret) goto out; |