fixes

Author: AlCutter

storage/aws/aws.go

@@ -1214,12 +1214,12 @@ func (s *mySQLSequencer) nextIndex(ctx context.Context) (uint64, error) {
 //
 // This function uses PubCoord with an exclusive lock to guarantee that only one tessera instance can attempt to publish
 // a checkpoint at any given time.
-func (s *mySQLSequencer) publishCheckpoint(ctx context.Context, minStaleActive, minStaleRepub time.Duration, f func(context.Context, uint64, []byte) error) (err error) {
+func (s *mySQLSequencer) publishCheckpoint(ctx context.Context, minStaleActive, minStaleRepub time.Duration, f func(context.Context, uint64, []byte) error) (errR error) {
 	start := time.Now()
 	defer func() {
 		// Detect any errors and update metrics accordingly.
 		// Non-error cases are explicitly handled in the body of the function below.
-		if err != nil {
+		if errR != nil {
 			publishCount.Add(ctx, 1, metric.WithAttributes(errorTypeKey.String("error")))
 		}
 	}()

storage/gcp/gcp.go

@@ -1016,7 +1016,7 @@ func (s *spannerCoordinator) nextIndex(ctx context.Context) (uint64, error) {
 //
 // This function uses PubCoord with an exclusive lock to guarantee that only one tessera instance can attempt to publish
 // a checkpoint at any given time.
-func (s *spannerCoordinator) publishCheckpoint(ctx context.Context, minStaleActive, minStaleRepub time.Duration, f func(context.Context, uint64, []byte) error) (err error) {
+func (s *spannerCoordinator) publishCheckpoint(ctx context.Context, minStaleActive, minStaleRepub time.Duration, f func(context.Context, uint64, []byte) error) error {
 	ctx, span := tracer.Start(ctx, "tessera.storage.gcp.publishCheckpoint")
 	defer span.End()
 
@@ -1117,7 +1117,7 @@ func (s *spannerCoordinator) garbageCollect(ctx context.Context, treeSize uint64
 		eg := errgroup.Group{}
 		// GC the tree in "vertical" chunks defined by entry bundles.
 		for ri := range layout.Range(fromSize, treeSize-fromSize, treeSize) {
-			// Only known-full bundles are in-scope for for GC, so exit if the current bundle is partial or
+			// Only known-full bundles are in-scope for GC, so exit if the current bundle is partial or
 			// we've reached our limit of chunks.
 			if ri.Partial > 0 || d > maxBundles {
 				break

storage/posix/files.go

@@ -602,12 +602,12 @@ func (s *Storage) readTreeState(ctx context.Context) (uint64, []byte, error) {
 // publishCheckpoint checks whether the currently published checkpoint (if any) is more than
 // minStaleness old, and, if so, creates and published a fresh checkpoint from the current
 // stored tree state.
-func (a *appender) publishCheckpoint(ctx context.Context, minStalenessActive, minStalenessRepub time.Duration) (err error) {
+func (a *appender) publishCheckpoint(ctx context.Context, minStalenessActive, minStalenessRepub time.Duration) (errR error) {
 	now := time.Now()
 	defer func() {
 		// Detect any errors and update metrics accordingly.
 		// Non-error cases are explicitly handled in the body of the function below.
-		if err != nil {
+		if errR != nil {
 			publishCount.Add(ctx, 1, metric.WithAttributes(errorTypeKey.String("error")))
 		}
 	}()