This is an automated email from the ASF dual-hosted git repository.
ascherbakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 68cc282 IGNITE-13425 Added task name to the log messages related to
task processing. - Fixes #8235.
68cc282 is described below
commit 68cc2827904e5a93acbd44b4093c72f613ed90d1
Author: Nikita Tolstunov <[email protected]>
AuthorDate: Thu Sep 17 16:36:54 2020 +0300
IGNITE-13425 Added task name to the log messages related to task
processing. - Fixes #8235.
Signed-off-by: Alexey Scherbakov <[email protected]>
---
.../processors/task/GridTaskProcessor.java | 53 +++++++++++++++-------
.../IgniteCacheNearRestartRollbackSelfTest.java | 2 +
2 files changed, 38 insertions(+), 17 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 123ba0f..9a8cdbe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -83,6 +83,7 @@ import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.plugin.security.SecurityPermission;
import org.apache.ignite.spi.systemview.view.ComputeTaskView;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static org.apache.ignite.events.EventType.EVT_MANAGEMENT_TASK_STARTED;
@@ -1138,14 +1139,15 @@ public class GridTaskProcessor extends
GridProcessorAdapter implements IgniteCha
lock.readLock();
try {
+ GridTaskWorker<?, ?> task = tasks.get(msg.getSessionId());
+
if (stopping && !waiting) {
- U.warn(log, "Received job execution response while stopping
grid (will ignore): " + msg);
+ U.warn(log, "Received job execution response while stopping
grid (will ignore): " + msg
+ + tryResolveTaskName(task));
return;
}
- GridTaskWorker<?, ?> task = tasks.get(msg.getSessionId());
-
if (task == null) {
if (log.isDebugEnabled())
log.debug("Received job execution response for unknown
task (was task already reduced?): " + msg);
@@ -1174,14 +1176,15 @@ public class GridTaskProcessor extends
GridProcessorAdapter implements IgniteCha
lock.readLock();
try {
+ GridTaskWorker<?, ?> task = tasks.get(msg.getSessionId());
+
if (stopping && !waiting) {
- U.warn(log, "Received task session request while stopping grid
(will ignore): " + msg);
+ U.warn(log, "Received task session request while stopping grid
(will ignore): " + msg
+ + tryResolveTaskName(task));
return;
}
- GridTaskWorker<?, ?> task = tasks.get(msg.getSessionId());
-
if (task == null) {
if (log.isDebugEnabled())
log.debug("Received task session request for unknown task
(was task already reduced?): " + msg);
@@ -1218,14 +1221,15 @@ public class GridTaskProcessor extends
GridProcessorAdapter implements IgniteCha
lock.readLock();
try {
+ GridTaskWorker<?, ?> task = tasks.get(sesId);
+
if (stopping && !waiting) {
- U.warn(log, "Attempt to cancel task while stopping grid (will
ignore): " + sesId);
+ U.warn(log, "Attempt to cancel task while stopping grid (will
ignore): " + sesId
+ + tryResolveTaskName(task));
return;
}
- GridTaskWorker<?, ?> task = tasks.get(sesId);
-
if (task == null) {
if (log.isDebugEnabled())
log.debug("Attempt to cancel unknown task (was task
already reduced?): " + sesId);
@@ -1432,16 +1436,17 @@ public class GridTaskProcessor extends
GridProcessorAdapter implements IgniteCha
lock.readLock();
try {
+ GridJobSiblingsRequest req = (GridJobSiblingsRequest)msg;
+
+ GridTaskWorker<?, ?> worker = tasks.get(req.sessionId());
+
if (stopping && !waiting) {
- U.warn(log, "Received job siblings request while stopping
grid (will ignore): " + msg);
+ U.warn(log, "Received job siblings request while stopping
grid (will ignore): " + msg
+ + tryResolveTaskName(worker));
return;
}
- GridJobSiblingsRequest req = (GridJobSiblingsRequest)msg;
-
- GridTaskWorker<?, ?> worker = tasks.get(req.sessionId());
-
Collection<ComputeJobSibling> siblings;
if (worker != null) {
@@ -1508,14 +1513,15 @@ public class GridTaskProcessor extends
GridProcessorAdapter implements IgniteCha
lock.readLock();
try {
+ GridTaskWorker<?, ?> gridTaskWorker =
tasks.get(req.sessionId());
+
if (stopping && !waiting) {
- U.warn(log, "Received task cancel request while stopping
grid (will ignore): " + msg);
+ U.warn(log, "Received task cancel request while stopping
grid (will ignore): " + msg
+ + tryResolveTaskName(gridTaskWorker));
return;
}
- GridTaskWorker<?, ?> gridTaskWorker =
tasks.get(req.sessionId());
-
if (gridTaskWorker != null) {
try {
gridTaskWorker.getTaskFuture().cancel();
@@ -1530,4 +1536,17 @@ public class GridTaskProcessor extends
GridProcessorAdapter implements IgniteCha
}
}
}
+
+ /**
+ * Tries to get task name in appended form(after ', ').
+ * If cannot take task name - returns empty String.
+ *
+ * @param task Task to get name.
+ * @return Task name or empty string.
+ */
+ @NotNull private static String tryResolveTaskName(@Nullable
GridTaskWorker<?, ?> task) {
+ return task != null && task.getSession() != null
+ ? ", task name: " + task.getSession().getTaskName()
+ : "";
+ }
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
index 46375f3..22b2ff7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
@@ -46,6 +46,7 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionRollbackException;
+import org.junit.Ignore;
import org.junit.Test;
import static
org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -103,6 +104,7 @@ public class IgniteCacheNearRestartRollbackSelfTest extends
GridCommonAbstractTe
* @throws Exception If failed.
*/
@Test
+ @Ignore("IGNITE-13441")
public void testRestarts() throws Exception {
startGrids(3);
