WIP - more tweaks

Author: ericpromislow

pkg/sqlcache/integration_test.go

@@ -559,22 +559,24 @@ func waitForProjectsDisplayName(ctx context.Context, proxyStore *sqlproxy.Store,
 		for _, item := range list.Items {
 			displayName, ok, err := unstructured.NestedFieldNoCopy(item.Object, "spec", "displayName")
 			if !ok || displayName == "" || err != nil {
-				if err == nil {
-					fmt.Printf("QQQ: failed to get displayName: ok:%t, name: %s\n", ok, displayName)
+				if err == nil && ok {
+					fmt.Printf("No displayName yet for mcio.project %q\n", item.GetName())
 				}
 				return false, err
 			}
 			clusterName, ok, err := unstructured.NestedFieldNoCopy(item.Object, "spec", "clusterName")
 			if !ok || clusterName == "" || err != nil {
 				if err == nil {
-					fmt.Printf("QQQ: failed to get clusterName: ok:%t, name: %s\n", ok, displayName)
+					fmt.Printf("No clusterName yet for mcio.project %q\n", item.GetName())
 				}
 				return false, err
 			}
-			fmt.Printf("QQQ: got displayName for md.name %q: %q, clusterName: %q\n", item.GetName(), displayName, clusterName)
 		}
 		t2 := time.Now()
-		fmt.Printf("QQQ: waitForProjectsDisplayName took %v\n", t2.Sub(t1))
+		delta := t2.Sub(t1)
+		if delta > 500*time.Millisecond {
+			fmt.Printf("QQQ: Waited %v for all projects to have displayName and clusterName\n", delta)
+		}
 		return true, nil
 	})
 }

pkg/sqlcache/store/store.go

@@ -150,7 +150,6 @@ func (s *Store) checkUpdateExternalInfo(key string) {
 // with the empty string. I assume this is never desired.
 
 func (s *Store) updateExternalInfo(tx db.TxClient, key string, externalUpdateInfo *sqltypes.ExternalGVKUpdates) error {
-	logrus.Debugf("QQQ: updateExternalInfo: key %s, externalUpdateInfo %v", key, externalUpdateInfo)
 	for _, labelDep := range externalUpdateInfo.ExternalLabelDependencies {
 		rawGetStmt := fmt.Sprintf(`SELECT DISTINCT f.key, ex2."%s" FROM "%s_fields" f
   LEFT OUTER JOIN "%s_labels" lt1 ON f.key = lt1.key