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

Fixes balancing of metadata table #5195

Open
wants to merge 5 commits into
base: 2.1
Choose a base branch
from
Open

Fixes balancing of metadata table #5195

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6eab50f
Fixes balance related filtering that was using table name instead of id
keith-turner Dec 17, 2024
e8bdf97
format code
keith-turner Dec 18, 2024
797ac6e
adds tests and fixes some issues
keith-turner Dec 18, 2024
6de5ef9
fix problems found in testing
keith-turner Dec 21, 2024
19e792c
correct usage of partitionName
keith-turner Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,20 +1000,22 @@ private SortedMap<TServerInstance,TabletServerStatus> createTServerStatusView(
final Map<String,TableInfo> newTableMap =
new HashMap<>(dl == DataLevel.USER ? oldTableMap.size() : 1);
if (dl == DataLevel.ROOT) {
if (oldTableMap.containsKey(RootTable.NAME)) {
newTableMap.put(RootTable.NAME, oldTableMap.get(RootTable.NAME));
if (oldTableMap.containsKey(RootTable.ID.canonical())) {
Copy link
Member

Choose a reason for hiding this comment

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

Why not make it a Map<TableId,TableInfo> instead of Map<String,TableInfo>?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Why not make it a Map<TableId,TableInfo> instead of Map<String,TableInfo>?

The code is currently manipulating a Thrift object which can not use the TableId type. A larger refactor would be needed to make that change, could open in issue to look into that.

newTableMap.put(RootTable.ID.canonical(), oldTableMap.get(RootTable.ID.canonical()));
}
} else if (dl == DataLevel.METADATA) {
if (oldTableMap.containsKey(MetadataTable.NAME)) {
newTableMap.put(MetadataTable.NAME, oldTableMap.get(MetadataTable.NAME));
if (oldTableMap.containsKey(MetadataTable.ID.canonical())) {
newTableMap.put(MetadataTable.ID.canonical(),
oldTableMap.get(MetadataTable.ID.canonical()));
}
} else if (dl == DataLevel.USER) {
if (!oldTableMap.containsKey(MetadataTable.NAME)
&& !oldTableMap.containsKey(RootTable.NAME)) {
if (!oldTableMap.containsKey(MetadataTable.ID.canonical())
&& !oldTableMap.containsKey(RootTable.ID.canonical())) {
newTableMap.putAll(oldTableMap);
} else {
oldTableMap.forEach((table, info) -> {
if (!table.equals(RootTable.NAME) && !table.equals(MetadataTable.NAME)) {
if (!table.equals(RootTable.ID.canonical())
&& !table.equals(MetadataTable.ID.canonical())) {
newTableMap.put(table, info);
}
});
Expand Down
Loading