|
 |
3604df |
From c5f29109bf2d300f5074bd7ef76575a6c5f26409 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
Date: Mon, 30 Jan 2017 12:09:15 +0530
|
|
|
3604df |
Subject: [PATCH 278/285] tools/glusterfind: delete temporary folder
|
|
|
3604df |
|
|
|
3604df |
Problem:
|
|
|
3604df |
Run specific temporary folder created under
|
|
|
3604df |
/usr/var/lib/misc/glusterfsd/glusterfind/<session>/<volume>/
|
|
|
3604df |
remains undeleted.
|
|
|
3604df |
|
|
|
3604df |
Solution:
|
|
|
3604df |
Delete the temporary folder from all nodes.
|
|
|
3604df |
|
|
|
3604df |
mainline:
|
|
|
3604df |
> BUG: 1413526
|
|
|
3604df |
> Reviewed-on: https://review.gluster.org/16416
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> Reviewed-by: Aravinda VK <avishwan@redhat.com>
|
|
|
3604df |
(cherry picked from commit 355c1955039a39c820880be72fe77d4e74af0967)
|
|
|
3604df |
|
|
|
3604df |
Change-Id: I0edaf868aebb01b15c489434bbb26fe853351384
|
|
|
3604df |
BUG: 1413513
|
|
|
3604df |
Signed-off-by: Milind Changire <mchangir@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/96371
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
tools/glusterfind/src/main.py | 4 ++--
|
|
|
3604df |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py
|
|
|
3604df |
index 0c993f5..d146354 100644
|
|
|
3604df |
--- a/tools/glusterfind/src/main.py
|
|
|
3604df |
+++ b/tools/glusterfind/src/main.py
|
|
|
3604df |
@@ -578,7 +578,7 @@ def mode_query(session_dir, args):
|
|
|
3604df |
except (IOError, OSError):
|
|
|
3604df |
pass
|
|
|
3604df |
|
|
|
3604df |
- run_cmd_nodes("cleanup", args)
|
|
|
3604df |
+ run_cmd_nodes("cleanup", args, tmpfilename=gtmpfilename)
|
|
|
3604df |
|
|
|
3604df |
sys.stdout.write("Generated output file %s\n" % args.outfile)
|
|
|
3604df |
|
|
|
3604df |
@@ -637,7 +637,7 @@ def mode_pre(session_dir, args):
|
|
|
3604df |
except (IOError, OSError):
|
|
|
3604df |
pass
|
|
|
3604df |
|
|
|
3604df |
- run_cmd_nodes("cleanup", args)
|
|
|
3604df |
+ run_cmd_nodes("cleanup", args, tmpfilename=gtmpfilename)
|
|
|
3604df |
|
|
|
3604df |
with open(status_file_pre, "w", buffering=0) as f:
|
|
|
3604df |
f.write(str(endtime_to_update))
|
|
|
3604df |
--
|
|
|
3604df |
2.9.3
|
|
|
3604df |
|