Skip to content

fix for chained mirror #4558 #5197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harshavardhana merged 3 commits into from
May 6, 2025
Merged

fix for chained mirror #4558 #5197

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3083da
fix for chained mirror #4558
toastsandwich May 2, 2025
68ff515
Merge branch 'master' into master
zveinn May 2, 2025
0b952b0
Merge branch 'master' into master
toastsandwich May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/mirror-main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ func (mj *mirrorJob) watchMirrorEvents(ctx context.Context, events []EventInfo)
}
mirrorURL.TotalCount = mj.status.GetCounts()
mirrorURL.TotalSize = mj.status.Get()
if mirrorURL.TargetContent != nil && (mj.opts.isRemove || mj.opts.activeActive) {
if mirrorURL.TargetContent != nil && (mj.opts.isRemove || mj.opts.activeActive || mj.opts.isWatch) {
mj.parallel.queueTask(func() URLs {
return mj.doRemove(ctx, mirrorURL, event)
}, 0)
Expand Down Expand Up @@ -995,7 +995,8 @@ func runMirror(ctx context.Context, srcURL, dstURL string, cli *cli.Context, enc
isOverwrite = cli.Bool("overwrite")
}

isWatch := cli.Bool("watch") || cli.Bool("multi-master") || cli.Bool("active-active")
isWatch := cli.Bool("watch") || cli.Bool("multi-master")
isActiveActive := cli.Bool("active-active")
isRemove := cli.Bool("remove")
md5, checksum := parseChecksum(cli)

Expand Down Expand Up @@ -1023,7 +1024,7 @@ func runMirror(ctx context.Context, srcURL, dstURL string, cli *cli.Context, enc
storageClass: cli.String("storage-class"),
userMetadata: userMetadata,
encKeyDB: encKeyDB,
activeActive: isWatch,
activeActive: isActiveActive,
}

// If we are not using active/active and we are not removing
Expand Down