yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-01 13:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Playwright failures: handle JsonParsingException after JsonUtils refactor (#22020)

Browse Source
This commit is contained in:
sonika-shah 2025-06-29 22:17:33 +05:30 committed by GitHub
parent cb39c70ef7
commit ae3c6893eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/automatedTask/runApp/RunAppImpl.java
View File

@ -26,6 +26,7 @@ import org.openmetadata.schema.entity.applications.configuration.internal.Servic
import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipeline; import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipeline;
import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineStatus; import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineStatus;
import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineStatusType; import org.openmetadata.schema.entity.services.ingestionPipelines.PipelineStatusType;
import org.openmetadata.schema.exception.JsonParsingException;
import org.openmetadata.schema.type.EntityReference; import org.openmetadata.schema.type.EntityReference;
import org.openmetadata.schema.type.Include; import org.openmetadata.schema.type.Include;
import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.schema.utils.JsonUtils;
@ -175,7 +176,7 @@ public class RunAppImpl {
.triggerApplicationOnDemand( .triggerApplicationOnDemand(
app, Entity.getCollectionDAO(), Entity.getSearchRepository(), config); app, Entity.getCollectionDAO(), Entity.getSearchRepository(), config);
break; break;
} catch (UnhandledServerException e) { } catch (JsonParsingException | UnhandledServerException e) {
if (e.getMessage().contains("Job is already running")) { if (e.getMessage().contains("Job is already running")) {
attempt++; attempt++;
if (attempt >= maxRetries) { if (attempt >= maxRetries) {

4
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/ChangeSummarizer.java
View File

@ -10,11 +10,11 @@ import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.EntityInterface;
import org.openmetadata.schema.exception.JsonParsingException;
import org.openmetadata.schema.type.FieldChange; import org.openmetadata.schema.type.FieldChange;
import org.openmetadata.schema.type.change.ChangeSource; import org.openmetadata.schema.type.change.ChangeSource;
import org.openmetadata.schema.type.change.ChangeSummary; import org.openmetadata.schema.type.change.ChangeSummary;
import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.schema.utils.JsonUtils;
import org.openmetadata.service.exception.UnhandledServerException;
import org.openmetadata.service.util.FullyQualifiedName; import org.openmetadata.service.util.FullyQualifiedName;
@Slf4j @Slf4j
@ -148,7 +148,7 @@ public class ChangeSummarizer<T extends EntityInterface> {
keysToDelete.add( keysToDelete.add(
FullyQualifiedName.build(fieldChange.getName(), name, nestedField)); FullyQualifiedName.build(fieldChange.getName(), name, nestedField));
}); });
} catch (UnhandledServerException e) { } catch (JsonParsingException e) {
LOG.warn("Error processing deleted fields", e); LOG.warn("Error processing deleted fields", e);
} }
} }

14
openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v132/MigrationUtil.java
View File

@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
import org.jdbi.v3.core.Handle; import org.jdbi.v3.core.Handle;
import org.json.JSONObject; import org.json.JSONObject;
import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipeline; import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipeline;
import org.openmetadata.schema.exception.JsonParsingException;
import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtAzureConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtAzureConfig;
import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtCloudConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtCloudConfig;
import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtGCSConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtGCSConfig;
@ -12,7 +13,6 @@ import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtHttpConfig;
import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtLocalConfig; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtLocalConfig;
import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtS3Config; import org.openmetadata.schema.metadataIngestion.dbtconfig.DbtS3Config;
import org.openmetadata.schema.utils.JsonUtils; import org.openmetadata.schema.utils.JsonUtils;
import org.openmetadata.service.exception.UnhandledServerException;
@Slf4j @Slf4j
public class MigrationUtil { public class MigrationUtil {
@ -55,7 +55,7 @@ public class MigrationUtil {
DbtS3Config dbtS3Config = JsonUtils.readValue(jsonString, DbtS3Config.class); DbtS3Config dbtS3Config = JsonUtils.readValue(jsonString, DbtS3Config.class);
dbtS3Config.setDbtConfigType(DbtS3Config.DbtConfigType.S_3); dbtS3Config.setDbtConfigType(DbtS3Config.DbtConfigType.S_3);
return dbtS3Config; return dbtS3Config;
} catch (UnhandledServerException ex) { } catch (JsonParsingException ex) {
} }
// For adding GCS type // For adding GCS type
@ -63,7 +63,7 @@ public class MigrationUtil {
DbtGCSConfig dbtGCSConfig = JsonUtils.readValue(jsonString, DbtGCSConfig.class); DbtGCSConfig dbtGCSConfig = JsonUtils.readValue(jsonString, DbtGCSConfig.class);
dbtGCSConfig.setDbtConfigType(DbtGCSConfig.DbtConfigType.GCS); dbtGCSConfig.setDbtConfigType(DbtGCSConfig.DbtConfigType.GCS);
return dbtGCSConfig; return dbtGCSConfig;
} catch (UnhandledServerException ex) { } catch (JsonParsingException ex) {
} }
// For adding Azure type // For adding Azure type
@ -71,7 +71,7 @@ public class MigrationUtil {
DbtAzureConfig dbtAzureConfig = JsonUtils.readValue(jsonString, DbtAzureConfig.class); DbtAzureConfig dbtAzureConfig = JsonUtils.readValue(jsonString, DbtAzureConfig.class);
dbtAzureConfig.setDbtConfigType(DbtAzureConfig.DbtConfigType.AZURE); dbtAzureConfig.setDbtConfigType(DbtAzureConfig.DbtConfigType.AZURE);
return dbtAzureConfig; return dbtAzureConfig;
} catch (UnhandledServerException ex) { } catch (JsonParsingException ex) {
} }
// For adding cloud type // For adding cloud type
@ -79,7 +79,7 @@ public class MigrationUtil {
DbtCloudConfig dbtCloudConfig = JsonUtils.readValue(jsonString, DbtCloudConfig.class); DbtCloudConfig dbtCloudConfig = JsonUtils.readValue(jsonString, DbtCloudConfig.class);
dbtCloudConfig.setDbtConfigType(DbtCloudConfig.DbtConfigType.CLOUD); dbtCloudConfig.setDbtConfigType(DbtCloudConfig.DbtConfigType.CLOUD);
return dbtCloudConfig; return dbtCloudConfig;
} catch (UnhandledServerException ex) { } catch (JsonParsingException ex) {
} }
// For adding local type // For adding local type
@ -87,7 +87,7 @@ public class MigrationUtil {
DbtLocalConfig dbtLocalConfig = JsonUtils.readValue(jsonString, DbtLocalConfig.class); DbtLocalConfig dbtLocalConfig = JsonUtils.readValue(jsonString, DbtLocalConfig.class);
dbtLocalConfig.setDbtConfigType(DbtLocalConfig.DbtConfigType.LOCAL); dbtLocalConfig.setDbtConfigType(DbtLocalConfig.DbtConfigType.LOCAL);
return dbtLocalConfig; return dbtLocalConfig;
} catch (UnhandledServerException ex) { } catch (JsonParsingException ex) {
} }
// For adding http type // For adding http type
@ -95,7 +95,7 @@ public class MigrationUtil {
DbtHttpConfig dbtHttpConfig = JsonUtils.readValue(jsonString, DbtHttpConfig.class); DbtHttpConfig dbtHttpConfig = JsonUtils.readValue(jsonString, DbtHttpConfig.class);
dbtHttpConfig.setDbtConfigType(DbtHttpConfig.DbtConfigType.HTTP); dbtHttpConfig.setDbtConfigType(DbtHttpConfig.DbtConfigType.HTTP);
return dbtHttpConfig; return dbtHttpConfig;
} catch (UnhandledServerException ex) { } catch (JsonParsingException ex) {
} }
return null; return null;
} }

8
openmetadata-service/src/main/java/org/openmetadata/service/search/SearchRepository.java
View File

@ -87,6 +87,7 @@ import org.openmetadata.schema.api.search.SearchSettings;
import org.openmetadata.schema.dataInsight.DataInsightChartResult; import org.openmetadata.schema.dataInsight.DataInsightChartResult;
import org.openmetadata.schema.entity.classification.Tag; import org.openmetadata.schema.entity.classification.Tag;
import org.openmetadata.schema.entity.data.QueryCostSearchResult; import org.openmetadata.schema.entity.data.QueryCostSearchResult;
import org.openmetadata.schema.exception.JsonParsingException;
import org.openmetadata.schema.search.AggregationRequest; import org.openmetadata.schema.search.AggregationRequest;
import org.openmetadata.schema.search.SearchRequest; import org.openmetadata.schema.search.SearchRequest;
import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration;
@ -105,7 +106,6 @@ import org.openmetadata.search.IndexMappingLoader;
import org.openmetadata.service.Entity; import org.openmetadata.service.Entity;
import org.openmetadata.service.events.lifecycle.EntityLifecycleEventDispatcher; import org.openmetadata.service.events.lifecycle.EntityLifecycleEventDispatcher;
import org.openmetadata.service.events.lifecycle.handlers.SearchIndexHandler; import org.openmetadata.service.events.lifecycle.handlers.SearchIndexHandler;
import org.openmetadata.service.exception.UnhandledServerException;
import org.openmetadata.service.jdbi3.EntityRepository; import org.openmetadata.service.jdbi3.EntityRepository;
import org.openmetadata.service.search.elasticsearch.ElasticSearchClient; import org.openmetadata.service.search.elasticsearch.ElasticSearchClient;
import org.openmetadata.service.search.indexes.SearchIndex; import org.openmetadata.service.search.indexes.SearchIndex;
@ -773,7 +773,7 @@ public class SearchRepository {
fieldData.put(field.getName(), JsonUtils.getMap(entityReference)); fieldData.put(field.getName(), JsonUtils.getMap(entityReference));
scriptTxt.append(" "); scriptTxt.append(" ");
} }
} catch (UnhandledServerException e) { } catch (JsonParsingException e) {
scriptTxt.append(String.format(REMOVE_PROPAGATED_FIELD_SCRIPT, field.getName())); scriptTxt.append(String.format(REMOVE_PROPAGATED_FIELD_SCRIPT, field.getName()));
} }
} }
@ -795,7 +795,7 @@ public class SearchRepository {
field.getName(), field.getName(),
field.getName())); field.getName()));
fieldData.put(field.getName(), newEntityReference); fieldData.put(field.getName(), newEntityReference);
} catch (UnhandledServerException e) { } catch (JsonParsingException e) {
if (field.getName().equals(Entity.FIELD_TEST_SUITES)) { if (field.getName().equals(Entity.FIELD_TEST_SUITES)) {
scriptTxt.append(PROPAGATE_TEST_SUITES_SCRIPT); scriptTxt.append(PROPAGATE_TEST_SUITES_SCRIPT);
fieldData.put(Entity.FIELD_TEST_SUITES, field.getNewValue()); fieldData.put(Entity.FIELD_TEST_SUITES, field.getNewValue());
@ -838,7 +838,7 @@ public class SearchRepository {
fieldData.put(field.getName(), entityReference); fieldData.put(field.getName(), entityReference);
} }
scriptTxt.append(" "); scriptTxt.append(" ");
} catch (UnhandledServerException e) { } catch (JsonParsingException e) {
if (field.getName().equals(FIELD_DISPLAY_NAME)) { if (field.getName().equals(FIELD_DISPLAY_NAME)) {
String fieldPath = String fieldPath =
getFieldPath(entity.getEntityReference().getType(), field.getName()); getFieldPath(entity.getEntityReference().getType(), field.getName());