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

[#5082] fix(catalog): fix clean bug after create catalog failed #5084

Merged
merged 1 commit into from
Oct 10, 2024
Merged

[#5082] fix(catalog): fix clean bug after create catalog failed #5084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ tasks.rat {
"ROADMAP.md",
"clients/client-python/.pytest_cache/*",
"clients/client-python/.venv/*",
"clients/client-python/venv/*",
"clients/client-python/apache_gravitino.egg-info/*",
"clients/client-python/gravitino/utils/http_client.py",
"clients/client-python/tests/unittests/htmlcov/*",
Expand Down
8 changes: 8 additions & 0 deletions ...nts/client-java/src/test/java/org/apache/gravitino/client/integration/test/CatalogIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.gravitino.Catalog;
import org.apache.gravitino.CatalogChange;
import org.apache.gravitino.client.GravitinoMetalake;
import org.apache.gravitino.exceptions.CatalogAlreadyExistsException;
import org.apache.gravitino.integration.test.container.ContainerSuite;
import org.apache.gravitino.integration.test.container.HiveContainer;
import org.apache.gravitino.integration.test.util.AbstractIT;
Expand Down Expand Up @@ -125,6 +126,13 @@ public void testDropCatalog() {
Assertions.assertTrue(metalake.catalogExists(catalogName));
Assertions.assertEquals(catalogName, catalog.name());

Assertions.assertThrows(
CatalogAlreadyExistsException.class,
() ->
metalake.createCatalog(
catalogName, Catalog.Type.RELATIONAL, "hive", "catalog comment", properties));
Assertions.assertTrue(metalake.catalogExists(catalogName));

Assertions.assertTrue(metalake.dropCatalog(catalogName), "catalog should be dropped");
Assertions.assertFalse(metalake.dropCatalog(catalogName), "catalog should be non-existent");
}
Expand Down
14 changes: 11 additions & 3 deletions core/src/main/java/org/apache/gravitino/catalog/CatalogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public Catalog createCatalog(
.build())
.build();

boolean createSuccess = false;
boolean needClean = true;
try {
NameIdentifier metalakeIdent = NameIdentifier.of(ident.namespace().levels());
if (!store.exists(metalakeIdent, EntityType.METALAKE)) {
Expand All @@ -376,22 +376,30 @@ public Catalog createCatalog(

store.put(e, false /* overwrite */);
CatalogWrapper wrapper = catalogCache.get(ident, id -> createCatalogWrapper(e));
createSuccess = true;

needClean = false;
return wrapper.catalog;

} catch (EntityAlreadyExistsException e1) {
needClean = false;
LOG.warn("Catalog {} already exists", ident, e1);
throw new CatalogAlreadyExistsException("Catalog %s already exists", ident);

} catch (IllegalArgumentException | NoSuchMetalakeException e2) {
throw e2;

} catch (Exception e3) {
catalogCache.invalidate(ident);
LOG.error("Failed to create catalog {}", ident, e3);
if (e3 instanceof RuntimeException) {
throw (RuntimeException) e3;
}
throw new RuntimeException(e3);

} finally {
if (!createSuccess) {
if (needClean) {
// since we put the catalog entity into the store but failed to create the catalog instance,
// we need to clean up the entity stored.
try {
store.delete(ident, EntityType.CATALOG, true);
} catch (IOException e4) {
Expand Down
7 changes: 4 additions & 3 deletions core/src/test/java/org/apache/gravitino/catalog/TestCatalogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,10 @@ public void testCreateCatalog() {

// test before creation
Assertions.assertThrows(
NoSuchMetalakeException.class,
CatalogAlreadyExistsException.class,
() ->
catalogManager.testConnection(
ident2, Catalog.Type.RELATIONAL, provider, "comment", props));
ident, Catalog.Type.RELATIONAL, provider, "comment", props));

// Test create with duplicated name
Throwable exception2 =
Expand Down Expand Up @@ -309,7 +309,8 @@ public void testCreateCatalog() {
catalogManager.createCatalog(
failedIdent, Catalog.Type.RELATIONAL, provider, "comment", props));
Assertions.assertTrue(
exception4.getMessage().contains("Properties are reserved and cannot be set"));
exception4.getMessage().contains("Properties are reserved and cannot be set"),
exception4.getMessage());
Assertions.assertNull(catalogManager.catalogCache.getIfPresent(failedIdent));
}

Expand Down
Loading