diff options
| author | Aravinda VK <avishwan@redhat.com> | 2014-11-10 12:41:49 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-01-18 04:30:42 -0800 |
| commit | dec4700c663975896f3aad1b4e59257263b4f4ac (patch) | |
| tree | 11bab12cd2ca1789d271838d887e45572b34c045 /xlators/mgmt/glusterd/src/glusterd-snapshot.c | |
| parent | 2466f4debbb629cf847c42f5d317cd5627b095c1 (diff) | |
features/changelog: Cleanup .processing and .current directory
On changelog_register cleanup .processing, .history/.processing,
.current and .history/.current from the working directory.
Moved glusterd_recursive_rmdir and glusterd_for_each_entry to common
place(libglusterfs) and renamed as recursive_rmdir and
GF_FOR_EACH_ENTRY_IN_DIR respectively
BUG: 1162057
Change-Id: I1f98468a344cead039026762a805437b2f9e507b
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/9082
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Tested-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-snapshot.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-snapshot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c index 759f5c460f6..f1e5fbb7dda 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c @@ -2493,7 +2493,7 @@ remove_brick_path: } if (is_brick_dir_present == _gf_true) { - ret = glusterd_recursive_rmdir (brick_dir); + ret = recursive_rmdir (brick_dir); if (ret) { if (errno == ENOTEMPTY) { /* Will occur when multiple glusterds @@ -7208,7 +7208,7 @@ glusterd_snapshot_restore_cleanup (dict_t *rsp_dict, } /* Delete the backup copy of volume folder */ - ret = glusterd_recursive_rmdir (delete_path); + ret = recursive_rmdir (delete_path); if (ret) { gf_log (this->name, GF_LOG_ERROR, "Failed to remove " "backup dir (%s)", delete_path); @@ -7255,7 +7255,7 @@ glusterd_snapshot_revert_partial_restored_vol (glusterd_volinfo_t *volinfo, /* Since snapshot restore failed we cannot rely on the volume * data stored under vols folder. Therefore delete the origin * volume's backend folder.*/ - ret = glusterd_recursive_rmdir (pathname); + ret = recursive_rmdir (pathname); if (ret) { gf_log (this->name, GF_LOG_ERROR, "Failed to remove " "%s directory", pathname); |