diff options
| author | Anand Avati <avati@redhat.com> | 2013-01-29 23:56:25 -0800 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-01-30 23:43:49 -0800 |
| commit | b5a6d4bd97800dd00849677c2ace4417dd914ccc (patch) | |
| tree | 5dd9eadfb7a658ea03bfc7b59bf65f9d46465957 /tests | |
| parent | 12689595abd50d13711f855dddfb5cfe51f40455 (diff) | |
fuse-bridge: fix some breakages from lock migration patch
- do not attempt lock migration if no locks were ever acquired on
an fd.
- fix fd_lk_ctx_t ref leak during fd migration
- remove spurious fd_unref() (probably added to compensate for
the fd_ref leak in syncop_open_cbk)
- remove @newfdptr out-param which makes fd ref management really
tricky (and currently refs were unmanaged for the out-param).
Instead acquire ref and unref within lock migration function.
Change-Id: I4cc9c451f0df4c051612bd1fa7bef11e801570e4
BUG: 808400
Signed-off-by: Anand Avati <avati@redhat.com>
Reviewed-on: http://review.gluster.org/4453
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/bugs/bug-808400-dist.t | 5 | ||||
| -rwxr-xr-x | tests/bugs/bug-808400-repl.t | 5 | ||||
| -rwxr-xr-x | tests/bugs/bug-808400-stripe.t | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/tests/bugs/bug-808400-dist.t b/tests/bugs/bug-808400-dist.t index 7bbca18daef..a404cdba971 100755 --- a/tests/bugs/bug-808400-dist.t +++ b/tests/bugs/bug-808400-dist.t @@ -22,9 +22,7 @@ EXPECT 'Created' volinfo_field $V0 'Status'; TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; -#mount on a random dir -TEST MOUNTDIR="/tmp/$RANDOM" -TEST mkdir $MOUNTDIR +MOUNTDIR=$M0; TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR; function cleanup_tester () @@ -52,6 +50,5 @@ TEST rm -rf $MOUNTDIR/* TEST rm -rf $(dirname $0)/bug-808400-flock $(dirname $0)/bug-808400-fcntl $(dirname $0)/glusterfs.log TEST umount $MOUNTDIR -l -TEST rm -rf $MOUNTDIR cleanup;
\ No newline at end of file diff --git a/tests/bugs/bug-808400-repl.t b/tests/bugs/bug-808400-repl.t index f7c368405b9..d11bd250487 100755 --- a/tests/bugs/bug-808400-repl.t +++ b/tests/bugs/bug-808400-repl.t @@ -22,9 +22,7 @@ EXPECT 'Created' volinfo_field $V0 'Status'; TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; -#mount on a random dir -TEST MOUNTDIR="/tmp/$RANDOM" -TEST mkdir $MOUNTDIR +MOUNTDIR=$M0; TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR; function cleanup_tester () @@ -52,6 +50,5 @@ TEST rm -rf $MOUNTDIR/* TEST rm -rf $(dirname $0)/bug-808400-flock $(dirname $0)/bug-808400-fcntl $(dirname $0)/glusterfs.log TEST umount $MOUNTDIR -l -TEST rm -rf $MOUNTDIR cleanup;
\ No newline at end of file diff --git a/tests/bugs/bug-808400-stripe.t b/tests/bugs/bug-808400-stripe.t index 3870ef76703..3edf7a1f9d6 100755 --- a/tests/bugs/bug-808400-stripe.t +++ b/tests/bugs/bug-808400-stripe.t @@ -22,9 +22,7 @@ EXPECT 'Created' volinfo_field $V0 'Status'; TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; -#mount on a random dir -TEST MOUNTDIR="/tmp/$RANDOM" -TEST mkdir $MOUNTDIR +MOUNTDIR=$M0; TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $MOUNTDIR; function cleanup_tester () @@ -52,6 +50,5 @@ TEST rm -rf $MOUNTDIR/* TEST rm -rf $(dirname $0)/bug-808400-flock $(dirname $0)/bug-808400-fcntl $(dirname $0)/glusterfs.log TEST umount $MOUNTDIR -l -TEST rm -rf $MOUNTDIR cleanup;
\ No newline at end of file |