storage/posix: Move landfill inside .glusterfs

Change-Id: Ia2944f891dd62e72f3c79678c3a1fed389854a90
BUG: 811970
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/3158
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>

4 files changed, 114 insertions, 19 deletions

diff --git a/xlators/storage/posix/src/posix-handle.c b/xlators/storage/posix/src/posix-handle.c
index 38b28edc3..7c53bbc48 100644
--- a/xlators/storage/posix/src/posix-handle.c
+++ b/xlators/storage/posix/src/posix-handle.c
@@ -34,9 +34,11 @@
 #include "posix-handle.h"
 #include "posix.h"
 #include "xlator.h"
+#include "syscall.h"
 
 
 #define HANDLE_PFX ".glusterfs"
+#define TRASH_DIR "landfill"
 
 #define UUID0_STR "00000000-0000-0000-0000-000000000000"
 #define SLEN(str) (sizeof(str) - 1)
@@ -393,6 +395,107 @@ posix_handle_init (xlator_t *this)
         return 0;
 }
 
+gf_boolean_t
+posix_does_old_trash_exists (char *old_trash)
+{
+        uuid_t                gfid = {0};
+        gf_boolean_t          exists = _gf_false;
+        struct stat           stbuf = {0};
+        int                   ret = 0;
+
+        ret = lstat (old_trash, &stbuf);
+        if ((ret == 0) && S_ISDIR (stbuf.st_mode)) {
+                ret = sys_lgetxattr (old_trash, "trusted.gfid", gfid, 16);
+                if ((ret < 0) && (errno == ENODATA))
+                        exists = _gf_true;
+        }
+        return exists;
+}
+
+int
+posix_handle_new_trash_init (xlator_t *this, char *trash)
+{
+        int                     ret = 0;
+        struct stat             stbuf = {0};
+
+        ret = lstat (trash, &stbuf);
+        switch (ret) {
+        case -1:
+                if (errno == ENOENT) {
+                        ret = mkdir (trash, 0755);
+                        if (ret != 0) {
+                                gf_log (this->name, GF_LOG_ERROR,
+                                        "Creating directory %s failed: %s",
+                                        trash, strerror (errno));
+                        }
+                } else {
+                        gf_log (this->name, GF_LOG_ERROR, "Checking for %s "
+                                "failed: %s", trash, strerror (errno));
+                }
+                break;
+        case 0:
+                if (!S_ISDIR (stbuf.st_mode)) {
+                        gf_log (this->name, GF_LOG_ERROR,
+                                "Not a directory: %s", trash);
+                        ret = -1;
+                }
+                break;
+        default:
+                break;
+        }
+        return ret;
+}
+
+int
+posix_mv_old_trash_into_new_trash (xlator_t *this, char *old, char *new)
+{
+        char                  dest_old[PATH_MAX] = {0};
+        int                   ret = 0;
+        uuid_t                dest_name = {0};
+
+        if (!posix_does_old_trash_exists (old))
+                goto out;
+        uuid_generate (dest_name);
+        snprintf (dest_old, sizeof (dest_old), "%s/%s", new,
+                  uuid_utoa (dest_name));
+        ret = rename (old, dest_old);
+        if (ret < 0) {
+                gf_log (this->name, GF_LOG_ERROR, "Not able to move "
+                        "%s -> %s (%s)", old, dest_old, strerror (errno));
+        }
+out:
+        return ret;
+}
+
+int
+posix_handle_trash_init (xlator_t *this)
+{
+        int                   ret = -1;
+        struct posix_private  *priv = NULL;
+        char                  old_trash[PATH_MAX] = {0};
+
+        priv = this->private;
+
+        priv->trash_path = GF_CALLOC (1, priv->base_path_length + strlen ("/")
+                                      + strlen (HANDLE_PFX) + strlen ("/")
+                                      + strlen (TRASH_DIR) + 1,
+                                      gf_posix_mt_trash_path);
+
+        if (!priv->trash_path)
+                goto out;
+
+        strncpy (priv->trash_path, priv->base_path, priv->base_path_length);
+        strcat (priv->trash_path, "/" HANDLE_PFX "/" TRASH_DIR);
+        ret = posix_handle_new_trash_init (this, priv->trash_path);
+        if (ret)
+                goto out;
+        snprintf (old_trash, sizeof (old_trash), "%s/.landfill",
+                  priv->base_path);
+        ret = posix_mv_old_trash_into_new_trash (this, old_trash,
+                                                 priv->trash_path);
+out:
+        return ret;
+}
 
 int
 posix_handle_mkdir_hashes (xlator_t *this, const char *newpath)
diff --git a/xlators/storage/posix/src/posix-handle.h b/xlators/storage/posix/src/posix-handle.h
index ec4baec5b..560d7aac8 100644
--- a/xlators/storage/posix/src/posix-handle.h
+++ b/xlators/storage/posix/src/posix-handle.h
@@ -148,4 +148,6 @@ int posix_handle_init (xlator_t *this);
 int posix_create_link_if_gfid_exists (xlator_t *this, uuid_t gfid,
                                       char *real_path);
 
+int
+posix_handle_trash_init (xlator_t *this);
 #endif /* !_POSIX_HANDLE_H */
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c
index 06b5cedcb..71e1eb495 100644
--- a/xlators/storage/posix/src/posix-helpers.c
+++ b/xlators/storage/posix/src/posix-helpers.c
@@ -833,7 +833,7 @@ posix_janitor_thread_proc (void *data)
                 time (&now);
                 if ((now - priv->last_landfill_check) > priv->janitor_sleep_duration) {
                         gf_log (this->name, GF_LOG_TRACE,
-                                "janitor cleaning out /" GF_REPLICATE_TRASH_DIR);
+                                "janitor cleaning out %s", priv->trash_path);
 
                         nftw (priv->trash_path,
                               janitor_walker,
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index 7dbd7546c..5bfaa4214 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -3536,10 +3536,6 @@ posix_fill_readdir (fd_t *fd, DIR *dir, off_t off, size_t size,
                         break;
                 }
 
-                if ((uuid_compare (fd->inode->gfid, rootgfid) == 0)
-                    && (!strcmp (entry->d_name, GF_REPLICATE_TRASH_DIR)))
-                        continue;
-
 #ifdef __NetBSD__
 	       /*
 		* NetBSD with UFS1 backend uses backing files for
@@ -4068,20 +4064,6 @@ init (xlator_t *this)
         _private->base_path = gf_strdup (dir_data->data);
         _private->base_path_length = strlen (_private->base_path);
 
-        _private->trash_path = GF_CALLOC (1, _private->base_path_length
-                                          + strlen ("/")
-                                          + strlen (GF_REPLICATE_TRASH_DIR)
-                                          + 1,
-                                          gf_posix_mt_trash_path);
-
-        if (!_private->trash_path) {
-                ret = -1;
-                goto out;
-        }
-
-        strncpy (_private->trash_path, _private->base_path, _private->base_path_length);
-        strcat (_private->trash_path, "/" GF_REPLICATE_TRASH_DIR);
-
         LOCK_INIT (&_private->lock);
 
         ret = dict_get_str (this->options, "hostname", &_private->hostname);
@@ -4217,6 +4199,14 @@ init (xlator_t *this)
                 goto out;
         }
 
+        op_ret = posix_handle_trash_init (this);
+        if (op_ret < 0) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "Posix landfill setup failed");
+                ret = -1;
+                goto out;
+        }
+
         pthread_mutex_init (&_private->janitor_lock, NULL);
         pthread_cond_init (&_private->janitor_cond, NULL);
         INIT_LIST_HEAD (&_private->janitor_fds);