You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2019/01/30 23:38:32 UTC
[ignite] branch master updated: IGNITE-11033 Fixed
IllegalStateException in VisorBaselineTask on set new baseline.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov 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 977108a IGNITE-11033 Fixed IllegalStateException in VisorBaselineTask on set new baseline.
977108a is described below
commit 977108a7566ca56f4001289062a825a8f2a40667
Author: Vasiliy Sisko <vs...@gridgain.com>
AuthorDate: Thu Jan 31 06:38:06 2019 +0700
IGNITE-11033 Fixed IllegalStateException in VisorBaselineTask on set new baseline.
---
.../ignite/internal/visor/baseline/VisorBaselineTask.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
index 93c41ab..61da1a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/baseline/VisorBaselineTask.java
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.BaselineNode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.cluster.DetachedClusterNode;
import org.apache.ignite.internal.cluster.IgniteClusterEx;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
@@ -134,10 +135,10 @@ public class VisorBaselineTask extends VisorOneNodeTask<VisorBaselineTaskArg, Vi
for (String consistentId : consistentIds) {
BaselineNode node = srvrs.get(consistentId);
- if (node == null)
- throw new IllegalStateException("Node not found for consistent ID: " + consistentId);
-
- baselineTop.add(node);
+ if (node != null)
+ baselineTop.add(node);
+ else
+ baselineTop.add(new DetachedClusterNode(consistentId, null));
}
return set0(baselineTop);
@@ -175,7 +176,7 @@ public class VisorBaselineTask extends VisorOneNodeTask<VisorBaselineTaskArg, Vi
Map<String, BaselineNode> baseline = currentBaseLine();
if (F.isEmpty(baseline))
- return set0(Collections.EMPTY_LIST);
+ return set0(Collections.emptyList());
for (String consistentId : consistentIds) {
BaselineNode node = baseline.remove(consistentId);