summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b3ee5c2)
This patch adds Lustre version check codes into conf-sanity test
56 to make the test interoperate with servers that do not have
the following changes:
Lustre-commit:
3dc232918c7c9b95398ac6a0dc4c2130adc2851d
Lustre-change: http://review.whamcloud.com/12145
or
Lustre-commit:
e6745116cc372647f785c4063389734620c92e91
Lustre-change: http://review.whamcloud.com/12319
Test-Parameters: alwaysuploadlogs envdefinitions=ONLY=56 \
ossjob=lustre-b2_4 mdsjob=lustre-b2_4 ossbuildno=73 mdsbuildno=73 \
testlist=conf-sanity
Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: I903d9d5779cedd5b73a903b3b0d46c102ab038fd
Reviewed-on: http://review.whamcloud.com/13046
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Li Wei <wei.g.li@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
run_test 55 "check lov_objid size"
test_56() {
run_test 55 "check lov_objid size"
test_56() {
+ local server_version=$(lustre_version_code $SINGLEMDS)
local mds_journal_size_orig=$MDSJOURNALSIZE
local n
local mds_journal_size_orig=$MDSJOURNALSIZE
local n
mount_client $MOUNT || error "Unable to mount client"
echo ok
$LFS osts
mount_client $MOUNT || error "Unable to mount client"
echo ok
$LFS osts
- wait_osc_import_state mds ost1 FULL
- wait_osc_import_state mds ost2 FULL
- $LFS setstripe --stripe-count=-1 $DIR/$tfile || error "Unable to create"
- n=$($LFS getstripe --stripe-count $DIR/$tfile)
- [ "$n" -eq 2 ] || error "Stripe count not two: $n"
- rm $DIR/$tfile
+
+ if [[ $server_version -ge $(version_code 2.6.54) ]] ||
+ [[ $server_version -ge $(version_code 2.5.4) &&
+ $server_version -lt $(version_code 2.5.11) ]]; then
+ wait_osc_import_state mds ost1 FULL
+ wait_osc_import_state mds ost2 FULL
+ $SETSTRIPE --stripe-count=-1 $DIR/$tfile ||
+ error "Unable to setstripe $DIR/$tfile"
+ n=$($GETSTRIPE --stripe-count $DIR/$tfile)
+ [[ $n -eq 2 ]] || error "Stripe count not two: $n"
+ rm $DIR/$tfile
+ fi
+
stopall
MDSJOURNALSIZE=$mds_journal_size_orig
reformat
stopall
MDSJOURNALSIZE=$mds_journal_size_orig
reformat