From 6404f9adc4d9883566e9d48b297b894ba5e85dfb Mon Sep 17 00:00:00 2001 From: Lei Xue Date: Thu, 22 Jun 2017 09:12:31 +0800 Subject: [PATCH 1/2] fix NO_TASK issue in task management function --- pkg/port/iscsit/iscsid.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/port/iscsit/iscsid.go b/pkg/port/iscsit/iscsid.go index c822043..ab20590 100644 --- a/pkg/port/iscsit/iscsid.go +++ b/pkg/port/iscsit/iscsid.go @@ -756,7 +756,7 @@ func (s *ISCSITargetDriver) iscsiExecTask(task *iscsiTask) error { sess := task.conn.session switch cmd.TaskFunc { case ISCSI_TM_FUNC_ABORT_TASK: - stask := &iscsiTask{} + var stask *iscsiTask sess.PendingTasksMutex.Lock() for i, t := range sess.PendingTasks { if cmd.ReferencedTaskTag == t.tag { From 2cdc270f968d6b0a4b9668110394dae8d20aa0f1 Mon Sep 17 00:00:00 2001 From: Lei Xue Date: Thu, 22 Jun 2017 09:14:23 +0800 Subject: [PATCH 2/2] add ISCSITMF test case back to travis test --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b46cc70..3504d8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ env: language: go go: - 1.6 + - 1.7 + - 1.8 install: - true @@ -36,8 +38,7 @@ script: - ./autogen.sh - ./configure 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.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