Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
1e663622
Commit
1e663622
authored
Nov 22, 2023
by
Brad Davidson
Committed by
Brad Davidson
Jan 04, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the OTHER log message that prints the wrong variable
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
08ccea5c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
s3.go
pkg/etcd/s3.go
+1
-1
No files found.
pkg/etcd/s3.go
View file @
1e663622
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment