posix: Do not move and recreate .glusterfs/unlink directory

Problem:
At the time of start of a volume, it is checked if
.glusterfs/unlink exist or not. If it does, move it
to landfill and recreate unlink directory. If a volume
is mounted and we write data on it till we face ENOSPC,
restart of that volume fails as it will not be able to
create unlink dir. mkdir will fail with ENOSPC.
This will not allow volume to restart.

Solution:
If .glusterfs/unlink directory exist, don't move it to
landfill. Delete all the entries inside it.

Change-Id: Icde3fb36012f2f01aeb119a2da042f761203c11f
BUG: 1360679
Signed-off-by: Ashish Pandey <aspandey@redhat.com>
Reviewed-on: http://review.gluster.org/15030
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>

2 files changed, 94 insertions, 11 deletions

diff --git a/tests/bugs/posix/bug-1360679.t b/tests/bugs/posix/bug-1360679.t
new file mode 100644
index 00000000000..fbb9d027ddb
--- /dev/null
+++ b/tests/bugs/posix/bug-1360679.t
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+. $(dirname $0)/../../fileio.rc
+
+cleanup
+function num_entries {
+        ls -l $1 | wc -l
+}
+
+function create_unlink_entry {
+	for i in {0..1}
+	do
+		mkdir -p $B0/${V0}$i/.glusterfs/unlink/{1..3}/{1..10}/1
+		dd if=/dev/urandom of=$B0/${V0}$i/.glusterfs/unlink/file-1 bs=1M count=1
+		dd if=/dev/urandom of=$B0/${V0}$i/.glusterfs/unlink/file-2 bs=1M count=1
+		dd if=/dev/urandom of=$B0/${V0}$i/.glusterfs/unlink/1/file-1 bs=1M count=1
+		dd if=/dev/urandom of=$B0/${V0}$i/.glusterfs/unlink/2/file-1 bs=1M count=1
+		dd if=/dev/urandom of=$B0/${V0}$i/.glusterfs/unlink/3/file-1 bs=1M count=1
+		ln $B0/${V0}$i/.glusterfs/unlink/file-1 $B0/${V0}$i/.glusterfs/unlink/file-link
+		ln -s $B0/${V0}$i/.glusterfs/unlink/1 $B0/${V0}$i/.glusterfs/unlink/link
+		ln -s $B0/${V0}$i/.glusterfs/unlink/2 $B0/${V0}$i/.glusterfs/unlink/link-2
+	done
+}
+
+TEST glusterd
+TEST pidof glusterd
+TEST $CLI volume create $V0 disperse 6 redundancy 2 $H0:$B0/${V0}{0..5}
+TEST $CLI volume start $V0
+TEST $CLI volume stop $V0
+create_unlink_entry
+TEST $CLI volume start $V0
+EXPECT_WITHIN $UNLINK_TIMEOUT "^1$" num_entries $B0/${V0}0/.glusterfs/unlink/
+EXPECT_WITHIN $UNLINK_TIMEOUT "^1$" num_entries $B0/${V0}1/.glusterfs/unlink/
+cleanup;
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 0598b9525df..65b28dc8d21 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -26,6 +26,7 @@
 #include <signal.h>
 #include <sys/uio.h>
 #include <unistd.h>
+#include <ftw.h>
 
 #ifndef GF_BSD_HOST_OS
 #include <alloca.h>
@@ -6674,6 +6675,61 @@ out:
 }
 
 int32_t
+posix_delete_unlink_entry (const char *fpath, const struct stat *sb,
+                   int typeflag, struct FTW *ftwbuf) {
+
+        int    ret = 0;
+
+        if (!fpath)
+                goto out;
+
+        switch (typeflag) {
+        case FTW_SL:
+        case FTW_NS:
+        case FTW_F:
+        case FTW_SLN:
+                ret = sys_unlink(fpath);
+                break;
+        case FTW_D:
+        case FTW_DP:
+        case FTW_DNR:
+                if (ftwbuf->level != 0) {
+                        ret = sys_rmdir(fpath);
+                }
+                break;
+        default:
+                break;
+        }
+        if (ret) {
+                gf_msg ("posix_delete_unlink_entry", GF_LOG_WARNING, errno,
+                        P_MSG_HANDLE_CREATE,
+                        "Deletion of entries %s failed"
+                        "Please delete it manually",
+                        fpath);
+        }
+out:
+        return 0;
+}
+
+int32_t
+posix_delete_unlink (const char *unlink_path) {
+
+        int    ret = -1;
+        int    flags = 0;
+
+        flags |= (FTW_DEPTH | FTW_PHYS);
+
+        ret = nftw(unlink_path, posix_delete_unlink_entry, 2, flags);
+        if (ret) {
+                gf_msg ("posix_delete_unlink", GF_LOG_ERROR, 0,
+                        P_MSG_HANDLE_CREATE,
+                        "Deleting files from  %s failed",
+                        unlink_path);
+        }
+        return ret;
+}
+
+int32_t
 posix_create_unlink_dir (xlator_t *this) {
 
         struct posix_private *priv = NULL;
@@ -6714,15 +6770,8 @@ posix_create_unlink_dir (xlator_t *this) {
                                 unlink_path);
                         return -1;
                 }
-                ret = sys_rename (unlink_path, landfill_path);
-                if (ret) {
-                        gf_msg (this->name, GF_LOG_ERROR, errno,
-                                P_MSG_HANDLE_CREATE,
-                                "Can not delete directory %s ",
-                                unlink_path);
-                        return -1;
-                }
-                break;
+                ret = posix_delete_unlink (unlink_path);
+                return 0;
         default:
                 break;
         }
@@ -6738,8 +6787,6 @@ posix_create_unlink_dir (xlator_t *this) {
         return 0;
 }
 
-
-
 /**
  * init -
  */