From 539781a51a6efc86acd475a87ad8a4e84959923f Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Tue, 3 Jan 2023 07:44:47 +0100
Subject: [PATCH] Debug logging

---
 .../storage/postgres/current_room_state_table.go   | 10 +++++++---
 .../storage/postgres/output_room_events_table.go   |  5 +++--
 syncapi/streams/stream_pdu.go                      | 14 ++++++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/syncapi/storage/postgres/current_room_state_table.go b/syncapi/storage/postgres/current_room_state_table.go
index 48ed20021..dad659f62 100644
--- a/syncapi/storage/postgres/current_room_state_table.go
+++ b/syncapi/storage/postgres/current_room_state_table.go
@@ -19,6 +19,7 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
+	"fmt"
 
 	"github.com/lib/pq"
 	"github.com/matrix-org/dendrite/internal"
@@ -291,11 +292,14 @@ func (s *currentRoomStateStatements) SelectCurrentState(
 		pq.StringArray(excludeEventIDs),
 	)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("SelectCurrentState failed: %w", err)
 	}
 	defer internal.CloseAndLogIfError(ctx, rows, "selectCurrentState: rows.close() failed")
-
-	return rowsToEvents(rows)
+	res, err := rowsToEvents(rows)
+	if err != nil {
+		return nil, fmt.Errorf("rowsToEvents failed: %w", err)
+	}
+	return res, nil
 }
 
 func (s *currentRoomStateStatements) DeleteRoomStateByEventID(
diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go
index 4729d0db6..b7faa6b1e 100644
--- a/syncapi/storage/postgres/output_room_events_table.go
+++ b/syncapi/storage/postgres/output_room_events_table.go
@@ -19,6 +19,7 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
+	"fmt"
 	"sort"
 
 	"github.com/matrix-org/dendrite/internal"
@@ -412,12 +413,12 @@ func (s *outputRoomEventsStatements) SelectRecentEvents(
 		eventFilter.Limit+1,
 	)
 	if err != nil {
-		return nil, false, err
+		return nil, false, fmt.Errorf("SelectRecentEvents failed: %w", err)
 	}
 	defer internal.CloseAndLogIfError(ctx, rows, "selectRecentEvents: rows.close() failed")
 	events, err := rowsToStreamEvents(rows)
 	if err != nil {
-		return nil, false, err
+		return nil, false, fmt.Errorf("rowsToStreamEvents failed: %w", err)
 	}
 	if chronologicalOrder {
 		// The events need to be returned from oldest to latest, which isn't
diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go
index dd7845574..c5238ffec 100644
--- a/syncapi/streams/stream_pdu.go
+++ b/syncapi/streams/stream_pdu.go
@@ -95,12 +95,18 @@ func (p *PDUStreamProvider) CompleteSync(
 	}
 
 	// Build up a /sync response. Add joined rooms.
-	for _, roomID := range joinedRoomIDs {
+	req.Log.WithField("rooms", len(joinedRoomIDs)).Debug("getting join response for rooms")
+	s := time.Now()
+	for i, roomID := range joinedRoomIDs {
 		jr, jerr := p.getJoinResponseForCompleteSync(
 			ctx, snapshot, roomID, r, &stateFilter, &eventFilter, req.WantFullState, req.Device, false,
 		)
 		if jerr != nil {
-			req.Log.WithError(jerr).Error("p.getJoinResponseForCompleteSync failed")
+			req.Log.WithError(jerr).WithContext(ctx).WithFields(logrus.Fields{
+				"failed_after":    time.Since(s),
+				"room_id":         roomID,
+				"collected_rooms": i,
+			}).Error("p.getJoinResponseForCompleteSync failed")
 			if ctxErr := req.Context.Err(); ctxErr != nil || jerr == sql.ErrTxDone {
 				return from
 			}
@@ -540,7 +546,7 @@ func (p *PDUStreamProvider) getJoinResponseForCompleteSync(
 		}
 		backwardTopologyPos, backwardStreamPos, err = snapshot.PositionInTopology(ctx, event.EventID())
 		if err != nil {
-			return
+			return jr, fmt.Errorf("PositionInTopology failed: %w", err)
 		}
 		prevBatch = &types.TopologyToken{
 			Depth:       backwardTopologyPos,
@@ -609,7 +615,7 @@ func (p *PDUStreamProvider) lazyLoadMembers(
 	filter.Types = &[]string{gomatrixserverlib.MRoomMember}
 	memberships, err := snapshot.GetStateEventsForRoom(ctx, roomID, &filter)
 	if err != nil {
-		return stateEvents, err
+		return stateEvents, fmt.Errorf("(lazyLoadMembers) GetStateEventsForRoom failed: %w", err)
 	}
 	// cache the membership events
 	for _, membership := range memberships {