From e9cb764401f3dada821459280fded326c7a69b03 Mon Sep 17 00:00:00 2001
From: John Belamaric <jbelamaric@google.com>
Date: Thu, 21 Sep 2023 13:50:19 -0700
Subject: [PATCH] More logging changes

---
 porch/pkg/git/git.go              |  4 +++-
 porch/pkg/git/package_tree.go     |  4 ----
 porch/pkg/registry/porch/watch.go | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/porch/pkg/git/git.go b/porch/pkg/git/git.go
index 3245e0896..e194fe407 100644
--- a/porch/pkg/git/git.go
+++ b/porch/pkg/git/git.go
@@ -1647,7 +1647,9 @@ func (r *gitRepository) discoverPackagesInTree(commit *object.Commit, opt Discov
 		return nil, err
 	}
 
-	klog.V(2).Infof("discovered packages @%v with prefix %q: %#v", commit.Hash, opt.FilterPrefix, t.packages)
+	if opt.FilterPrefix == "" {
+		klog.Infof("discovered %d packages @%v", len(t.packages), commit.Hash)
+	}
 	return t, nil
 }
 
diff --git a/porch/pkg/git/package_tree.go b/porch/pkg/git/package_tree.go
index 4a00204ce..0133161e8 100644
--- a/porch/pkg/git/package_tree.go
+++ b/porch/pkg/git/package_tree.go
@@ -122,7 +122,6 @@ type DiscoverPackagesOptions struct {
 // discoverPackages is the recursive function we use to traverse the tree and find packages.
 // tree is the git-tree we are search, treePath is the repo-relative-path to tree.
 func (t *packageList) discoverPackages(tree *object.Tree, treePath string, recurse bool) error {
-	found := 0
 	for _, e := range tree.Entries {
 		if e.Name == "Kptfile" {
 			p := path.Join(treePath, e.Name)
@@ -132,7 +131,6 @@ func (t *packageList) discoverPackages(tree *object.Tree, treePath string, recur
 			}
 
 			// Found a package
-			found += 1
 			t.packages[treePath] = &packageListEntry{
 				path:     treePath,
 				treeHash: tree.Hash,
@@ -141,8 +139,6 @@ func (t *packageList) discoverPackages(tree *object.Tree, treePath string, recur
 		}
 	}
 
-	klog.Infof("discoveryPackages in %s found %d valid package Kptfiles", treePath, found)
-
 	if recurse {
 		for _, e := range tree.Entries {
 			if e.Mode != filemode.Dir {
diff --git a/porch/pkg/registry/porch/watch.go b/porch/pkg/registry/porch/watch.go
index 23e6da1fe..d1487cf8a 100644
--- a/porch/pkg/registry/porch/watch.go
+++ b/porch/pkg/registry/porch/watch.go
@@ -74,6 +74,7 @@ type watcher struct {
 	mutex         sync.Mutex
 	eventCallback func(eventType watch.EventType, pr engine.PackageRevision) bool
 	done          bool
+	totalSent     int
 }
 
 var _ watch.Interface = &watcher{}
@@ -139,11 +140,11 @@ func (w *watcher) listAndWatchInner(ctx context.Context, r packageReader, filter
 	}
 	w.mutex.Unlock()
 
-	klog.Infof("starting watch before listing")
 	if err := r.watchPackages(ctx, filter, w); err != nil {
 		return err
 	}
 
+	sentAdd := 0
 	// TODO: Only if rv == 0?
 	if err := r.listPackageRevisions(ctx, filter, selector, func(p *engine.PackageRevision) error {
 		obj, err := p.GetPackageRevision(ctx)
@@ -158,6 +159,7 @@ func (w *watcher) listAndWatchInner(ctx context.Context, r packageReader, filter
 			Type:   watch.Added,
 			Object: obj,
 		}
+		sentAdd += 1
 		w.sendWatchEvent(ev)
 		return nil
 	}); err != nil {
@@ -166,9 +168,9 @@ func (w *watcher) listAndWatchInner(ctx context.Context, r packageReader, filter
 		w.mutex.Unlock()
 		return err
 	}
-	klog.Infof("finished list")
 
 	// Repeatedly flush the backlog until we catch up
+	sentBacklog := 0
 	for {
 		w.mutex.Lock()
 		chunk := backlog
@@ -179,24 +181,24 @@ func (w *watcher) listAndWatchInner(ctx context.Context, r packageReader, filter
 			break
 		}
 
-		klog.Infof("flushing backlog chunk of length %d", len(chunk))
-
 		for _, ev := range chunk {
 			// TODO: Check resource version?
-
+			sentBacklog += 1
 			w.sendWatchEvent(ev)
 		}
 	}
 
 	w.mutex.Lock()
 	// Pick up anything that squeezed in
+	sentNewBacklog := 0
 	for _, ev := range backlog {
 		// TODO: Check resource version?
 
+		sentNewBacklog += 1
 		w.sendWatchEvent(ev)
 	}
 
-	klog.Infof("moving watch into streaming mode")
+	klog.Infof("watch %p: moving watch into streaming mode after sentAdd %d, sentBacklog %d, sentNewBacklog %d", w, sentAdd, sentBacklog, sentNewBacklog)
 	w.eventCallback = func(eventType watch.EventType, pr engine.PackageRevision) bool {
 		if w.done {
 			return false
@@ -236,6 +238,10 @@ func (w *watcher) listAndWatchInner(ctx context.Context, r packageReader, filter
 func (w *watcher) sendWatchEvent(ev watch.Event) {
 	// TODO: Handle the case that the watch channel is full?
 	w.resultChan <- ev
+	w.totalSent += 1
+	if (w.totalSent % 100) == 0 {
+		klog.Infof("watch %p: total sent: %d", w, w.totalSent)
+	}
 }
 
 // OnPackageRevisionChange is the callback called when a PackageRevision changes.