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

Merge pull request #53 from carmark/async

Browse Source 
fix an NO_TASK issue in task management
This commit is contained in:
Lei Xue
2017-06-22 09:19:45 +08:00
committed by GitHub
parent 3eb2654e52 2cdc270f96
commit 59bebf79be
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@@ -6,6 +6,8 @@ env:
language: go language: go
go: go:
- 1.6 - 1.6
- 1.7
- 1.8
install: install:
- true - true
@@ -36,8 +38,7 @@ script:
- ./autogen.sh - ./autogen.sh
- ./configure 2>&1 >/dev/null - ./configure 2>&1 >/dev/null
- make 2>&1 >/dev/null - make 2>&1 >/dev/null
# This case will be failed, because the gotgt does not support async mode now. - ./test-tool/iscsi-test-cu -d -A -V --test=iSCSI.iSCSITMF iscsi://127.0.0.1:3260/${TARGET}/0
#- ./test-tool/iscsi-test-cu -d -A -V --test=iSCSI.iSCSITMF iscsi://127.0.0.1:3260/${TARGET}/0
- ./test-tool/iscsi-test-cu -d -A --test=SCSI.TestUnitReady iscsi://127.0.0.1:3260/${TARGET}/0 - ./test-tool/iscsi-test-cu -d -A --test=SCSI.TestUnitReady iscsi://127.0.0.1:3260/${TARGET}/0
- ./test-tool/iscsi-test-cu -d -A --test=SCSI.ReadCapacity10 iscsi://127.0.0.1:3260/${TARGET}/0 - ./test-tool/iscsi-test-cu -d -A --test=SCSI.ReadCapacity10 iscsi://127.0.0.1:3260/${TARGET}/0
- ./test-tool/iscsi-test-cu -d -A --test=SCSI.ReadCapacity16 iscsi://127.0.0.1:3260/${TARGET}/0 - ./test-tool/iscsi-test-cu -d -A --test=SCSI.ReadCapacity16 iscsi://127.0.0.1:3260/${TARGET}/0

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

@@ -756,7 +756,7 @@ func (s *ISCSITargetDriver) iscsiExecTask(task *iscsiTask) error {
sess := task.conn.session sess := task.conn.session
switch cmd.TaskFunc { switch cmd.TaskFunc {
case ISCSI_TM_FUNC_ABORT_TASK: case ISCSI_TM_FUNC_ABORT_TASK:
stask := &iscsiTask{} var stask *iscsiTask
sess.PendingTasksMutex.Lock() sess.PendingTasksMutex.Lock()
for i, t := range sess.PendingTasks { for i, t := range sess.PendingTasks {
if cmd.ReferencedTaskTag == t.tag { if cmd.ReferencedTaskTag == t.tag {