Log out from multiple portals with iscsi storage plugin

When using iscsi storage with multiple target portal (TP) addresses and multipathing the volume manager logs on to the IQN for all portal addresses, but when a pod gets destroyed the volume manager only logs out for the primary TP and sessions for another TPs are always remained. This patch adds methods to store and load iscsi disk configrations, then uses the stored config at DetachDisk path. Fix #45394

Log out from multiple portals with iscsi storage plugin
aebaee39 · mtanino · 7043372d · aebaee39 · aebaee39 · aebaee39
Commit aebaee39 authored May 31, 2017 by mtanino
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 6 deletions

iscsi.go pkg/volume/iscsi/iscsi.go +6 -6

iscsi_util.go pkg/volume/iscsi/iscsi_util.go +0 -0

iscsi_util_test.go pkg/volume/iscsi/iscsi_util_test.go +10 -0

No files found.
--- a/pkg/volume/iscsi/iscsi.go
+++ b/pkg/volume/iscsi/iscsi.go
@@ -136,10 +136,10 @@ func (plugin *iscsiPlugin) newMounterInternal(spec *volume.Spec, podUID types.UI
 		iscsiDisk: &iscsiDisk{
 			podUID:         podUID,
 			volName:        spec.Name(),
-			portals:        bkportal,
-			iqn:            iscsi.IQN,
+			Portals:        bkportal,
+			Iqn:            iscsi.IQN,
 			lun:            lun,
-			iface:          iface,
+			Iface:          iface,
 			chap_discovery: iscsi.DiscoveryCHAPAuth,
 			chap_session:   iscsi.SessionCHAPAuth,
 			secret:         secret,
@@ -191,10 +191,10 @@ func (plugin *iscsiPlugin) ConstructVolumeSpec(volumeName, mountPath string) (*v
 type iscsiDisk struct {
 	volName        string
 	podUID         types.UID
-	portals        []string
-	iqn            string
+	Portals        []string
+	Iqn            string
 	lun            string
-	iface          string
+	Iface          string
 	chap_discovery bool
 	chap_session   bool
 	secret         map[string]string

--- a/pkg/volume/iscsi/iscsi_util.go
+++ b/pkg/volume/iscsi/iscsi_util.go
--- a/pkg/volume/iscsi/iscsi_util_test.go
+++ b/pkg/volume/iscsi/iscsi_util_test.go
@@ -19,6 +19,7 @@ package iscsi
 import (
 	"os"
 	"path/filepath"
+	"reflect"
 	"testing"

 	"k8s.io/kubernetes/pkg/util/mount"
@@ -91,6 +92,15 @@ func TestExtractPortalAndIqn(t *testing.T) {
 	}
 }

+func TestRemoveDuplicate(t *testing.T) {
+	dupPortals := []string{"127.0.0.1:3260", "127.0.0.1:3260", "127.0.0.100:3260"}
+	portals := removeDuplicate(dupPortals)
+	want := []string{"127.0.0.1:3260", "127.0.0.100:3260"}
+	if reflect.DeepEqual(portals, want) == false {
+		t.Errorf("removeDuplicate: want: %s, got: %s", want, portals)
+	}
+}
+
 func fakeOsStat(devicePath string) (fi os.FileInfo, err error) {
 	var cmd os.FileInfo
 	return cmd, nil