go fmt changes

wal-g · Sep 13, 2021 · 5646f61 · 5646f61
1 parent b105e88
commit 5646f61
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/pkg/storages/s3/folder.go b/pkg/storages/s3/folder.go
@@ -41,13 +41,11 @@ const (
 	RangeBatchEnabled        = "S3_RANGE_BATCH_ENABLED"
 	RangeQueriesMaxRetries   = "S3_RANGE_MAX_RETRIES"
 
+	RangeBatchEnabledDefault = false
 
-	RangeBatchEnabledDefault      = false
-
-	RangeMaxRetries = 10
+	RangeMaxRetries         = 10
 	RangeQueryMinRetryDelay = 30 * time.Millisecond
 	RangeQueryMaxRetryDelay = 300 * time.Second
-
 )
 
 var (
@@ -75,7 +73,6 @@ var (
 		RangeBatchEnabled,
 		RangeQueriesMaxRetries,
 	}
-	S3BufferCounter = 0
 )
 
 func NewFolderError(err error, format string, args ...interface{}) storage.Error {
@@ -99,12 +96,12 @@ type Folder struct {
 
 func NewFolder(uploader Uploader, s3API s3iface.S3API, settings map[string]string, bucket, path string, useListObjectsV1 bool) *Folder {
 	return &Folder{
-		uploader:			uploader,
-		S3API:				s3API,
-		settings:			settings,
-		Bucket:				aws.String(bucket),
-		Path:				storage.AddDelimiterToPath(path),
-		useListObjectsV1:	useListObjectsV1,
+		uploader:         uploader,
+		S3API:            s3API,
+		settings:         settings,
+		Bucket:           aws.String(bucket),
+		Path:             storage.AddDelimiterToPath(path),
+		useListObjectsV1: useListObjectsV1,
 	}
 }
 

diff --git a/pkg/storages/s3/s3reader.go b/pkg/storages/s3/s3reader.go
@@ -15,6 +15,10 @@ import (
 	"github.com/wal-g/tracelog"
 )
 
+var (
+	DebugLogBufferCounter = 0
+)
+
 type s3Reader struct {
 	lastBody      io.ReadCloser
 	folder        *Folder
@@ -42,7 +46,6 @@ func (reader *s3Reader) getObjectRange(from, to int64) (*s3.GetObjectOutput, err
 	return reader.folder.S3API.GetObject(input)
 }
 
-
 func (reader *s3Reader) Read(p []byte) (n int, err error) {
 	reader.debugLog("Read to buffer [%d] bytes", len(p))
 	reconnect := false
@@ -83,7 +86,7 @@ func (reader *s3Reader) debugLog(format string, v ...interface{}) {
 func (reader *s3Reader) reconnect() error {
 	failed := 0
 
-	for  {
+	for {
 		reader.reconnectId++
 		object, err := reader.getObjectRange(reader.storageCursor, 0)
 		if err != nil {
@@ -134,11 +137,11 @@ func (reader *s3Reader) Close() (err error) {
 	return reader.lastBody.Close()
 }
 
-func NewS3Reader(objectPath string, retriesCount int,  folder *Folder,
+func NewS3Reader(objectPath string, retriesCount int, folder *Folder,
 	minRetryDelay, maxRetryDelay time.Duration) *s3Reader {
 
-	S3BufferCounter++
-	reader := &s3Reader{objectPath: objectPath, maxRetries: retriesCount, logDebugId: getHash(objectPath, S3BufferCounter),
+	DebugLogBufferCounter++
+	reader := &s3Reader{objectPath: objectPath, maxRetries: retriesCount, logDebugId: getHash(objectPath, DebugLogBufferCounter),
 		folder: folder, minRetryDelay: minRetryDelay, maxRetryDelay: maxRetryDelay}
 
 	reader.debugLog("Init s3reader path %s", objectPath)
@@ -156,4 +159,4 @@ func getHash(objectPath string, id int) string {
 // getJitterDelay returns a jittered delay for retry
 func getJitterDelay(duration time.Duration) time.Duration {
 	return time.Duration(rand.Int63n(int64(duration)) + int64(duration))
-}
+}
diff --git a/pkg/storages/s3/session.go b/pkg/storages/s3/session.go
@@ -167,4 +167,4 @@ func getEndpointPort(settings map[string]string) string {
 		return port
 	}
 	return DefaultPort
-}
+}
diff --git a/testtools/util.go b/testtools/util.go
@@ -50,7 +50,7 @@ func NewMockUploader(apiMultiErr, apiErr bool) *internal.Uploader {
 	s3Uploader := MakeDefaultUploader(NewMockS3Uploader(apiMultiErr, apiErr, nil))
 	return internal.NewUploader(
 		&MockCompressor{},
-		s3.NewFolder(*s3Uploader, NewMockS3Client(false, true), map[string]string{},"bucket/", "server/", false),
+		s3.NewFolder(*s3Uploader, NewMockS3Client(false, true), map[string]string{}, "bucket/", "server/", false),
 	)
 }
 
@@ -65,7 +65,7 @@ func NewMockWalUploader(apiMultiErr, apiErr bool) *postgres.WalUploader {
 	s3Uploader := MakeDefaultUploader(NewMockS3Uploader(apiMultiErr, apiErr, nil))
 	return postgres.NewWalUploader(
 		&MockCompressor{},
-		s3.NewFolder(*s3Uploader, NewMockS3Client(false, true), map[string]string{},"bucket/", "server/", false),
+		s3.NewFolder(*s3Uploader, NewMockS3Client(false, true), map[string]string{}, "bucket/", "server/", false),
 		nil,
 	)
 }