summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Pandey <vishpandey2014@gmail.com>2017-10-24 14:26:45 +0530
committerJeff Darcy <jeff@pl.atyp.us>2017-10-30 16:00:46 +0000
commit4edea128916eb76ec94fde90407eb70af6493337 (patch)
tree3f7a29d589183ed9e310f7de88028bc9cdb45733
parent933ec57ccda2c1ba5ce6f207313c3b6802e67ca3 (diff)
write once read many: file appendable in worm state
Issue: A new file is appendable even when file level worm is 1. Fix: Do a state transition in writev function in worm.c file. Steps To Test: 1- Activate file level worm. 2- Create a new file. 3- Leave file dormant for auto commit period. 4- Try and append some content to the file. 5- check the file if new content has been appended or not. 6- check if file has been transitioned to Worm Retention state. Change-Id: I52d50ad888cb0c39ad54be9352ccb07d48b8d71a BUG: 1505807 Signed-off-by: Vishal Pandey <vishpandey2014@gmail.com>
-rwxr-xr-xtests/features/worm.t7
-rw-r--r--xlators/features/read-only/src/worm.c11
2 files changed, 8 insertions, 10 deletions
diff --git a/tests/features/worm.t b/tests/features/worm.t
index f8f0506..c725f58 100755
--- a/tests/features/worm.t
+++ b/tests/features/worm.t
@@ -57,6 +57,13 @@ TEST rm -f $M0/file2
sleep 10
TEST rm -f $M0/file1
+## Test for state transition over write.
+TEST `echo "worm 1" > $M0/file3`
+sleep 5
+TEST `echo "worm 2" >> $M0/file3`
+EXPECT 'worm 1' cat $M0/file3
+TEST ! rm -f $M0/file3
+
TEST $CLI volume stop $V0
EXPECT 'Stopped' volinfo_field $V0 'Status'
diff --git a/xlators/features/read-only/src/worm.c b/xlators/features/read-only/src/worm.c
index 2e930c3..9d034a5 100644
--- a/xlators/features/read-only/src/worm.c
+++ b/xlators/features/read-only/src/worm.c
@@ -403,10 +403,8 @@ worm_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
struct iovec *vector, int32_t count, off_t offset, uint32_t flags,
struct iobref *iobref, dict_t *xdata)
{
- worm_reten_state_t reten_state = {0,};
read_only_priv_t *priv = NULL;
int op_errno = EROFS;
- int ret = -1;
priv = this->private;
GF_ASSERT (priv);
@@ -418,14 +416,7 @@ worm_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
op_errno = 0;
goto out;
}
- ret = worm_get_state (this, _gf_true, fd, &reten_state);
- if (ret) {
- if (ret == -1)
- op_errno = 0;
- goto out;
- }
- if (!reten_state.worm)
- op_errno = 0;
+ op_errno = gf_worm_state_transition (this, _gf_true, fd, GF_FOP_WRITE);
out:
if (op_errno)