tool
/
atlas
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ATLAS-3360: Duplicate audits in atlas when HMS and hive hook is enabled #2 - Add entitiesToSkipUpdate in RequestContext 

Signed-off-by: Sarath Subramanian <sarath@apache.org>
This commit is contained in:
Saqeeb Shaikh 2019-09-21 22:26:26 -07:00 committed by Sarath Subramanian
parent 91134031c5
commit 53e8825096
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java
View File

@ -838,17 +838,13 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore {
}
entitiesToSkipUpdate.add(entity);
RequestContext.get().recordEntityToSkip(entity.getGuid());
}
}
if (entitiesToSkipUpdate != null) {
// remove entitiesToSkipUpdate from EntityMutationContext
context.getUpdatedEntities().removeAll(entitiesToSkipUpdate);
// remove entitiesToSkipUpdate from RequestContext
for (AtlasEntity entity : entitiesToSkipUpdate) {
RequestContext.get().removeEntityUpdate(entity);
}
}
// Check if authorized to update entities

29
server-api/src/main/java/org/apache/atlas/RequestContext.java
View File

@ -45,15 +45,16 @@ public class RequestContext {
private static final Set<RequestContext> ACTIVE_REQUESTS = new HashSet<>();
private static final boolean isMetricsEnabled = METRICS.isDebugEnabled();
private final long requestTime = System.currentTimeMillis();
private final Map<String, AtlasEntityHeader> updatedEntities = new HashMap<>();
private final Map<String, AtlasEntityHeader> deletedEntities = new HashMap<>();
private final Map<String, AtlasEntity> entityCache = new HashMap<>();
private final Map<String, AtlasEntityWithExtInfo> entityExtInfoCache = new HashMap<>();
private final Map<String, List<AtlasClassification>> addedPropagations = new HashMap<>();
private final Map<String, List<AtlasClassification>> removedPropagations = new HashMap<>();
private final AtlasPerfMetrics metrics = isMetricsEnabled ? new AtlasPerfMetrics() : null;
private List<EntityGuidPair> entityGuidInRequest = null;
private final long requestTime = System.currentTimeMillis();
private final Map<String, AtlasEntityHeader> updatedEntities = new HashMap<>();
private final Map<String, AtlasEntityHeader> deletedEntities = new HashMap<>();
private final Map<String, AtlasEntity> entityCache = new HashMap<>();
private final Map<String, AtlasEntityWithExtInfo> entityExtInfoCache = new HashMap<>();
private final Map<String, List<AtlasClassification>> addedPropagations = new HashMap<>();
private final Map<String, List<AtlasClassification>> removedPropagations = new HashMap<>();
private final AtlasPerfMetrics metrics = isMetricsEnabled ? new AtlasPerfMetrics() : null;
private List<EntityGuidPair> entityGuidInRequest = null;
private final Set<String> entitiesToSkipUpdate = new HashSet<>();
private String user;
private Set<String> userGroups;
@ -108,6 +109,7 @@ public class RequestContext {
this.entityExtInfoCache.clear();
this.addedPropagations.clear();
this.removedPropagations.clear();
this.entitiesToSkipUpdate.clear();
if (metrics != null && !metrics.isEmpty()) {
METRICS.debug(metrics.toString());
@ -199,17 +201,18 @@ public class RequestContext {
}
public void recordEntityUpdate(AtlasEntityHeader entity) {
if (entity != null && entity.getGuid() != null) {
if (entity != null && entity.getGuid() != null && ! entitiesToSkipUpdate.contains(entity.getGuid())) {
updatedEntities.put(entity.getGuid(), entity);
}
}
public void removeEntityUpdate(AtlasEntity entity) {
if (entity != null && entity.getGuid() != null) {
updatedEntities.remove(entity.getGuid());
public void recordEntityToSkip(String guid) {
if(! StringUtils.isEmpty(guid)) {
entitiesToSkipUpdate.add(guid);
}
}
public void recordEntityDelete(AtlasEntityHeader entity) {
if (entity != null && entity.getGuid() != null) {
deletedEntities.put(entity.getGuid(), entity);