Merge pull request #3392 from atlanhq/ns/DG-1735-es-sync-delay

DG-1735 | Check last edit time only for authpoliy
atlanhq · Aug 13, 2024 · 8b51fda · 8b51fda
2 parents 69c781b + 5faba35
commit 8b51fda
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/AuthREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/AuthREST.java
@@ -207,14 +207,16 @@ private Long getLastEditTime(String serviceName, long lastUpdatedTime) {
         dsl.put("sort", sortList);
 
         parameters.setDsl(dsl);
-        Long lastEditTime = 0L;
+        Long lastEditTime = 0L; // this timestamp is used to verify if the found policies are synced with any policy create or update op on cassandra
 
         try {
             EntityAuditSearchResult result = auditRepository.searchEvents(parameters.getQueryString());
             if (result != null) {
                 if (!CollectionUtils.isEmpty(result.getEntityAudits())) {
                     EntityAuditEventV2 lastAuditLog = result.getEntityAudits().get(0);
-                    if (!EntityAuditEventV2.EntityAuditActionV2.getDeleteActions().contains(lastAuditLog.getAction())) {
+                    if (!EntityAuditEventV2.EntityAuditActionV2.getDeleteActions().contains(lastAuditLog.getAction()) &&
+                        lastAuditLog.getTypeName().equals(POLICY_ENTITY_TYPE)
+                    ) {
                         lastEditTime = lastAuditLog.getTimestamp();
                     } else {
                         LOG.info("ES_SYNC_FIX: {}: found delete action, so ignoring the last edit time: {}", serviceName, lastAuditLog.getTimestamp());