admin/gotgt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #56 from carmark/cmdsn

Browse Source 
fix an issue in ALL.iSCSIcmdsn test case and add it in travis test
This commit is contained in:
Lei Xue
2017-06-25 21:21:59 +08:00
committed by GitHub
parent 46d5812805 1dc950035a
commit 77ddb4a8fc
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -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.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.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.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-ls -s iscsi://127.0.0.1:3260/${TARGET}
- ./utils/iscsi-inq iscsi://127.0.0.1:3260/${TARGET}/0 - ./utils/iscsi-inq iscsi://127.0.0.1:3260/${TARGET}/0

4
pkg/port/iscsit/iscsid.go
View File

@@ -586,6 +586,10 @@ func (s *ISCSITargetDriver) scsiCommandHandler(conn *iscsiConnection) (err error
task.offset = 0 task.offset = 0
conn.rxTask = task conn.rxTask = task
if err = s.iscsiTaskQueueHandler(task); err != nil { if err = s.iscsiTaskQueueHandler(task); err != nil {
if task.state == taskPending {
s.handler(DATAIN, conn)
err = nil
}
return return
} else { } else {
if scmd.Direction == api.SCSIDataRead && scmd.SenseBuffer == nil { if scmd.Direction == api.SCSIDataRead && scmd.SenseBuffer == nil {