Skip to content

purger: fix nil value in column range for BatchWrite query #4128

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
Merged
merged 1 commit into from
May 6, 2021
Merged

purger: fix nil value in column range for BatchWrite query #4128

merged 1 commit into from
May 6, 2021

Conversation

jakubgs
Copy link
Contributor

@jakubgs jakubgs commented Apr 27, 2021

Fixes following error:

msg="error adding delete request to the store" err="Invalid null value in condition for column range"

Resolves: #3237

@jakubgs jakubgs mentioned this pull request Apr 27, 2021
Closed
pracucci
pracucci reviewed Apr 29, 2021
View reviewed changes
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

@sandeepsukhani Could you review this, please?

@jakubgs
Copy link
Contributor Author

jakubgs commented Apr 29, 2021

Oh, I see it's not an actually full 1.9.0 release but an 1.9.0-rc.0. Any possibility we could get this fix into full 1.9.0?

sandeepsukhani
sandeepsukhani approved these changes Apr 30, 2021
View reviewed changes
Copy link
Contributor

@sandeepsukhani sandeepsukhani left a comment

Choose a reason for hiding this comment

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

LGTM

@jakubgs
Copy link
Contributor Author

jakubgs commented Apr 30, 2021

I don't see how the test failures are related to my changes:

--- FAIL: TestAlertmanagerSharding (57.27s)
    --- PASS: TestAlertmanagerSharding/bucket_alertstore,_RF_=_2 (14.24s)
    --- PASS: TestAlertmanagerSharding/legacy_alertstore,_RF_=_3 (14.54s)
    --- FAIL: TestAlertmanagerSharding/bucket_alertstore,_RF_=_3 (16.24s)
    --- PASS: TestAlertmanagerSharding/legacy_alertstore,_RF_=_2 (12.25s)

Is it just a fluke?

@gouthamve gouthamve changed the base branch from master to release-1.9 April 30, 2021 14:23
@gouthamve gouthamve changed the base branch from release-1.9 to master April 30, 2021 14:24
pstibrany
pstibrany approved these changes May 5, 2021
View reviewed changes
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Thanks. Can you please fix conflict in CHANGELOG?

@jakubgs
purger: fix nil value in column range for BatchWrite query
e9f9b51 
Fixes following error:
```
msg="error adding delete request to the store" err="Invalid null value in condition for column range"
```
Resolves: cortexproject#3237

Signed-off-by: Jakub Sokołowski <jakub@status.im>
@jakubgs jakubgs force-pushed the fix-purger-query branch from 01978c6 to e9f9b51 Compare May 5, 2021 11:11
@jakubgs
Copy link
Contributor Author

jakubgs commented May 6, 2021

Will somebody merge this, or will I have to rebase CHANGELOG.md changes for the third time?

@pstibrany pstibrany enabled auto-merge (squash) May 6, 2021 07:13
@pstibrany
Copy link
Contributor

Will somebody merge this, or will I have to rebase CHANGELOG.md changes for the third time?

PR is now set to merge after CI checks pass. Thank you.

@jakubgs
Copy link
Contributor Author

jakubgs commented May 6, 2021

Yeah, but CI checks fail on random stuff totally unrelated to my changes, like:

--- FAIL: TestAlertmanager_StateReplicationWithSharding_InitialSyncFromPeers (3.88s)
    --- FAIL: TestAlertmanager_StateReplicationWithSharding_InitialSyncFromPeers/RF_=_2 (1.49s)
        multitenant_test.go:1617: 
            	Error Trace:	multitenant_test.go:1617
            	Error:      	Not equal: 
            	            	expected: 1
            	            	actual  : 0
            	Test:       	TestAlertmanager_StateReplicationWithSharding_InitialSyncFromPeers/RF_=_2
FAIL
FAIL	github.com/cortexproject/cortex/pkg/alertmanager	111.319s

@pstibrany pstibrany merged commit c4b8bd1 into cortexproject:master May 6, 2021
jakubgs added a commit to status-im/infra-role-cortex that referenced this pull request Mar 10, 2024
@jakubgs
service: patched build of 1.8.0 with fix for purger
7146f3d 
See:
cortexproject/cortex#4128

Signed-off-by: Jakub Sokołowski <jakub@status.im>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pstibrany pstibrany pstibrany approved these changes

@sandeepsukhani sandeepsukhani sandeepsukhani approved these changes

@pracucci pracucci pracucci approved these changes

Assignees
No one assigned
Labels
size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Delete series API call not working (throwing Exception)
4 participants
@jakubgs @pstibrany @sandeepsukhani @pracucci