diff options
| author | Vishal Pandey <vpandey@redhat.com> | 2019-08-08 11:46:46 +0530 | 
|---|---|---|
| committer | Amar Tumballi <amarts@gmail.com> | 2019-10-23 04:04:22 +0000 | 
| commit | 47465050c43f93294a3be27b4b0b1a3715a2c83d (patch) | |
| tree | 954b1dadbbead0347d96d445d54b21f6fdf3a990 | |
| parent | 4e9e2cc8f7990ab6deb661c5da98386cd3940d46 (diff) | |
Worm: xattr update on changing access time of a WORM-Retained file
Retention-period must be updated on changing the access time
of a worm-retained file. Retention-period must be changed in the
"trusted.reten-state" xattr
Change-Id: Ieab758a4cf6da3b4bb1d6a3e4f95f400c8a11f1d
Fixes: bz#1554286
| -rwxr-xr-x | tests/features/worm.t | 31 | ||||
| -rw-r--r-- | xlators/features/read-only/src/worm.c | 13 | 
2 files changed, 44 insertions, 0 deletions
diff --git a/tests/features/worm.t b/tests/features/worm.t index 9766dc1ad2b..8b2574c8a47 100755 --- a/tests/features/worm.t +++ b/tests/features/worm.t @@ -72,6 +72,37 @@ sleep 10  TEST `echo "worm 1" >> $M0/file4`  TEST ! rm -f $M0/file4 +## Test for checking if retention-period is updated on increasing the access time of a WORM-RETAINED file. +TEST $CLI volume set $V0 features.worm-files-deletable 1 +TEST `echo "worm 1" >> $M0/file1` +initial_timestamp=$(date +%s) +current_time_seconds=$(date +%S); +TEST chmod 0444 $M0/file1 +EXPECT '3/10/5' echo $(getfattr -e text --absolute-names --only-value -n "trusted.reten_state" $B0/${V0}1/file1) +changed_timestamp=$(date +%Y%m%d%H%M --date '60 seconds'); +seconds_diff=`expr 60 - $((current_time_seconds))` +TEST `touch -a -t "${changed_timestamp}" $M0/file1` +EXPECT "3/$seconds_diff/5" echo $(getfattr -e text --absolute-names --only-value -n "trusted.reten_state" $B0/${V0}1/file1) +sleep $seconds_diff +TEST `echo "worm 2" >> $M0/file1` +EXPECT  "$initial_timestamp" echo $(stat --printf %X $M0/file1) + + +## Test for checking if retention-period is updated on decreasing the access time of a WORM-RETAINED file +TEST $CLI volume set $V0 features.default-retention-period 120 +initial_timestamp=$(date +%s) +current_time_seconds=$(date +%S); +TEST chmod 0444 $M0/file1 +EXPECT '3/120/5' echo $(getfattr -e text --absolute-names --only-value -n "trusted.reten_state" $B0/${V0}1/file1) +changed_timestamp=$(date +%Y%m%d%H%M --date '60 seconds'); +seconds_diff=`expr 60 - $((current_time_seconds))` +TEST `touch -a -t "${changed_timestamp}" $M0/file1` +EXPECT "3/$seconds_diff/5" echo $(getfattr -e text --absolute-names --only-value -n "trusted.reten_state" $B0/${V0}1/file1) +sleep $seconds_diff +TEST `echo "worm 4" >> $M0/file1` +EXPECT  "$initial_timestamp" echo $(stat --printf %X $M0/file1) +TEST rm -f $M0/file1 +  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 48d62e0ed86..46078c1a96e 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;          }      }  | 
