LU-4167 tests: correct version check to enable ff_convert

In conf-sanity.sh test_32d, filter fid convertion can be made only
when both of the following conditions are satisfied:
- client img version < 2.3.64 (struct filter_fid_old has been
introduced since 2.3.64)
- ost server version >= 2.5

Also, this patch fix the ofd_iocontrol() message to print the ioctl()
CMD argument as hex instead of a signed integer.

Test-Parameters: testlist=conf-sanity envdefinitions=SLOW=yes,ONLY=32 ossjob=lustre-b2_4 mdsjob=lustre-b2_4 ossbuildno=73 mdsbuildno=73 ossdistro=el6 mdsdistro=el6
Signed-off-by: Emoly Liu <emoly.liu@intel.com>
Change-Id: I43b2fc9b62b84b37f6fc8245ede584547a53c878
Reviewed-on: http://review.whamcloud.com/11574
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/ofd/ofd_obd.c b/lustre/ofd/ofd_obd.c
index 8bcbd06..aa39083 100644 (file)
--- a/lustre/ofd/ofd_obd.c
+++ b/lustre/ofd/ofd_obd.c
@@ -1591,7 +1591,7 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                rc = ofd_ioc_get_obj_version(&env, ofd, karg);
                break;
        default:
-               CERROR("%s: not supported cmd = %d\n", obd->obd_name, cmd);
+               CERROR("%s: not supported cmd = %#x\n", obd->obd_name, cmd);
                rc = -ENOTTY;
        }
 

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index f363fdb..10b571b 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1621,9 +1621,15 @@ t32_test() {
        echo "  Commit: $img_commit"
        echo "  Kernel: $img_kernel"
        echo "    Arch: $img_arch"
-
-       local version=$(version_code $img_commit)
-       [[ $version -ge $(version_code 2.5.0) ]] && ff_convert="no"
+       echo "OST version: $(get_lustre_version ost1)"
+
+       # The convertion can be made only when both of the following
+       # conditions are satisfied:
+       # - client img version < 2.3.64
+       # - ost server version >= 2.5
+       [ $(version_code $img_commit) -ge $(version_code 2.3.64) -o \
+               $(lustre_version_code ost1) -lt $(version_code 2.5.0) ] &&
+                       ff_convert="no"
 
        if [ $fstype == "zfs" ]; then
                # import pool first