You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2019/04/17 10:57:18 UTC
[ignite] branch master updated: IGNITE-11488: Fixed
ConcurrentModificationException failure during service deployment. This
closes #6463.
This is an automated email from the ASF dual-hosted git repository.
amashenkov 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 48e6719 IGNITE-11488: Fixed ConcurrentModificationException failure during service deployment. This closes #6463.
48e6719 is described below
commit 48e6719f1f7156126dcf0dce54fad58c73da2392
Author: ryker.zhang <ry...@gmail.com>
AuthorDate: Wed Apr 17 13:57:04 2019 +0300
IGNITE-11488: Fixed ConcurrentModificationException failure during service deployment. This closes #6463.
---
.../internal/processors/service/ServiceDeploymentManager.java | 3 ++-
.../ignite/internal/processors/service/ServiceDeploymentTask.java | 8 +++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentManager.java
index 9851c5f..15e8afb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentManager.java
@@ -500,7 +500,8 @@ public class ServiceDeploymentManager {
if (nextDumpTime <= U.currentTimeMillis()) {
log.warning("Failed to wait service deployment process or timeout had been" +
- " reached, timeout=" + dumpTimeout + ", task=" + task);
+ " reached, timeout=" + dumpTimeout +
+ (log.isDebugEnabled() ? ", task=" + task : ", taskDepId=" + task.deploymentId()));
long nextTimeout = dumpTimeout * (2 + dumpCnt++);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentTask.java
index 57f6616..02e9da8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/ServiceDeploymentTask.java
@@ -851,8 +851,10 @@ class ServiceDeploymentTask {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(ServiceDeploymentTask.class, this,
- "locNodeId", (ctx != null ? ctx.localNodeId() : "unknown"),
- "crdId", crdId);
+ synchronized (initCrdMux) {
+ return S.toString(ServiceDeploymentTask.class, this,
+ "locNodeId", (ctx != null ? ctx.localNodeId() : "unknown"),
+ "crdId", crdId);
+ }
}
}