mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 05:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Debug logging

Browse source
This commit is contained in:
Neil Alexander 2020-06-30 15:05:08 +01:00
parent bab00192c2
commit ebaa0cf5d4
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
federationsender/queue/destinationqueue.go
View file

@ -107,7 +107,7 @@ func (oq *destinationQueue) sendEvent(nid int64) {
oq.destination, // the destination server name oq.destination, // the destination server name
[]int64{nid}, // NID from federationsender_queue_json table []int64{nid}, // NID from federationsender_queue_json table
); err != nil { ); err != nil {
log.WithError(err).Errorf("failed to associate PDU with ID %d with destination %q", oq.destination) log.WithError(err).Errorf("failed to associate PDU NID %d with destination %q", nid, oq.destination)
return return
} }
// We've successfully added a PDU to the transaction so increase // We've successfully added a PDU to the transaction so increase

2
federationsender/storage/postgres/queue_json_table.go
View file

@ -90,7 +90,7 @@ func (s *queueJSONStatements) deleteQueueJSON(
return err return err
} }
func (s *queueJSONStatements) selectJSON( func (s *queueJSONStatements) selectQueueJSON(
ctx context.Context, txn *sql.Tx, jsonNIDs []int64, ctx context.Context, txn *sql.Tx, jsonNIDs []int64,
) (map[int64][]byte, error) { ) (map[int64][]byte, error) {
blobs := map[int64][]byte{} blobs := map[int64][]byte{}

9
federationsender/storage/postgres/storage.go
View file

@ -191,7 +191,7 @@ func (d *Database) GetNextTransactionPDUs(
return "", nil, fmt.Errorf("d.selectQueuePDUs: %w", err) return "", nil, fmt.Errorf("d.selectQueuePDUs: %w", err)
} }
blobs, err := d.selectJSON(ctx, nil, nids) blobs, err := d.selectQueueJSON(ctx, nil, nids)
if err != nil { if err != nil {
return "", nil, fmt.Errorf("d.selectJSON: %w", err) return "", nil, fmt.Errorf("d.selectJSON: %w", err)
} }
@ -216,11 +216,15 @@ func (d *Database) CleanTransactionPDUs(
serverName gomatrixserverlib.ServerName, serverName gomatrixserverlib.ServerName,
transactionID gomatrixserverlib.TransactionID, transactionID gomatrixserverlib.TransactionID,
) error { ) error {
fmt.Println("Cleaning up after transaction", transactionID)
nids, err := d.selectQueuePDUs(ctx, nil, serverName, transactionID, 50) nids, err := d.selectQueuePDUs(ctx, nil, serverName, transactionID, 50)
if err != nil { if err != nil {
return fmt.Errorf("d.selectQueuePDUs: %w", err) return fmt.Errorf("d.selectQueuePDUs: %w", err)
} }
fmt.Println("Transaction", transactionID, "has", len(nids), "NIDs")
if err = d.deleteQueueTransaction(ctx, nil, serverName, transactionID); err != nil { if err = d.deleteQueueTransaction(ctx, nil, serverName, transactionID); err != nil {
return fmt.Errorf("d.deleteQueueTransaction: %w", err) return fmt.Errorf("d.deleteQueueTransaction: %w", err)
} }
@ -237,6 +241,9 @@ func (d *Database) CleanTransactionPDUs(
} }
} }
fmt.Println("There are", len(deleteNIDs), "unreferenced NIDs ready for deletion")
fmt.Println("There are", len(nids)-len(deleteNIDs), "NIDs still referenced")
if len(deleteNIDs) > 0 { if len(deleteNIDs) > 0 {
if err = d.deleteQueueJSON(ctx, nil, deleteNIDs); err != nil { if err = d.deleteQueueJSON(ctx, nil, deleteNIDs); err != nil {
return fmt.Errorf("d.deleteQueueJSON: %w", err) return fmt.Errorf("d.deleteQueueJSON: %w", err)