Skip to content

Fixes #27062: Fix silent exception swallowing in FeedRepository and resource leaks in SchemaFieldExtractor #27063

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
RajdeepKushwaha5 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes #27062: Fix silent exception swallowing in FeedRepository and resource leaks in SchemaFieldExtractor #27063

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
2 changes: 1 addition & 1 deletion openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ public void deleteByAbout(UUID entityId) {
try {
deleteThreadInternal(UUID.fromString(threadId));
} catch (Exception ex) {
// Continue deletion
LOG.warn("Failed to delete thread {} during entity {} cleanup", threadId, entityId, ex);
}
}
}
Expand Down
71 changes: 38 additions & 33 deletions openmetadata-service/src/main/java/org/openmetadata/service/util/SchemaFieldExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,31 +163,33 @@ private static boolean isEntityType(JSONObject jsonSchema) {
private static Schema loadMainSchema(
String schemaPath, String entityType, String schemaUri, SchemaClient schemaClient)
throws SchemaProcessingException {
InputStream schemaInputStream =
SchemaFieldExtractor.class.getClassLoader().getResourceAsStream(schemaPath);
if (schemaInputStream == null) {
LOG.error("Schema file not found at path: {}", schemaPath);
throw new SchemaProcessingException(
"Schema file not found for entity type: " + entityType,
SchemaProcessingException.ErrorType.RESOURCE_NOT_FOUND);
}
try (InputStream schemaInputStream =
SchemaFieldExtractor.class.getClassLoader().getResourceAsStream(schemaPath)) {
if (schemaInputStream == null) {
LOG.error("Schema file not found at path: {}", schemaPath);
throw new SchemaProcessingException(
"Schema file not found for entity type: " + entityType,
SchemaProcessingException.ErrorType.RESOURCE_NOT_FOUND);
}

JSONObject rawSchema = new JSONObject(new JSONTokener(schemaInputStream));
SchemaLoader schemaLoader =
SchemaLoader.builder()
.schemaJson(rawSchema)
.resolutionScope(schemaUri)
.schemaClient(schemaClient)
.build();
JSONObject rawSchema = new JSONObject(new JSONTokener(schemaInputStream));
SchemaLoader schemaLoader =
SchemaLoader.builder()
.schemaJson(rawSchema)
.resolutionScope(schemaUri)
.schemaClient(schemaClient)
.build();

try {
Schema schema = schemaLoader.load().build();
LOG.debug("Schema '{}' loaded successfully.", schemaPath);
return schema;
} catch (SchemaProcessingException e) {
throw e;
Comment thread
RajdeepKushwaha5 marked this conversation as resolved.
} catch (Exception e) {
LOG.error("Error loading schema '{}': {}", schemaPath, e.getMessage());
LOG.error("Error loading schema '{}'", schemaPath, e);
throw new SchemaProcessingException(
"Error loading schema '" + schemaPath + "': " + e.getMessage(),
e,
SchemaProcessingException.ErrorType.OTHER);
}
}
Expand Down Expand Up @@ -414,30 +416,33 @@ private Schema resolveSchemaByType(String typeName, String schemaUri, SchemaClie

private Schema loadSchema(String schemaPath, String schemaUri, SchemaClient schemaClient)
throws SchemaProcessingException {
InputStream schemaInputStream = getClass().getClassLoader().getResourceAsStream(schemaPath);
if (schemaInputStream == null) {
LOG.error("Schema file not found at path: {}", schemaPath);
throw new SchemaProcessingException(
"Schema file not found for path: " + schemaPath,
SchemaProcessingException.ErrorType.RESOURCE_NOT_FOUND);
}
try (InputStream schemaInputStream =
getClass().getClassLoader().getResourceAsStream(schemaPath)) {
if (schemaInputStream == null) {
LOG.error("Schema file not found at path: {}", schemaPath);
throw new SchemaProcessingException(
"Schema file not found for path: " + schemaPath,
SchemaProcessingException.ErrorType.RESOURCE_NOT_FOUND);
}

JSONObject rawSchema = new JSONObject(new JSONTokener(schemaInputStream));
SchemaLoader schemaLoader =
SchemaLoader.builder()
.schemaJson(rawSchema)
.resolutionScope(schemaUri) // Base URI for resolving $ref
.schemaClient(schemaClient)
.build();
JSONObject rawSchema = new JSONObject(new JSONTokener(schemaInputStream));
SchemaLoader schemaLoader =
SchemaLoader.builder()
.schemaJson(rawSchema)
.resolutionScope(schemaUri)
.schemaClient(schemaClient)
.build();

try {
Schema schema = schemaLoader.load().build();
LOG.debug("Schema '{}' loaded successfully.", schemaPath);
return schema;
} catch (SchemaProcessingException e) {
throw e;
Comment thread
RajdeepKushwaha5 marked this conversation as resolved.
} catch (Exception e) {
LOG.error("Error loading schema '{}': {}", schemaPath, e.getMessage());
LOG.error("Error loading schema '{}'", schemaPath, e);
throw new SchemaProcessingException(
"Error loading schema '" + schemaPath + "': " + e.getMessage(),
e,
SchemaProcessingException.ErrorType.OTHER);
}
}
Expand Down
Loading