skip orchestrator info request if orch has no service uri set

Author: ad-astra-video

discovery/db_discovery.go

@@ -265,7 +265,7 @@ func (dbo *DBOrchestratorPoolCache) cacheDBOrchs() error {
 		return fmt.Errorf("could not retrieve orchestrators from DB: %v", err)
 	}
 
-	resc, errc := make(chan *common.DBOrch, len(orchs)), make(chan error, len(orchs))
+	resc, errc, skipped := make(chan *common.DBOrch, len(orchs)), make(chan error, len(orchs)), make(chan int, len(orchs))
 	timeout := getOrchestratorTimeoutLoop //needs to be same or longer than GRPCConnectTimeout in server/rpc.go
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
@@ -276,7 +276,11 @@ func (dbo *DBOrchestratorPoolCache) cacheDBOrchs() error {
 			errc <- err
 			return
 		}
-
+		//do not connect if URI host is not set
+		if uri.Host == "" {
+			skipped <- 1
+			return
+		}
 		info, err := serverGetOrchInfo(ctx, dbo.bcast, uri, nil)
 		if err != nil {
 			errc <- err
@@ -311,6 +315,7 @@ func (dbo *DBOrchestratorPoolCache) cacheDBOrchs() error {
 	}
 
 	numOrchs := 0
+	skippedOrchs := 0
 	for _, orch := range orchs {
 		if orch == nil {
 			continue
@@ -325,10 +330,12 @@ func (dbo *DBOrchestratorPoolCache) cacheDBOrchs() error {
 			if err := dbo.store.UpdateOrch(res); err != nil {
 				glog.Error("Error updating Orchestrator in DB: ", err)
 			}
+		case <-skipped:
+			skippedOrchs += 1
 		case err := <-errc:
 			glog.Errorln(err)
 		case <-ctx.Done():
-			glog.Info("Done fetching orch info for orchestrators, context timeout")
+			glog.Infof("Done fetching orch info for orchestrators, context timeout (skipped: %v)", skippedOrchs)
 			return nil
 		}
 	}