Merge pull request #1501 from rikatz/remove-dead-code

Remove dead code or unused code from CPI

Author: k8s-ci-robot

pkg/common/connectionmanager/search.go

@@ -228,151 +228,3 @@ func (cm *ConnectionManager) WhichVCandDCByNodeID(ctx context.Context, nodeID st
 	klog.V(4).Infof("WhichVCandDCByNodeID: %q vm not found", myNodeID)
 	return nil, vclib.ErrNoVMFound
 }
-
-// WhichVCandDCByFCDId searches for an FCD using the provided ID.
-func (cm *ConnectionManager) WhichVCandDCByFCDId(ctx context.Context, fcdID string) (*FcdDiscoveryInfo, error) {
-	if fcdID == "" {
-		klog.V(3).Info("WhichVCandDCByFCDId called but fcdID is empty")
-		return nil, vclib.ErrNoDiskIDFound
-	}
-	klog.V(2).Info("WhichVCandDCByFCDId fcdID: ", fcdID)
-
-	type fcdSearch struct {
-		tenantRef  string
-		vc         string
-		datacenter *vclib.Datacenter
-	}
-
-	var mutex = &sync.Mutex{}
-	var globalErrMutex = &sync.Mutex{}
-	var queueChannel chan *fcdSearch
-	var wg sync.WaitGroup
-	var globalErr *error
-
-	queueChannel = make(chan *fcdSearch, QueueSize)
-
-	fcdFound := false
-	globalErr = nil
-
-	setGlobalErr := func(err error) {
-		globalErrMutex.Lock()
-		globalErr = &err
-		globalErrMutex.Unlock()
-	}
-
-	setFCDFound := func(found bool) {
-		mutex.Lock()
-		fcdFound = found
-		mutex.Unlock()
-	}
-
-	getFCDFound := func() bool {
-		mutex.Lock()
-		found := fcdFound
-		mutex.Unlock()
-		return found
-	}
-
-	go func() {
-		for _, vsi := range cm.VsphereInstanceMap {
-			var datacenterObjs []*vclib.Datacenter
-
-			if getFCDFound() {
-				break
-			}
-
-			var err error
-			for i := 0; i < NumConnectionAttempts; i++ {
-				err = cm.Connect(ctx, vsi)
-				if err == nil {
-					break
-				}
-				time.Sleep(time.Duration(RetryAttemptDelaySecs) * time.Second)
-			}
-
-			if err != nil {
-				klog.Error("WhichVCandDCByFCDId error vc:", err)
-				setGlobalErr(err)
-				continue
-			}
-
-			if vsi.Cfg.Datacenters == "" {
-				datacenterObjs, err = vclib.GetAllDatacenter(ctx, vsi.Conn)
-				if err != nil {
-					klog.Error("WhichVCandDCByFCDId error dc:", err)
-					setGlobalErr(err)
-					continue
-				}
-			} else {
-				datacenters := strings.Split(vsi.Cfg.Datacenters, ",")
-				for _, dc := range datacenters {
-					dc = strings.TrimSpace(dc)
-					if dc == "" {
-						continue
-					}
-					datacenterObj, err := vclib.GetDatacenter(ctx, vsi.Conn, dc)
-					if err != nil {
-						klog.Error("WhichVCandDCByFCDId error dc:", err)
-						setGlobalErr(err)
-						continue
-					}
-					datacenterObjs = append(datacenterObjs, datacenterObj)
-				}
-			}
-
-			for _, datacenterObj := range datacenterObjs {
-				if getFCDFound() {
-					break
-				}
-
-				klog.V(4).Infof("Finding FCD %s in vc=%s and datacenter=%s", fcdID, vsi.Cfg.VCenterIP, datacenterObj.Name())
-				queueChannel <- &fcdSearch{
-					tenantRef:  vsi.Cfg.TenantRef,
-					vc:         vsi.Cfg.VCenterIP,
-					datacenter: datacenterObj,
-				}
-			}
-		}
-		close(queueChannel)
-	}()
-
-	var fcdInfo *FcdDiscoveryInfo
-	for i := 0; i < PoolSize; i++ {
-		wg.Add(1)
-		go func() {
-			for res := range queueChannel {
-
-				fcd, err := res.datacenter.DoesFirstClassDiskExist(ctx, fcdID)
-				if err != nil {
-					klog.Errorf("Error while looking for FCD=%+v in vc=%s and datacenter=%s: %v",
-						fcd, res.vc, res.datacenter.Name(), err)
-					if err != vclib.ErrNoDiskIDFound {
-						setGlobalErr(err)
-					} else {
-						klog.V(2).Infof("Did not find FCD %s in vc=%s and datacenter=%s",
-							fcdID, res.vc, res.datacenter.Name())
-					}
-					continue
-				}
-
-				klog.V(2).Infof("Found FCD %s as vm=%+v in vc=%s and datacenter=%s",
-					fcdID, fcd, res.vc, res.datacenter.Name())
-
-				fcdInfo = &FcdDiscoveryInfo{TenantRef: res.tenantRef, DataCenter: res.datacenter, FCDInfo: fcd, VcServer: res.vc}
-				setFCDFound(true)
-				break
-			}
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-	if fcdFound {
-		return fcdInfo, nil
-	}
-	if globalErr != nil {
-		return nil, *globalErr
-	}
-
-	klog.V(4).Infof("WhichVCandDCByFCDId: %q FCD not found", fcdID)
-	return nil, vclib.ErrNoDiskIDFound
-}

pkg/common/connectionmanager/search_test.go

@@ -18,12 +18,10 @@ package connectionmanager
 
 import (
 	"context"
-	"math/rand"
 	"strings"
 	"testing"
 
 	"github.com/vmware/govmomi/simulator"
-	"k8s.io/cloud-provider-vsphere/pkg/common/vclib"
 )
 
 func TestWhichVCandDCByNodeIdByUUID(t *testing.T) {
@@ -89,73 +87,3 @@ func TestWhichVCandDCByNodeIdByName(t *testing.T) {
 		t.Fatalf("VM name mismatch %s=%s", name, info.NodeName)
 	}
 }
-
-func TestWhichVCandDCByFCDId(t *testing.T) {
-	config, cleanup := configFromEnvOrSim(true)
-	defer cleanup()
-
-	connMgr := NewConnectionManager(&config.Config, nil, nil)
-	defer connMgr.Logout()
-
-	// context
-	ctx := context.Background()
-
-	/*
-	 * Setup
-	 */
-	// Get a simulator DS
-	myds := config.Map.Any("Datastore").(*simulator.Datastore)
-
-	items, err := connMgr.ListAllVCandDCPairs(ctx)
-	if err != nil {
-		t.Fatalf("ListAllVCandDCPairs err=%v", err)
-	}
-	if len(items) != 2 {
-		t.Fatalf("ListAllVCandDCPairs items should be 2 but count=%d", len(items))
-	}
-
-	randDC := items[rand.Intn(len(items))]
-
-	datastoreName := myds.Name
-	datastoreType := vclib.TypeDatastore
-	volName := "myfcd"
-	volSizeMB := int64(1024) //1GB
-
-	err = randDC.DataCenter.CreateFirstClassDisk(ctx, datastoreName, datastoreType, volName, volSizeMB)
-	if err != nil {
-		t.Fatalf("CreateFirstClassDisk err=%v", err)
-	}
-
-	firstClassDisk, err := randDC.DataCenter.GetFirstClassDisk(
-		ctx, datastoreName, datastoreType, volName, vclib.FindFCDByName)
-	if err != nil {
-		t.Fatalf("GetFirstClassDisk err=%v", err)
-	}
-
-	fcdID := firstClassDisk.Config.Id.Id
-	/*
-	 * Setup
-	 */
-
-	// call WhichVCandDCByFCDId
-	fcdObj, err := connMgr.WhichVCandDCByFCDId(ctx, fcdID)
-	if err != nil {
-		t.Fatalf("WhichVCandDCByFCDId err=%v", err)
-	}
-	if fcdObj == nil {
-		t.Fatalf("WhichVCandDCByFCDId fcdObj=nil")
-	}
-
-	if !strings.EqualFold(fcdID, fcdObj.FCDInfo.Config.Id.Id) {
-		t.Errorf("FCD ID mismatch %s=%s", fcdID, fcdObj.FCDInfo.Config.Id.Id)
-	}
-	if datastoreType != fcdObj.FCDInfo.ParentType {
-		t.Errorf("FCD DatastoreType mismatch %v=%v", datastoreType, fcdObj.FCDInfo.ParentType)
-	}
-	if !strings.EqualFold(datastoreName, fcdObj.FCDInfo.DatastoreInfo.Info.Name) {
-		t.Errorf("FCD Datastore mismatch %s=%s", datastoreName, fcdObj.FCDInfo.DatastoreInfo.Info.Name)
-	}
-	if volSizeMB != fcdObj.FCDInfo.Config.CapacityInMB {
-		t.Errorf("FCD Size mismatch %d=%d", volSizeMB, fcdObj.FCDInfo.Config.CapacityInMB)
-	}
-}

pkg/common/connectionmanager/types.go

@@ -59,14 +59,6 @@ type VMDiscoveryInfo struct {
 	NodeName   string
 }
 
-// FcdDiscoveryInfo contains FCD info about a discovered FCD
-type FcdDiscoveryInfo struct {
-	TenantRef  string
-	DataCenter *vclib.Datacenter
-	FCDInfo    *vclib.FirstClassDiskInfo
-	VcServer   string
-}
-
 // ListDiscoveryInfo represents a VC/DC pair
 type ListDiscoveryInfo struct {
 	TenantRef  string