Skip to content

PHOENIX-7788 CREATE TABLE fails with TableNotEnabledException when un… #2594

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

Open
ishitadixit-dot wants to merge 4 commits into
base: master
Choose a base branch
from
+269 −0
Open

PHOENIX-7788 CREATE TABLE fails with TableNotEnabledException when un… #2594

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe46de2
PHOENIX-7788 CREATE TABLE fails with TableNotEnabledException when un…
ishitadixit-dot Aug 7, 2026
ab0bb63
PHOENIX-7788: restrict re-enable to orphaned tables
ishitadixit-dot Aug 20, 2026
33b8a1b
Merge branch 'master' into PHOENIX-7788-reenable-disabled-hbase-table
ishitadixit-dot Aug 20, 2026
f5a96ad
PHOENIX-7788 fix merge artifacts in ConnectionQueryServicesImplTest
ishitadixit-dot Aug 20, 2026
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
22 changes: 22 additions & 0 deletions phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableExistsException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotDisabledException;
import org.apache.hadoop.hbase.TableNotEnabledException;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Append;
Expand Down Expand Up @@ -2007,6 +2008,19 @@ private TableDescriptor ensureTableCreated(byte[] physicalTableName,
}
}

// The physical HBase table may have been left disabled by a previous failed drop
// (or manual admin action) while its Phoenix metadata was removed. Re-enable it so
// downstream steps (modifyTable, post-DDL SYSTEM.CATALOG RPC, and the client's
// subsequent scans) see a usable table.
if (
tableType != PTableType.SYSTEM
&& admin.isTableDisabled(TableName.valueOf(physicalTableName))
) {
Comment thread
ishitadixit-dot marked this conversation as resolved.
Outdated
LOGGER.info("Re-enabling disabled HBase table {} during CREATE TABLE",
Bytes.toString(physicalTableName));
enableTable(admin, TableName.valueOf(physicalTableName));
Comment thread
ishitadixit-dot marked this conversation as resolved.
Outdated
}

if (!modifyExistingMetaData) {
return existingDesc; // Caller already knows that no metadata was changed
}
Expand Down Expand Up @@ -2450,6 +2464,14 @@ private void disableTable(Admin admin, TableName tableName) throws IOException {
}
}

private void enableTable(Admin admin, TableName tableName) throws IOException {
try {
admin.enableTable(tableName);
} catch (TableNotDisabledException e) {
LOGGER.info("Table already enabled, continuing with next steps", e);
}
}

private boolean ensureViewIndexTableDropped(byte[] physicalTableName, long timestamp)
throws SQLException {
byte[] physicalIndexName = MetaDataUtil.getViewIndexPhysicalName(physicalTableName);
Expand Down