Add option to disable multipath and other fixes

Signed-off-by: Utkarsh Mani Tripathi <utkarsh.tripathi@mayadata.io>

pkg/port/iscsit/cmd.go

@@ -371,7 +371,6 @@ func (m *ISCSICommand) dataInBytes() []byte {
 	copy(buf[36:], util.MarshalUint32(m.DataSN))
 	copy(buf[40:], util.MarshalUint32(m.BufferOffset))
 	copy(buf[44:], util.MarshalUint32(m.Resid))
-	copy(buf[48:], m.RawData[m.BufferOffset:m.BufferOffset+uint32(m.DataLen)])
 	if m.ExpectedDataLen != 0 {
 		copy(buf[48:], m.RawData[m.BufferOffset:m.BufferOffset+uint32(m.DataLen)])
 	}

pkg/port/iscsit/iscsid.go

@@ -55,7 +55,6 @@ type ISCSITargetDriver struct {
 	TSIHPoolMutex     sync.Mutex
 	isClientConnected bool
 	enableStats       bool
-	SCSIIOCount       map[int]int64
 	mu                *sync.RWMutex
 	l                 net.Listener
 	state             uint8
@@ -77,8 +76,8 @@ func NewISCSITargetDriver(base *scsi.SCSITargetService) (scsi.SCSITargetDriver,
 	}
 
 	if EnableStats {
-		driver.SCSIIOCount = map[int]int64{}
 		driver.enableStats = true
+		driver.TargetStats.SCSIIOCount = map[int]int64{}
 	}
 	return driver, nil
 }
@@ -631,10 +630,12 @@ func (s *ISCSITargetDriver) scsiCommandHandler(conn *iscsiConnection) (err error
 	switch req.OpCode {
 	case OpSCSICmd:
 		log.Debugf("SCSI Command processing...")
-		if _, ok := s.SCSIIOCount[(int)(req.CDB[0])]; ok != false {
-			s.SCSIIOCount[(int)(req.CDB[0])] += 1
-		} else {
-			s.SCSIIOCount[(int)(req.CDB[0])] = 1
+		if s.enableStats {
+			if _, ok := s.TargetStats.SCSIIOCount[(int)(req.CDB[0])]; ok != false {
+				s.TargetStats.SCSIIOCount[(int)(req.CDB[0])] += 1
+			} else {
+				s.TargetStats.SCSIIOCount[(int)(req.CDB[0])] = 1
+			}
 		}
 		scmd := &api.SCSICommand{
 			ITNexusID:       conn.session.ITNexus.ID,