From 1dc950035ab648499465e91a04e4b6ac459db6a4 Mon Sep 17 00:00:00 2001 From: Lei Xue Date: Sun, 25 Jun 2017 21:05:52 +0800 Subject: [PATCH] fix an issue in ALL.iSCSIcmdsn test case and add it in travis test --- .travis.yml | 1 + pkg/port/iscsit/iscsid.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7071f32..231acaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -75,6 +75,7 @@ script: - ./test-tool/iscsi-test-cu -d -A --test=ALL.Verify12 iscsi://127.0.0.1:3260/${TARGET}/0 - ./test-tool/iscsi-test-cu -d -A --test=ALL.Verify16 iscsi://127.0.0.1:3260/${TARGET}/0 - ./test-tool/iscsi-test-cu -d -A --test=ALL.iSCSITMF iscsi://127.0.0.1:3260/${TARGET}/0 + - ./test-tool/iscsi-test-cu -d -A --test=ALL.iSCSIcmdsn iscsi://127.0.0.1:3260/${TARGET}/0 - ./utils/iscsi-ls -s iscsi://127.0.0.1:3260/${TARGET} - ./utils/iscsi-inq iscsi://127.0.0.1:3260/${TARGET}/0 diff --git a/pkg/port/iscsit/iscsid.go b/pkg/port/iscsit/iscsid.go index ab20590..8c21c4e 100644 --- a/pkg/port/iscsit/iscsid.go +++ b/pkg/port/iscsit/iscsid.go @@ -586,6 +586,10 @@ func (s *ISCSITargetDriver) scsiCommandHandler(conn *iscsiConnection) (err error task.offset = 0 conn.rxTask = task if err = s.iscsiTaskQueueHandler(task); err != nil { + if task.state == taskPending { + s.handler(DATAIN, conn) + err = nil + } return } else { if scmd.Direction == api.SCSIDataRead && scmd.SenseBuffer == nil {