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

Fix index count on IndexSetPage #11395

Merged
merged 2 commits into from Oct 1, 2021
Merged

Fix index count on IndexSetPage #11395

merged 2 commits into from Oct 1, 2021

Conversation

supahgreg
Copy link
Contributor

@supahgreg supahgreg commented Sep 30, 2021 •
edited

Fixes the index count on IndexSetPage.

Description

Previously, _totalIndexCount was counting the keys of the indexerOverview response (introduced w/ #10401; specifically this), rather than the response's indices key. This PR updates that function so it counts the right thing.

Motivation and Context

Fixes #11375.

How Has This Been Tested?

It hasn't been tested.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Refactoring (non-breaking change)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.

@dennisoelkers dennisoelkers self-assigned this Oct 1, 2021
dennisoelkers
dennisoelkers requested changes Oct 1, 2021
View reviewed changes
Copy link
Member

@dennisoelkers dennisoelkers left a comment

Choose a reason for hiding this comment

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

Good catch! Looks good and works. Can you run yarn lint:changes --fix and commit the resulting diff? The spacing is off in your change.

@supahgreg
Copy link
Contributor Author

Oops, sorry about that. I've ran yarn lint:changes --fix and corrected the related errors.

dennisoelkers
dennisoelkers approved these changes Oct 1, 2021
View reviewed changes
Copy link
Member

@dennisoelkers dennisoelkers left a comment

Choose a reason for hiding this comment

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

Thanks a lot, @supahgreg! Good work!

@dennisoelkers dennisoelkers merged commit 01253de into Graylog2:master Oct 1, 2021
dennisoelkers pushed a commit that referenced this pull request Oct 1, 2021
@supahgreg @dennisoelkers
Fix index count on IndexSetPage (#11395)
2358155 
* Fix index count on IndexSetPage.

* Fix spacing in IndexSetPage.

(cherry picked from commit 01253de)
@dennisoelkers dennisoelkers mentioned this pull request Oct 1, 2021
Merged
9 tasks
@dennisoelkers
Copy link
Member

@supahgreg: If you are interested in a little thank you from our side, feel free to drop me your details in a short email!

linuspahl pushed a commit that referenced this pull request Oct 5, 2021
@dennisoelkers @supahgreg
Fix index count on IndexSetPage (#11395) (#11406)
38bffa0 
* Fix index count on IndexSetPage.

* Fix spacing in IndexSetPage.

(cherry picked from commit 01253de)

Co-authored-by: Greg <supahgreg@users.noreply.github.com>
linuspahl pushed a commit that referenced this pull request Oct 5, 2021
@supahgreg @linuspahl
Fix index count on IndexSetPage (#11395)
1fa320a 
* Fix index count on IndexSetPage.

* Fix spacing in IndexSetPage.
@linuspahl linuspahl mentioned this pull request Oct 5, 2021
Merged
9 tasks
dennisoelkers pushed a commit that referenced this pull request Oct 5, 2021
@linuspahl @supahgreg
Fix index count on IndexSetPage (#11395) (#11423)
b03d7c3 
* Fix index count on IndexSetPage.

* Fix spacing in IndexSetPage.

Co-authored-by: Greg <supahgreg@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dennisoelkers dennisoelkers dennisoelkers approved these changes

Assignees

@dennisoelkers dennisoelkers

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Graylog 4.1 showing wrong indices number under management
2 participants
@supahgreg @dennisoelkers