Fix BBS Cache warmup failure

pkg/util/cloudproviders/cloudfoundry/bbscache.go

@@ -212,14 +212,13 @@ func (bc *BBSCache) readData() {
 	var errActual, errDesired error
 
 	wg.Add(2)
-
 	go func() {
+		defer wg.Done()
 		actualLRPsByProcessGUID, actualLRPsByCellID, errActual = bc.readActualLRPs()
-		wg.Done()
 	}()
 	go func() {
+		defer wg.Done()
 		desiredLRPs, errDesired = bc.readDesiredLRPs()
-		wg.Done()
 	}()
 	wg.Wait()
 	if errActual != nil {

pkg/util/cloudproviders/cloudfoundry/cccache.go

@@ -218,7 +218,7 @@ func (ccc *CCCache) setResourceInactive(guid string) {
 		// release the resource
 		close(ch)
 		ccc.Lock()
-		ccc.activeResources[guid] = nil
+		delete(ccc.activeResources, guid)
 		ccc.Unlock()
 	}
 }
@@ -273,6 +273,14 @@ func (ccc *CCCache) GetProcesses(appGUID string) ([]*cfclient.Process, error) {
 			return nil, fmt.Errorf("refreshCacheOnMiss is disabled, could not find processes for the app %s in cloud controller cache", appGUID)
 		}
 
+		ccc.RLock()
+		updatedOnce := !ccc.lastUpdated.IsZero()
+		ccc.RUnlock()
+
+		if !updatedOnce {
+			return nil, fmt.Errorf("cannot refresh cache on miss, cccache is still warming up")
+		}
+
 		// wait in case the resource is currently being fetched
 		ccc.waitForResource(appGUID)
 
@@ -333,6 +341,14 @@ func (ccc *CCCache) GetCFApplication(guid string) (*CFApplication, error) {
 			return nil, fmt.Errorf("refreshCacheOnMiss is disabled, could not find CF application %s in cloud controller cache", guid)
 		}
 
+		ccc.RLock()
+		updatedOnce := !ccc.lastUpdated.IsZero()
+		ccc.RUnlock()
+
+		if !updatedOnce {
+			return nil, fmt.Errorf("cannot refresh cache on miss, cccache is still warming up")
+		}
+
 		// cfclient.V3App and CFApplication share the same guid which causes a deadlock in the ccc.activeResources map if not properly handled
 		cfappGUID := "cfapp" + guid
 
@@ -438,6 +454,14 @@ func (ccc *CCCache) GetApp(guid string) (*cfclient.V3App, error) {
 			return nil, fmt.Errorf("refreshCacheOnMiss is disabled, could not find application %s in cloud controller cache", guid)
 		}
 
+		ccc.RLock()
+		updatedOnce := !ccc.lastUpdated.IsZero()
+		ccc.RUnlock()
+
+		if !updatedOnce {
+			return nil, fmt.Errorf("cannot refresh cache on miss, cccache is still warming up")
+		}
+
 		// wait in case the resource is currently being fetched
 		ccc.waitForResource(guid)
 
@@ -480,11 +504,20 @@ func (ccc *CCCache) GetSpace(guid string) (*cfclient.V3Space, error) {
 	ccc.RLock()
 	space, ok := ccc.spacesByGUID[guid]
 	ccc.RUnlock()
+
 	if !ok {
 		if !ccc.refreshCacheOnMiss {
 			return nil, fmt.Errorf("refreshCacheOnMiss is disabled, could not find space %s in cloud controller cache", guid)
 		}
 
+		ccc.RLock()
+		updatedOnce := !ccc.lastUpdated.IsZero()
+		ccc.RUnlock()
+
+		if !updatedOnce {
+			return nil, fmt.Errorf("cannot refresh cache on miss, cccache is still warming up")
+		}
+
 		// wait in case the resource is currently being fetched
 		ccc.waitForResource(guid)
 
@@ -527,11 +560,20 @@ func (ccc *CCCache) GetOrg(guid string) (*cfclient.V3Organization, error) {
 	ccc.RLock()
 	org, ok := ccc.orgsByGUID[guid]
 	ccc.RUnlock()
+
 	if !ok {
 		if !ccc.refreshCacheOnMiss {
 			return nil, fmt.Errorf("refreshCacheOnMiss is disabled, could not find org %s in cloud controller cache", guid)
 		}
 
+		ccc.RLock()
+		updatedOnce := !ccc.lastUpdated.IsZero()
+		ccc.RUnlock()
+
+		if !updatedOnce {
+			return nil, fmt.Errorf("cannot refresh cache on miss, cccache is still warming up")
+		}
+
 		// wait in case the resource is currently being fetched
 		ccc.waitForResource(guid)
 
@@ -639,6 +681,10 @@ func (ccc *CCCache) readData() {
 					log.Errorf("Failed listing sidecars from cloud controller: %v", err)
 					return
 				}
+				// skip apps without sidecars
+				if len(sidecars) == 0 {
+					continue
+				}
 				for _, sidecar := range sidecars {
 					s := sidecar
 					allSidecars = append(allSidecars, &s)