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

adding null check to fix overlapping blocks #7058

Open
wants to merge 9 commits into
base: main
Choose a base branch
from

Conversation

harsh-ps-2003
Copy link
Contributor

Signed-off-by: Harsh Pratap Singh harshpratapsingh8210@gmail.com

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

fixes #5359

Verification

Manually tested.
Screenshot 2024-01-13 at 6 50 36 PM

Signed-off-by: Harsh Pratap Singh <harshpratapsingh8210@gmail.com>
@harsh-ps-2003
Copy link
Contributor Author

If it looks good I will add the changelog! @MichaHoffmann

@yeya24
Copy link
Contributor

yeya24 commented Jan 13, 2024

Seems duplicate with #6768?
Are you willing to implement the unit tests?

@harsh-ps-2003
Copy link
Contributor Author

harsh-ps-2003 commented Jan 13, 2024

Seems duplicate with #6768?
Are you willing to implement the unit tests?

Oh! The issue was big with a lot of complains I missed someone else was already working on it! Sorry I will close the PR @yeya24

@harsh-ps-2003
Copy link
Contributor Author

On looking at the #6768, I see that the issue was already fixed but the unit test was missing. So I will add the unit test also. @yeya24

Signed-off-by: Harsh Pratap Singh <harshpratapsingh8210@gmail.com>
@harsh-ps-2003
Copy link
Contributor Author

@yeya24 I have tried adding the unit test with the changes that were already presented in #6768 if you want I can close this PR and make a pull request only for test that I am adding if you want to merge #6768 first!

@yeya24
Copy link
Contributor

yeya24 commented Jan 14, 2024

@harsh-ps-2003 Thanks for adding the test. We don't have to wait for #6768 since it has conflicts.
We need frontend experts to help review this pr.

@@ -656,3 +658,37 @@ describe('Filtered block pools', () => {
expect(filteredBlockPoolArray[0].thanos.labels).toEqual(filteredBlocks[0].thanos.labels);
});
});

const newBlockPools = blockPools;
Copy link
Member

Choose a reason for hiding this comment

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

Any reason all of these variables aren't moved into the test itself?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah! moved the constants in the test. thanks

@yeya24
Copy link
Contributor

yeya24 commented Jan 19, 2024

Note that react tests failed.

@harsh-ps-2003
Copy link
Contributor Author

harsh-ps-2003 commented Jan 19, 2024

Note that react tests failed.

I don't think its because of this PR, instead CI=false is set due to which the warnings are treated as error @yeya24
I tried fixing most of the warnings in #7069 , but stuck on 4 files which I am facing difficulty fixing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compactor/Store Gateway/Bucket UI: Enable finding overlapping block make frontend crash
3 participants