GG-21630 [GG-20866] [IGNITE-11966] Fixed using AdaptiveLoadBalancingSpi without IgniteConfiguration.setIncludeEventTypes(EventType.EVT_TASK_FINISHED, EventType.EVT_TASK_FAILED) leads to memory leak - Fixed apache#6690. (apache#293)

(cherry picked from commit e2d6632)

Author: ibessonov

modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java

@@ -72,9 +72,12 @@
 
 import static org.apache.ignite.events.EventType.EVTS_ALL;
 import static org.apache.ignite.events.EventType.EVTS_DISCOVERY_ALL;
+import static org.apache.ignite.events.EventType.EVT_JOB_MAPPED;
 import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
 import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
 import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FAILED;
+import static org.apache.ignite.events.EventType.EVT_TASK_FINISHED;
 import static org.apache.ignite.internal.GridTopic.TOPIC_EVENT;
 import static org.apache.ignite.internal.events.DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT;
 import static org.apache.ignite.internal.managers.communication.GridIoPolicy.PUBLIC_POOL;
@@ -507,7 +510,16 @@ private boolean isHiddenEvent(int type) {
      * @return {@code true} if this is an internal event.
      */
     private boolean isInternalEvent(int type) {
-        return type == EVT_DISCOVERY_CUSTOM_EVT || F.contains(EVTS_DISCOVERY_ALL, type);
+        switch (type) {
+            case EVT_DISCOVERY_CUSTOM_EVT:
+            case EVT_TASK_FINISHED:
+            case EVT_TASK_FAILED:
+            case EVT_JOB_MAPPED:
+                return true;
+
+            default:
+                return F.contains(EVTS_DISCOVERY_ALL, type);
+        }
     }
 
     /**

modules/core/src/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java

@@ -135,7 +135,7 @@ public void testDisableWithIncludes() throws Exception {
         try {
             Ignite g = startGrid();
 
-            g.events().enableLocal(EVT_TASK_STARTED, EVT_TASK_FINISHED, EVT_JOB_STARTED);
+            g.events().enableLocal(EVT_TASK_STARTED, EVT_JOB_STARTED);
 
             final AtomicInteger cnt = new AtomicInteger();
 
@@ -145,17 +145,17 @@ public void testDisableWithIncludes() throws Exception {
 
                     return true;
                 }
-            }, EVT_TASK_STARTED, EVT_TASK_FINISHED, EVT_JOB_STARTED);
+            }, EVT_TASK_STARTED, EVT_JOB_STARTED);
 
             g.compute().run(F.noop());
 
-            assertEquals(3, cnt.get());
+            assertEquals(2, cnt.get());
 
-            g.events().disableLocal(EVT_TASK_STARTED, EVT_TASK_FINISHED, EVT_JOB_FAILED);
+            g.events().disableLocal(EVT_TASK_STARTED, EVT_JOB_FAILED);
 
             g.compute().run(F.noop());
 
-            assertEquals(4, cnt.get());
+            assertEquals(3, cnt.get());
         }
         finally {
             stopAllGrids();