ATLAS-3360: Duplicate audits in atlas when HMS and hive hook is enabled.

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

@@ -839,7 +839,13 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore {
                 }
 
                 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

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

@@ -189,6 +189,12 @@ public class RequestContext {
         }
     }
 
+    public void removeEntityUpdate(AtlasEntity entity) {
+        if (entity != null && entity.getGuid() != null) {
+            updatedEntities.remove(entity.getGuid());
+        }
+    }
+
     public void recordEntityDelete(AtlasEntityHeader entity) {
         if (entity != null && entity.getGuid() != null) {
             deletedEntities.put(entity.getGuid(), entity);