drop shard cache when wiping user data from carstore

bluesky-social · Sep 29, 2023 · b320b8a · b320b8a
1 parent 9cd7059
commit b320b8a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/bgs/admin.go b/bgs/admin.go
@@ -506,5 +506,7 @@ func (bgs *BGS) handleAdminResetRepo(e echo.Context) error {
 		return err
 	}
 
-	return nil
+	return e.JSON(200, map[string]any{
+		"success": true,
+	})
 }
diff --git a/bgs/bgs.go b/bgs/bgs.go
@@ -281,15 +281,15 @@ func (bgs *BGS) StartWithListener(listen net.Listener) error {
 				sendHeader = false
 			}
 
+			log.Warnf("HANDLER ERROR: (%s) %s", ctx.Path(), err)
+
 			if strings.HasPrefix(ctx.Path(), "/admin/") {
 				ctx.JSON(500, map[string]any{
 					"error": err.Error(),
 				})
 				return
 			}
 
-			log.Warnf("HANDLER ERROR: (%s) %s", ctx.Path(), err)
-
 			if sendHeader {
 				ctx.Response().WriteHeader(500)
 			}

diff --git a/carstore/bs.go b/carstore/bs.go
@@ -276,6 +276,13 @@ func (cs *CarStore) checkLastShardCache(user models.Uid) *CarShard {
 	return nil
 }
 
+func (cs *CarStore) removeLastShardCache(user models.Uid) {
+	cs.lscLk.Lock()
+	defer cs.lscLk.Unlock()
+
+	delete(cs.lastShardCache, user)
+}
+
 func (cs *CarStore) putLastShardCache(ls *CarShard) {
 	cs.lscLk.Lock()
 	defer cs.lscLk.Unlock()
@@ -963,6 +970,8 @@ func (cs *CarStore) WipeUserData(ctx context.Context, user models.Uid) error {
 		}
 	}
 
+	cs.removeLastShardCache(user)
+
 	return nil
 }
 

diff --git a/repomgr/repomgr.go b/repomgr/repomgr.go
@@ -731,7 +731,7 @@ func (rm *RepoManager) ImportNewRepo(ctx context.Context, user models.Uid, repoD
 
 		diffops, err := r.DiffSince(ctx, curhead)
 		if err != nil {
-			return fmt.Errorf("diff trees: %w", err)
+			return fmt.Errorf("diff trees (curhead: %s): %w", curhead, err)
 		}
 
 		var ops []RepoOp