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.

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

Jump to bottom

[3.4] Adding optional revision bump and mark compacted to snapshot restore #16193

Merged
merged 2 commits into from
Jul 7, 2023
Merged

[3.4] Adding optional revision bump and mark compacted to snapshot restore #16193

merged 2 commits into from
Jul 7, 2023

Conversation

wenjiaswe
Copy link
Contributor

3.4 backport of #16029 for #16028

@wenjiaswe wenjiaswe force-pushed the cp branch 2 times, most recently from f3a48fb to 32c82f5 Compare July 7, 2023 04:49
@wenjiaswe wenjiaswe mentioned this pull request Jul 7, 2023
Merged
@wenjiaswe wenjiaswe changed the title [WIP][3.4] Adding optional revision bump and mark compacted to snapshot restore [3.4] Adding optional revision bump and mark compacted to snapshot restore Jul 7, 2023
@wenjiaswe
Copy link
Contributor Author

cc @dusk125 @tjungblu @ahrtr

wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
@wenjiaswe
[WIP] Update CHANGELOG-3.4.md for etcd-io#16193
0c77f78
wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
@wenjiaswe
[WIP] Update CHANGELOG-3.4.md for etcd-io#16193
33023ff 
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
@wenjiaswe
Adding optional revision bump and mark compacted to snapshot restore
1130bf7 
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
@ahrtr
Copy link
Member

ahrtr commented Jul 7, 2023

Please signoff the second commit, thx

@wenjiaswe
Copy link
Contributor Author

Please signoff the second commit, thx

Thanks for reminding! Keep forgetting...

wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
@wenjiaswe
[WIP] Update CHANGELOG-3.4.md for etcd-io#16193
bee7c38 
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
@wenjiaswe
Copy link
Contributor Author

hmm, this seems to be flaky, 1 out of 3 failed:

--- FAIL: TestWatchDelayForEvent (26.97s)
    --- PASS: TestWatchDelayForEvent/NoTLS (6.35s)
    --- PASS: TestWatchDelayForEvent/TLS (6.83s)
    --- PASS: TestWatchDelayForEvent/SeparateHttpNoTLS (6.66s)
    --- FAIL: TestWatchDelayForEvent/SeparateHttpTLS (7.08s)

--- PASS: TestWatchDelayForEvent (26.01s)
    --- PASS: TestWatchDelayForEvent/NoTLS (6.37s)
    --- PASS: TestWatchDelayForEvent/TLS (6.84s)
    --- PASS: TestWatchDelayForEvent/SeparateHttpNoTLS (6.27s)
    --- PASS: TestWatchDelayForEvent/SeparateHttpTLS (6.53s)

@wenjiaswe @ahrtr
Update clientv3/snapshot/v3_snapshot.go
44e59b1 
Co-authored-by: Benjamin Wang <wachao@vmware.com>
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
@wenjiaswe
[WIP] Update CHANGELOG-3.4.md for etcd-io#16193
4190405 
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
@wenjiaswe
Update CHANGELOG for etcd-io#16029 etcd-io#16165 etcd-io#16193
afc0a94 
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
@ahrtr ahrtr mentioned this pull request Jul 7, 2023
Closed
5 tasks
wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
@wenjiaswe
Update CHANGELOG for etcd-io#16029 etcd-io#16165 etcd-io#16193
ef4802f 
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
ahrtr
ahrtr approved these changes Jul 7, 2023
View reviewed changes
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 @wenjiaswe

wenjiaswe added a commit to wenjiaswe/etcd that referenced this pull request Jul 7, 2023
@wenjiaswe
Update CHANGELOG for etcd-io#16029 etcd-io#16165 etcd-io#16193
e3e5888 
Signed-off-by: Wenjia Zhang <wenjiazhang@google.com>
@serathius serathius merged commit 4e800bd into etcd-io:release-3.4 Jul 7, 2023
serathius added a commit that referenced this pull request Jul 7, 2023
@serathius
Merge pull request #16194 from wenjiaswe/patch-1
82f6cb4 
Update CHANGELOG for #16029 #16165 #16193
@wenjiaswe wenjiaswe mentioned this pull request Jul 7, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahrtr ahrtr ahrtr approved these changes

@serathius serathius serathius approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wenjiaswe @ahrtr @serathius