This is an automated email from the ASF dual-hosted git repository.
agoncharuk 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 a66e679 IGNITE-11243 Fixed NPE when using control.sh script with an
older node - Fixes #6118.
a66e679 is described below
commit a66e679e4f91b099724fca67ea88689c8e4e7907
Author: Sergey Kosarev <macrerg...@gmail.com>
AuthorDate: Tue Feb 19 16:28:03 2019 +0300
IGNITE-11243 Fixed NPE when using control.sh script with an older node -
Fixes #6118.
Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com>
---
.../apache/ignite/internal/commandline/CommandHandler.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
index 03bb1cc..41e67a10 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java
@@ -30,7 +30,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Scanner;
import java.util.Set;
import java.util.UUID;
@@ -1302,14 +1301,17 @@ public class CommandHandler {
Map<String, VisorBaselineNode> srvs = res.getServers();
- Optional<VisorBaselineNode> crdOpt = srvs.values().stream()
- .min(Comparator.comparing(VisorBaselineNode::getOrder));
+ // if task runs on a node with VisorBaselineNode of old version (V1)
we'll get order=null for all nodes.
- String crdStr = crdOpt.map(
- crd -> "ConsistentId=" + crd.getConsistentId() + ", Order=" +
crd.getOrder())
+ String crdStr = srvs.values().stream()
+ // check for not null
+ .filter(node -> node.getOrder() != null)
+ .min(Comparator.comparing(VisorBaselineNode::getOrder))
+ // format
+ .map(crd -> " (Coordinator: ConsistentId=" + crd.getConsistentId()
+ ", Order=" + crd.getOrder() + ")")
.orElse("");
- log("Current topology version: " + res.getTopologyVersion() + "
(Coordinator: " + crdStr + ")");
+ log("Current topology version: " + res.getTopologyVersion() + crdStr);
nl();
if (F.isEmpty(baseline))
