Skip to content
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.

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

[3.5] Adding optional revision bump and mark compacted to snapshot restore #16165

Merged
merged 3 commits into from Jul 4, 2023

Conversation

tjungblu
Copy link
Contributor

@tjungblu tjungblu commented Jul 3, 2023

3.5 backport of #16029 for #16028

rbytes := newRevBytes()
revToBytes(revision{main: value}, rbytes)
tx.UnsafePut(buckets.Meta, scheduledCompactKeyName, rbytes)
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you have a better place, please let me know

Signed-off-by: Allen Ray <alray@redhat.com>
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
@tjungblu tjungblu changed the title Adding optional revision bump and mark compacted to snapshot restore [3.5] Adding optional revision bump and mark compacted to snapshot restore Jul 3, 2023
Comment on lines 94 to 95
cmd.Flags().Uint64Var(&revisionBump, "bump-revision", 0, "How much to increase the latest revision after restore (required if --mark-compacted)")
cmd.Flags().BoolVar(&markCompacted, "mark-compacted", false, "Mark the latest revision after restore as the point of scheduled compaction (required if --bump-revision > 0)")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also backport #16166 to 3.5 in this PR or in a separate PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I'll cherry pick it into the PR once the review is done

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done!

ahrtr and others added 2 commits July 3, 2023 15:31
…flags in snapshot restore command

Signed-off-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Thomas Jungblut <tjungblu@redhat.com>
Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thanks @tjungblu

Copy link
Contributor

@fuweid fuweid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ahrtr ahrtr merged commit a233b2e into etcd-io:release-3.5 Jul 4, 2023
12 checks passed
@wenjiaswe
Copy link
Contributor

Thanks for working on this @tjungblu . Are you planning to backport this to 3.4? I am happy to help to do that if that's ok with you.

@ahrtr ahrtr mentioned this pull request Jul 6, 2023
5 tasks
wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
serathius added a commit that referenced this pull request Jul 7, 2023
@serathius serathius mentioned this pull request Oct 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

5 participants