Skip to content

prevent offline all system tables #5433

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

Merged
kevinrr888 merged 3 commits into from
Apr 16, 2025
Merged

prevent offline all system tables #5433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c6677e
Prevents offline of all system tables
kevinrr888 Apr 15, 2025
49932e0
avoid RPC changes, adds new Validator
kevinrr888 Apr 16, 2025
781151e
fix potentially confusing validator
kevinrr888 Apr 16, 2025
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
11 changes: 11 additions & 0 deletions core/src/main/java/org/apache/accumulo/core/util/Validators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,4 +227,15 @@ public static Validator<String> sameNamespaceAs(String oldTableName) {
return Validator.OK;
});

public static final Validator<TableId> NOT_METADATA_TABLE_ID = new Validator<>(id -> {
if (id == null) {
return Optional.of("Table id must not be null");
}
if (MetadataTable.ID.equals(id)) {
return Optional.of(
"Table must not be the " + MetadataTable.NAME + "(Id: " + MetadataTable.ID + ") table");
}
return Validator.OK;
});

}
9 changes: 7 additions & 2 deletions server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import static org.apache.accumulo.core.util.Validators.NOT_BUILTIN_NAMESPACE;
import static org.apache.accumulo.core.util.Validators.NOT_BUILTIN_TABLE;
import static org.apache.accumulo.core.util.Validators.NOT_METADATA_TABLE;
import static org.apache.accumulo.core.util.Validators.NOT_METADATA_TABLE_ID;
import static org.apache.accumulo.core.util.Validators.NOT_ROOT_TABLE_ID;
import static org.apache.accumulo.core.util.Validators.VALID_TABLE_ID;
import static org.apache.accumulo.core.util.Validators.sameNamespaceAs;
Expand Down Expand Up @@ -382,7 +383,9 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, long opid, FateOpe
case TABLE_ONLINE: {
TableOperation tableOp = TableOperation.ONLINE;
validateArgumentCount(arguments, tableOp, 1);
final var tableId = validateTableIdArgument(arguments.get(0), tableOp, NOT_ROOT_TABLE_ID);
final var tableId = validateTableIdArgument(arguments.get(0), tableOp,
NOT_ROOT_TABLE_ID.and(NOT_METADATA_TABLE_ID));

NamespaceId namespaceId = getNamespaceIdFromTableId(tableOp, tableId);

final boolean canOnlineOfflineTable;
Expand Down Expand Up @@ -410,7 +413,9 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, long opid, FateOpe
case TABLE_OFFLINE: {
TableOperation tableOp = TableOperation.OFFLINE;
validateArgumentCount(arguments, tableOp, 1);
final var tableId = validateTableIdArgument(arguments.get(0), tableOp, NOT_ROOT_TABLE_ID);
final var tableId = validateTableIdArgument(arguments.get(0), tableOp,
NOT_ROOT_TABLE_ID.and(NOT_METADATA_TABLE_ID));

NamespaceId namespaceId = getNamespaceIdFromTableId(tableOp, tableId);

final boolean canOnlineOfflineTable;
Expand Down