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

Support rollbacks of osquery when new versions introduce new column families #7712

Merged

Conversation

lucasmrod
Copy link
Contributor

@lucasmrod lucasmrod commented Aug 2, 2022

This PR is implementing what @Smjert proposed here: #7675 (comment)

I tested it with a database written by a branch that introduced a new column family (#7675).

@lucasmrod lucasmrod marked this pull request as ready for review August 7, 2022 21:25
@lucasmrod lucasmrod requested review from a team as code owners August 7, 2022 21:25
@lucasmrod
Copy link
Contributor Author

Are the failing tests known to be flaky? Or should I try to troubleshoot what's going on?

@Smjert
Copy link
Member

Smjert commented Aug 9, 2022

Are the failing tests known to be flaky? Or should I try to troubleshoot what's going on?

There's a flaky test: #7433. I'll re-run the failed jobs.

@mike-myers-tob mike-myers-tob added core ready for review Pull requests that are ready to be reviewed by a maintainer labels Aug 18, 2022
@lucasmrod
Copy link
Contributor Author

@Smjert @mike-myers-tob Hi folks. Could you re-trigger a CI check? (to check if I need to fix anything else)

@sharvilshah
Copy link
Member

@lucasmrod closing and reopening PR to trigger CI

@directionless
Copy link
Member

@Smjert How's it look to you?

Copy link
Member

@Smjert Smjert left a comment

Choose a reason for hiding this comment

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

@lucasmrod Thanks for trying this idea!
It definitely works, but I would restructure a little the code, if possible (see below).

plugins/database/rocksdb.cpp Outdated Show resolved Hide resolved
plugins/database/rocksdb.cpp Outdated Show resolved Hide resolved
plugins/database/rocksdb.cpp Outdated Show resolved Hide resolved
plugins/database/rocksdb.cpp Outdated Show resolved Hide resolved
plugins/database/rocksdb.cpp Outdated Show resolved Hide resolved
@lucasmrod lucasmrod force-pushed the support-rollbacks-column-families branch from 9599820 to 37ba2fa Compare December 14, 2022 17:16
@lucasmrod
Copy link
Contributor Author

@Smjert Super appreciate the feedback! The review comments have been addressed.

Copy link
Member

@Smjert Smjert left a comment

Choose a reason for hiding this comment

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

Thanks for the update, looks good!

@mike-myers-tob mike-myers-tob merged commit 3dc676b into osquery:master Dec 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core ready for review Pull requests that are ready to be reviewed by a maintainer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants