-
Notifications
You must be signed in to change notification settings - Fork 180
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
[2.26.x] Historian blacklist for updates and deletes #6786
Conversation
Steven Malmgren seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
@@ -223,6 +240,7 @@ public UpdateStorageResponse version( | |||
.map(ContentItem::getMetacard) | |||
.filter(Objects::nonNull) | |||
.filter(isNotVersionNorDeleted) | |||
.filter(this::isNotBlackListedUpdate) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could split the config to allow for versioning on the content separately but not sure there's a use case for skipping versioning on the direct metacard updates, but not the content updates.
build now |
Internal build has been started, your results will be available at build completion. |
Build FAILURE See the job results in legacy Jenkins UI or in Blue Ocean UI. |
Internal build has been started, your results will be available at build completion. |
Build FAILURE See the job results in legacy Jenkins UI or in Blue Ocean UI. |
build now |
Internal build has been started, your results will be available at build completion. |
Build SUCCESS See the job results in legacy Jenkins UI or in Blue Ocean UI. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice historian updates 👉😏👉
@@ -363,7 +363,7 @@ public DeleteResponse delete(DeleteRequest deleteRequest) throws IngestException | |||
deleteListOfMetacards(deletedMetacards, identifierPaged, attributeName); | |||
} | |||
|
|||
return new DeleteResponseImpl(deleteRequest, null, deletedMetacards); | |||
return new DeleteResponseImpl(deleteRequest, deleteRequest.getProperties(), deletedMetacards); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I could be misremembering, but it's probably worth checking that there's nothing sensitive inside the request properties that we don't want to send in the response.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would agree. I think we should leave the request properties where they are and check them if there is a property we're looking for (I just made an update to do that to check for the skip_versioning property #6789).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yea sounds good. I'll update it to just forward that if it's there
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay yea I see your change now. I'll drop that change in my PR and we can have these tested together.
build now |
Internal build has been started, your results will be available at build completion. |
Build SUCCESS See the job results in legacy Jenkins UI or in Blue Ocean UI. |
This reverts commit 5bb718b.
This reverts commit 5bb718b.
What does this PR do?
Introduces system properties for skipping historian versioning on deletes and updates (both direct metacard updates and associated content updates).
e.g.
# Skip historian for the following types on updates
org.codice.ddf.history.update.blacklist.metacardTypes=query,workspace
# Skip historian for the following types on deletes
org.codice.ddf.history.deletes.blacklist.metacardTypes=workspace
Additionally this copies the DeleteRequest properties onto the DeleteResponse. This was initially done to allow for the SKIP_VERSIONING property to be used with local deletes, but this also makes behavior more consistent across the Create, Update, and Delete requests on the Solr implementation of the CatalogProvider.
Who is reviewing it?
Select relevant component teams:
Ask 2 committers to review/merge the PR and tag them here.
How should this be tested?
Any background context you want to provide?
What are the relevant tickets?
Fixes: #____
Screenshots
Checklist:
Notes on Review Process
Please see Notes on Review Process for further guidance on requirements for merging and abbreviated reviews.
Review Comment Legend: