Skip to content

ATLAS-5056: Entity audit should not be created for instances of internal entity-types #471

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

ATLAS-5056: Entity audit should not be created for instances of internal entity-types #471

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
23 changes: 14 additions & 9 deletions ...y/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityChangeNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.atlas.model.instance.EntityMutationResponse;
import org.apache.atlas.model.instance.EntityMutations.EntityOperation;
import org.apache.atlas.model.notification.EntityNotification;
import org.apache.atlas.repository.audit.AtlasAuditService;
import org.apache.atlas.repository.converters.AtlasInstanceConverter;
import org.apache.atlas.repository.graph.FullTextMapperV2;
import org.apache.atlas.repository.graph.GraphHelper;
Expand All @@ -59,7 +58,7 @@
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;

import static org.apache.atlas.model.audit.EntityAuditEventV2.EntityAuditActionV2.PROPAGATED_CLASSIFICATION_ADD;
import static org.apache.atlas.model.audit.EntityAuditEventV2.EntityAuditActionV2.PROPAGATED_CLASSIFICATION_DELETE;
Expand All @@ -69,8 +68,6 @@
public class AtlasEntityChangeNotifier implements IAtlasEntityChangeNotifier {
private static final Logger LOG = LoggerFactory.getLogger(AtlasEntityChangeNotifier.class);

private static final Predicate<AtlasEntityHeader> PRED_IS_NOT_TYPE_AUDIT_ENTITY = obj -> !obj.getTypeName().equals(AtlasAuditService.ENTITY_TYPE_AUDIT_ENTRY);

private final Set<EntityChangeListener> entityChangeListeners;
private final Set<EntityChangeListenerV2> entityChangeListenersV2;
private final AtlasInstanceConverter instanceConverter;
Expand Down Expand Up @@ -400,24 +397,32 @@ private String getListenerName(EntityChangeListener listener) {
return listener.getClass().getSimpleName();
}

private boolean skipAuditEntries(List<AtlasEntityHeader> entityHeaders) {
return CollectionUtils.isEmpty(entityHeaders) || entityHeaders.stream().noneMatch(PRED_IS_NOT_TYPE_AUDIT_ENTITY);
private List<AtlasEntityHeader> filterNonInternalEntities(List<AtlasEntityHeader> entityHeaders) {
if (CollectionUtils.isEmpty(entityHeaders)) {
return Collections.emptyList();
}

return entityHeaders.stream().filter(atlasEntityHeader -> !GraphHelper.isInternalType(atlasEntityHeader.getTypeName())).collect(Collectors.toList());
}

private void notifyListeners(List<AtlasEntityHeader> entityHeaders, EntityOperation operation, boolean isImport) throws AtlasBaseException {
if (CollectionUtils.isEmpty(entityHeaders)) {
return;
}
if (skipAuditEntries(entityHeaders)) {

List<AtlasEntityHeader> nonInternalEntities = filterNonInternalEntities(entityHeaders);

if (CollectionUtils.isEmpty(nonInternalEntities)) {
LOG.info("Skipping notifications: All entities are internal types");
return;
}

MetricRecorder metric = RequestContext.get().startMetricRecord("notifyListeners");

if (isV2EntityNotificationEnabled) {
notifyV2Listeners(entityHeaders, operation, isImport);
notifyV2Listeners(nonInternalEntities, operation, isImport);
} else {
notifyV1Listeners(entityHeaders, operation, isImport);
notifyV1Listeners(nonInternalEntities, operation, isImport);
}

RequestContext.get().endMetricRecord(metric);
Expand Down
Loading