diff options
| author | Sachin Pandit <spandit@redhat.com> | 2014-01-22 07:28:45 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2014-02-04 19:20:35 -0800 |
| commit | bea2e811a5fe9b84a1a46f6403d4291ba16965be (patch) | |
| tree | 41c19444bd06ca592f26d47b687a7184d2bfbf57 /xlators/mgmt/glusterd/src/glusterd-store.c | |
| parent | aa53d35780a2b742a66c6b690d1d20dc173168cf (diff) | |
glusterd/snapshot : snapshot delete - check if process is killed before unmounting.
Change-Id: Idf0cf63429212142795e1aeb4fd4962b51620426
BUG: 1049353
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/6772
Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com>
Reviewed-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-store.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-store.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 5dfc96485..56a64145c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -2048,9 +2048,15 @@ glusterd_store_delete_volume (glusterd_volinfo_t *volinfo, GLUSTERD_GET_VOLUME_DIR (pathname, volinfo, priv); } - snprintf (delete_path, sizeof (delete_path), - "%s/"GLUSTERD_TRASH"/%s.deleted", priv->workdir, - uuid_utoa (volinfo->volume_id)); + if (snapinfo == NULL ) { + snprintf (delete_path, sizeof (delete_path), + "%s/"GLUSTERD_TRASH"/%s.deleted", priv->workdir, + uuid_utoa (volinfo->volume_id)); + } else { + snprintf (delete_path, sizeof (delete_path), + "%s/"GLUSTERD_TRASH"/%s.deleted", priv->workdir, + uuid_utoa (snapinfo->volume_id)); + } snprintf (trashdir, sizeof (trashdir), "%s/"GLUSTERD_TRASH, priv->workdir); |