Skip to content

IGNITE-11966 Added explicit list of required events into "AdaptiveLoadBalancingSpi". #6690

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

Closed
wants to merge 3 commits into from
Closed

IGNITE-11966 Added explicit list of required events into "AdaptiveLoadBalancingSpi". #6690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53f0108
IGNITE-11966 Added explicit list of required events into "AdaptiveLoa…
ibessonov Jul 15, 2019
75986fe
IGNITE-11966 More event types marked as internal.
ibessonov Jul 16, 2019
2f93a3b
IGNITE-11966 Test fixed.
ibessonov Jul 16, 2019
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
14 changes: 13 additions & 1 deletion ...c/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -505,7 +508,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);
}
}

/**
Expand Down
10 changes: 5 additions & 5 deletions ...rc/test/java/org/apache/ignite/internal/GridEventStorageRuntimeConfigurationSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,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();

Expand All @@ -148,17 +148,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();
Expand Down