-
Notifications
You must be signed in to change notification settings - Fork 444
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
Add balancer meter fixes #4470 #4471
Closed
Closed
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d0d9997
Add balancer metrics
a59090e
merge latest 2.1 changes
d8bfa65
Merge remote-tracking branch 'upstream/2.1' into add_balancer_meter
c36a2f5
Merge remote-tracking branch 'upstream/2.1' into add_balancer_meter
a92f8cc
rename balancer metrics (PR suggestion)
802f139
Merge remote-tracking branch 'upstream/2.1' into add_balancer_meter
d77c9d3
fix MetricsIT add missing formatter:on
5f1569b
Merge remote-tracking branch 'upstream/2.1' into add_balancer_meter
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
server/manager/src/main/java/org/apache/accumulo/manager/metrics/BalancerMetrics.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.accumulo.manager.metrics; | ||
|
||
import java.util.concurrent.atomic.AtomicLong; | ||
|
||
import org.apache.accumulo.core.metrics.MetricsProducer; | ||
|
||
import io.micrometer.core.instrument.Gauge; | ||
import io.micrometer.core.instrument.MeterRegistry; | ||
|
||
public class BalancerMetrics implements MetricsProducer { | ||
|
||
AtomicLong migratingCount = new AtomicLong(); | ||
AtomicLong needMigrationCount = new AtomicLong(); | ||
|
||
public long getMigratingCount() { | ||
return migratingCount.get(); | ||
} | ||
|
||
public void setMigratingCount(final long migratingCount) { | ||
this.migratingCount.set(migratingCount); | ||
} | ||
|
||
public long getNeedMigrationCount() { | ||
return needMigrationCount.get(); | ||
} | ||
|
||
public void setNeedMigrationCount(final long needMigrationCount) { | ||
this.needMigrationCount.set(needMigrationCount); | ||
} | ||
|
||
@Override | ||
public void registerMetrics(MeterRegistry registry) { | ||
Gauge.builder(METRICS_MANAGER_BALANCER_MIGRATING, this, BalancerMetrics::getMigratingCount) | ||
.description("Snapshot count of tablets currently being migrated").register(registry); | ||
Gauge | ||
.builder(METRICS_MANAGER_BALANCER_NEED_MIGRATION, this, | ||
BalancerMetrics::getNeedMigrationCount) | ||
.description("Snapshot count of tablets that need to be migrated").register(registry); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 believe that the
migrations
variable in the Manager contains all of the in-flight migrations. Theparams.migrationsOut
contains the tablets that need to be migrated from this call to the balancer. I think based on what I'm seeing here, it's double counting. I wonder if we just want the size of themigrations
list as that will encompass newly added, newly removed, and migrations waiting to happen.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.
If you want to capture the newly added migrations, then it might make sense to capture the migration completions (which are in the TabletGroupWatcher) and cancellations (which happen in a couple places in the Manager).
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.
So to complete the #4470 ask, just recording
migrations.size()
would be sufficient.migrationsOut().size()
seems useful as a secondary metric for alerting if balancer progress stalls.Doing some general tests and with a single balancer call, both of the currently implemented metrics come back with the same values.
I think keeping
migrations.size()
under themigrations.needed
metric makes sense.in-progress
wording may need to be tweaked a bit to better describe last set of migrations generated.For users, a possible alert condition would be
migrationsOut().size()
is 0 whilemigrations.size()
is still greater than 0.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.
put up #4699 as a continuation of these changes.