Commit 1e663622 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Fix the OTHER log message that prints the wrong variable

parent 08ccea5c
...@@ -139,7 +139,6 @@ func NewS3(ctx context.Context, config *config.Control) (*S3, error) { ...@@ -139,7 +139,6 @@ func NewS3(ctx context.Context, config *config.Control) (*S3, error) {
// upload uploads the given snapshot to the configured S3 // upload uploads the given snapshot to the configured S3
// compatible backend. // compatible backend.
func (s *S3) upload(ctx context.Context, snapshot string, extraMetadata *v1.ConfigMap, now time.Time) (*snapshotFile, error) { func (s *S3) upload(ctx context.Context, snapshot string, extraMetadata *v1.ConfigMap, now time.Time) (*snapshotFile, error) {
logrus.Infof("Uploading snapshot to s3://%s/%s", s.config.EtcdS3BucketName, snapshot)
basename := filepath.Base(snapshot) basename := filepath.Base(snapshot)
metadata := filepath.Join(filepath.Dir(snapshot), "..", metadataDir, basename) metadata := filepath.Join(filepath.Dir(snapshot), "..", metadataDir, basename)
snapshotKey := path.Join(s.config.EtcdS3Folder, basename) snapshotKey := path.Join(s.config.EtcdS3Folder, basename)
...@@ -166,6 +165,7 @@ func (s *S3) upload(ctx context.Context, snapshot string, extraMetadata *v1.Conf ...@@ -166,6 +165,7 @@ func (s *S3) upload(ctx context.Context, snapshot string, extraMetadata *v1.Conf
nodeSource: s.nodeName, nodeSource: s.nodeName,
} }
logrus.Infof("Uploading snapshot to s3://%s/%s", s.config.EtcdS3BucketName, snapshotKey)
uploadInfo, err := s.uploadSnapshot(ctx, snapshotKey, snapshot) uploadInfo, err := s.uploadSnapshot(ctx, snapshotKey, snapshot)
if err != nil { if err != nil {
sf.Status = failedSnapshotStatus sf.Status = failedSnapshotStatus
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment