From 690c87816d412cc2a6c6f735c1941810bcb700ea Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Thu, 16 Apr 2015 09:24:52 +0200 Subject: Tests: fix spurious failure in read-subvol-entry.t read-subvol-entry.t tests that if a brick has pending operations, it is not used for readdir operations. On NetBSD this test exhibits spurious failures, with the wrong brick being used to perform readdir. It happens because when afr_replies_interpret() looks at xattr for pending attributes, it uses alternative bahvior whether it is working on a directory or another object. The decision is based on inode->ia_type, which may be IA_INVAL at that time if we come there from: afr_replies_interpret.() afr_xattrs_are_equal() afr_lookup_metadata_heal_chec() afr_lookup_entry_heal() afr_lookup_cbk() Using replies[i].poststat.ia_type, which is correctly set, works around the problem. Resubmitted as is after rebase. This is a backport of Id9ccdd8604f79a69db5f1902697f8913acac50ad BUG: 1138897 Change-Id: I73f5e04dec86e648a28363f417559b0cbf80324d Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/10178 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Raghavendra Bhat --- xlators/cluster/afr/src/afr-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/cluster/afr/src/afr-common.c') diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index ce287aa28e9..16b55347247 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -390,7 +390,7 @@ afr_replies_interpret (call_frame_t *frame, xlator_t *this, inode_t *inode) } afr_accused_fill (this, replies[i].xdata, data_accused, - (inode->ia_type == IA_IFDIR) ? + (replies[i].poststat.ia_type == IA_IFDIR) ? AFR_ENTRY_TRANSACTION : AFR_DATA_TRANSACTION); afr_accused_fill (this, replies[i].xdata, -- cgit