-
Notifications
You must be signed in to change notification settings - Fork 478
Add support for multiple Fate instances to the Manager #4133
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
16cc8de
Add support for multiple fate instances
cshannon 1719d75
Start rework of Fate Admin command and fix ITs that use it
cshannon 80aa8f5
Merge branch 'elasticity' into multi-fate
cshannon d80c8d6
Fix NamespacesIT after adding new accumulo.fate table
cshannon 5dbd934
Merge branch 'elasticity' into multi-fate
cshannon d3ec31b
Rename method in FateInstanceType
cshannon e803448
Address multiple PR comments
cshannon 4709b2f
Fix ITs after addition of FateTable
cshannon ddfa4e2
Fix conversion of table id to fate instance type
cshannon 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 hidden or 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 hidden or 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
66 changes: 66 additions & 0 deletions
66
core/src/main/java/org/apache/accumulo/core/fate/FateInstanceType.java
This file contains hidden or 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,66 @@ | ||
| /* | ||
| * 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.core.fate; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| import org.apache.accumulo.core.clientImpl.Namespace; | ||
| import org.apache.accumulo.core.data.TableId; | ||
| import org.apache.accumulo.core.manager.thrift.TFateInstanceType; | ||
| import org.apache.accumulo.core.metadata.FateTable; | ||
| import org.apache.accumulo.core.metadata.MetadataTable; | ||
| import org.apache.accumulo.core.metadata.RootTable; | ||
|
|
||
| public enum FateInstanceType { | ||
| META, USER; | ||
|
|
||
| private static final Set<TableId> META_TABLES = | ||
| Set.of(RootTable.ID, MetadataTable.ID, FateTable.ID); | ||
|
|
||
| public static FateInstanceType fromNamespaceOrTableName(String tableOrNamespaceName) { | ||
| return tableOrNamespaceName.startsWith(Namespace.ACCUMULO.name()) ? FateInstanceType.META | ||
| : FateInstanceType.USER; | ||
| } | ||
|
|
||
| public TFateInstanceType toThrift() { | ||
| switch (this) { | ||
| case USER: | ||
| return TFateInstanceType.USER; | ||
| case META: | ||
| return TFateInstanceType.META; | ||
| default: | ||
| throw new IllegalStateException("Unknown FateInstance type " + this); | ||
| } | ||
| } | ||
|
|
||
| public static FateInstanceType fromThrift(TFateInstanceType tfit) { | ||
| switch (tfit) { | ||
| case USER: | ||
| return FateInstanceType.USER; | ||
| case META: | ||
| return FateInstanceType.META; | ||
| default: | ||
| throw new IllegalStateException("Unknown type " + tfit); | ||
| } | ||
| } | ||
|
|
||
| public static FateInstanceType fromTableId(TableId tableId) { | ||
| return META_TABLES.contains(tableId) ? META : USER; | ||
| } | ||
| } |
This file contains hidden or 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
27 changes: 27 additions & 0 deletions
27
core/src/main/java/org/apache/accumulo/core/metadata/FateTable.java
This file contains hidden or 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,27 @@ | ||
| /* | ||
| * 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.core.metadata; | ||
|
|
||
| import org.apache.accumulo.core.clientImpl.Namespace; | ||
| import org.apache.accumulo.core.data.TableId; | ||
|
|
||
| public class FateTable { | ||
| public static final TableId ID = TableId.of("+fate"); | ||
| public static final String NAME = Namespace.ACCUMULO.name() + ".fate"; | ||
| } |
Oops, something went wrong.
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 was really surprised by how minimal the changes were to this class.