diff options
| author | Aravinda VK <avishwan@redhat.com> | 2015-06-26 22:36:31 -0400 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-07-12 20:06:07 -0700 |
| commit | 8a210d46424c2c7a20a9e8a94b0a4719df7cb8c7 (patch) | |
| tree | 09ffba57f09fcfa3238be54811fbc981e3cb8701 /tools/glusterfind/src/main.py | |
| parent | f9a3cce2f52e249c0b836050a7f408f77e7d74c9 (diff) | |
tools/glusterfind: RENAME and MODIFY issues
If Modification happens before RENAME, GFID to Path Conversion
converts it into New Path. Delete Modify Entry and insert again
So that MODIFY <NEW NAME> comes after RENAME.
Default value of pgfids and basenames changed to "" instead of NULL
Also fixed RENAME issue of displaying "RENAME <NEW NAME> <NEW NAME>".
Also fixed RENAME followed by missing MODIFY
Change-Id: I8202f6e6ec33f7bd921e71da38677f2ee2dab87a
BUG: 1236282
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Signed-off-by: Milind Changire <mchangir@redhat.com>
Reviewed-on: http://review.gluster.org/11443
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Aravinda VK <avishwan@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
(cherry picked from commit adc704557a141a624fc702f7303b8b81582e1598)
Reviewed-on: http://review.gluster.org/11548
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'tools/glusterfind/src/main.py')
| -rw-r--r-- | tools/glusterfind/src/main.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py index 8d32295a78c..9a6a2aca097 100644 --- a/tools/glusterfind/src/main.py +++ b/tools/glusterfind/src/main.py @@ -433,7 +433,8 @@ def mode_pre(session_dir, args): # Multiple paths in case of Hardlinks paths = row[1].split(",") for p in paths: - if p == "": + if p == "" or p.replace("%2F%2F","%2F") == \ + row[2].replace("%2F%2F","%2F"): continue f.write("%s %s %s\n" % (row[0], p, row[2])) |