1 files changed, 84 insertions, 24 deletions

diff --git a/xlators/features/read-only/src/worm.c b/xlators/features/read-only/src/worm.c
index 24196f83931..1cc5526d5cd 100644
--- a/xlators/features/read-only/src/worm.c
+++ b/xlators/features/read-only/src/worm.c
@@ -292,6 +292,12 @@ worm_setattr(call_frame_t *frame, xlator_t *this, loc_t *loc,
                     goto out;
                 }
             }
+            reten_state.ret_period = reten_state.ret_period + stbuf->ia_atime -
+                                     stpre.ia_atime;
+            ret = gf_worm_set_xattr(this, &reten_state, _gf_false, loc);
+            if (ret) {
+                goto out;
+            }
             stbuf->ia_mtime = stpre.ia_mtime;
         }
     }
@@ -372,6 +378,13 @@ worm_fsetattr(call_frame_t *frame, xlator_t *this, fd_t *fd, struct iatt *stbuf,
                     goto out;
                 }
             }
+            reten_state.ret_period = reten_state.ret_period + stbuf->ia_atime -
+                                     stpre.ia_atime;
+            ret = gf_worm_set_xattr(this, &reten_state, _gf_true, fd);
+            if (ret) {
+                goto out;
+            }
+
             stbuf->ia_mtime = stpre.ia_mtime;
         }
     }
@@ -427,29 +440,22 @@ worm_create_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
 {
     int ret = 0;
     read_only_priv_t *priv = NULL;
-    dict_t *dict = NULL;
+    // In case of an error exit because fd can be NULL and this would
+    // cause an segfault when performing fsetxattr . We explicitly
+    // unwind to avoid future problems
+    if (op_ret < 0) {
+        goto out;
+    }
 
     priv = this->private;
     GF_ASSERT(priv);
     if (priv->worm_file) {
-        dict = dict_new();
-        if (!dict) {
-            gf_log(this->name, GF_LOG_ERROR,
-                   "Error creating the "
-                   "dict");
-            goto out;
-        }
-        ret = dict_set_int8(dict, "trusted.worm_file", 1);
+        ret = fd_ctx_set(fd, this, 1);
         if (ret) {
             gf_log(this->name, GF_LOG_ERROR,
-                   "Error in setting "
-                   "the dict");
-            goto out;
-        }
-        ret = syncop_fsetxattr(this, fd, dict, 0, NULL, NULL);
-        if (ret) {
-            gf_log(this->name, GF_LOG_ERROR, "Error setting xattr");
-            goto out;
+                   "Failed to set the fd ctx "
+                   "for gfid:%s . Worm feature may not work for the gfid",
+                   uuid_utoa(inode->gfid));
         }
         ret = worm_init_state(this, _gf_true, fd);
         if (ret) {
@@ -460,8 +466,6 @@ worm_create_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
 out:
     STACK_UNWIND_STRICT(create, frame, op_ret, op_errno, fd, inode, buf,
                         preparent, postparent, xdata);
-    if (dict)
-        dict_unref(dict);
     return ret;
 }
 
@@ -519,8 +523,8 @@ init(xlator_t *this)
 
     GF_OPTION_INIT("worm", priv->readonly_or_worm_enabled, bool, out);
     GF_OPTION_INIT("worm-file-level", priv->worm_file, bool, out);
-    GF_OPTION_INIT("default-retention-period", priv->reten_period, uint64, out);
-    GF_OPTION_INIT("auto-commit-period", priv->com_period, uint64, out);
+    GF_OPTION_INIT("default-retention-period", priv->reten_period, int64, out);
+    GF_OPTION_INIT("auto-commit-period", priv->com_period, int64, out);
     GF_OPTION_INIT("retention-mode", reten_mode, str, out);
     set_reten_mode(priv, reten_mode);
     GF_OPTION_INIT("worm-files-deletable", priv->worm_files_deletable, bool,
@@ -545,10 +549,10 @@ reconfigure(xlator_t *this, dict_t *options)
                      out);
     GF_OPTION_RECONF("worm-file-level", priv->worm_file, options, bool, out);
     GF_OPTION_RECONF("default-retention-period", priv->reten_period, options,
-                     uint64, out);
+                     int64, out);
     GF_OPTION_RECONF("retention-mode", reten_mode, options, str, out);
     set_reten_mode(priv, reten_mode);
-    GF_OPTION_RECONF("auto-commit-period", priv->com_period, options, uint64,
+    GF_OPTION_RECONF("auto-commit-period", priv->com_period, options, int64,
                      out);
     GF_OPTION_RECONF("worm-files-deletable", priv->worm_files_deletable,
                      options, bool, out);
@@ -569,6 +573,7 @@ fini(xlator_t *this)
     mem_put(priv);
     this->private = NULL;
     mem_pool_destroy(this->local_pool);
+    this->local_pool = NULL;
 out:
     return;
 }
@@ -596,7 +601,62 @@ struct xlator_fops fops = {
     .lk = ro_lk,
 };
 
-struct xlator_cbks cbks;
+int32_t
+worm_release(xlator_t *this, fd_t *fd)
+{
+    dict_t *dict = NULL;
+    int ret = -1;
+    dict = dict_new();
+    uint64_t value = 0;
+    loc_t loc = {
+        0,
+    };
+    read_only_priv_t *priv = NULL;
+    priv = this->private;
+
+    if (priv->worm_file) {
+        if (!dict) {
+            gf_log(this->name, GF_LOG_ERROR, "Error creating the dict");
+            goto out;
+        }
+
+        ret = fd_ctx_get(fd, this, &value);
+        if (ret) {
+            gf_log(this->name, GF_LOG_DEBUG, "Failed to get the fd ctx");
+        }
+        if (!value) {
+            goto out;
+        }
+
+        ret = dict_set_int8(dict, "trusted.worm_file", 1);
+        if (ret) {
+            gf_log(this->name, GF_LOG_ERROR,
+                   "Error in setting "
+                   "the dict");
+            goto out;
+        }
+
+        loc.inode = inode_ref(fd->inode);
+        gf_uuid_copy(loc.gfid, fd->inode->gfid);
+        ret = syncop_setxattr(this, &loc, dict, 0, NULL, NULL);
+        if (ret) {
+            gf_log(this->name, GF_LOG_ERROR, "Error setting xattr");
+            goto out;
+        }
+
+        gf_worm_state_transition(this, _gf_false, &loc, GF_FOP_WRITE);
+    }
+
+out:
+    loc_wipe(&loc);
+    if (dict)
+        dict_unref(dict);
+    return 0;
+}
+
+struct xlator_cbks cbks = {
+    .release = worm_release,
+};
 
 struct volume_options options[] = {
     {.key = {"worm"},