In req_capsule_server_grow() reply buffer can be increased
without re-allocation if has enough size already, don't do
that though if rs->rs_repbuf is a wrapper, e.g. with security
enabled. In that case re-allocation is still needed.
Re-enable test 272a in sanity.sh with SHARED_KEY
Test-Parameters: mdscount=2 mdtcount=4 envdefinitions=SHARED_KEY=true testlist=sanity,sanity-pfl
Signed-off-by: Mikhail Pershin <mpershin@whamcloud.com>
Change-Id: I0632b9513f877bea989b7a61a729e2db488dcfcc
Reviewed-on: https://review.whamcloud.com/36732
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
if (pa.lpa_blocks_cnt > 0) {
CDEBUG(D_DLMTRACE,
if (pa.lpa_blocks_cnt > 0) {
CDEBUG(D_DLMTRACE,
- "%s: refreshed %u locks timeout for req %p",
+ "%s: refreshed %u locks timeout for req %p\n",
tgt_name(tsi->tsi_tgt), pa.lpa_blocks_cnt, req);
RETURN(1);
}
tgt_name(tsi->tsi_tgt), pa.lpa_blocks_cnt, req);
RETURN(1);
}
len, newlen);
req_capsule_set_size(pill, field, RCL_SERVER, newlen);
len, newlen);
req_capsule_set_size(pill, field, RCL_SERVER, newlen);
- /* there can be enough space in current reply buffer */
- if (rs->rs_repbuf_len >=
+ /**
+ * There can be enough space in current reply buffer, make sure
+ * that rs_repbuf is not a wrapper but real reply msg, otherwise
+ * re-packing is still needed.
+ */
+ if (rs->rs_msg == rs->rs_repbuf &&
+ rs->rs_repbuf_len >=
lustre_packed_msg_size(rs->rs_msg) - len + newlen) {
pill->rc_req->rq_replen = lustre_grow_msg(rs->rs_msg, offset,
newlen);
lustre_packed_msg_size(rs->rs_msg) - len + newlen) {
pill->rc_req->rq_replen = lustre_grow_msg(rs->rs_msg, offset,
newlen);
ALWAYS_EXCEPT+=" 407 312 "
if $SHARED_KEY; then
ALWAYS_EXCEPT+=" 407 312 "
if $SHARED_KEY; then
- # bug number: LU-9795 LU-9795 LU-9795 LU-9795 LU-12781
- ALWAYS_EXCEPT+=" 17n 60a 133g 300f 272a"
+ # bug number: LU-9795 LU-9795 LU-9795 LU-9795
+ ALWAYS_EXCEPT+=" 17n 60a 133g 300f"
fi
selinux_status=$(getenforce)
fi
selinux_status=$(getenforce)
error "md5sum differ: $old_md5, $new_md5"
[ $($LFS getstripe -c $dom) -eq 2 ] ||
error "md5sum differ: $old_md5, $new_md5"
[ $($LFS getstripe -c $dom) -eq 2 ] ||
- error "migrate stripe count bad: $(LFS getstripe -c $dom) != 2"
+ error "bad final stripe count: $($LFS getstripe -c $dom) != 2"
}
run_test 272a "DoM migration: new layout with the same DOM component"
}
run_test 272a "DoM migration: new layout with the same DOM component"