You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ap...@apache.org on 2023/06/05 14:43:15 UTC

[ignite-3] branch main updated: IGNITE-19559 NPE in deploy/undeploy calls in non-REPL mode (#2131)

This is an automated email from the ASF dual-hosted git repository.

apkhmv pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new a2254434c4 IGNITE-19559 NPE in deploy/undeploy calls in non-REPL mode (#2131)
a2254434c4 is described below

commit a2254434c403bc54685f05e0d6f51bef56abea2a
Author: Vadim Pakhnushev <86...@users.noreply.github.com>
AuthorDate: Mon Jun 5 17:43:07 2023 +0300

    IGNITE-19559 NPE in deploy/undeploy calls in non-REPL mode (#2131)
---
 .../cli/call/cluster/unit/DeployUnitCall.java      |  7 +----
 .../call/cluster/unit/DeployUnitCallFactory.java   |  8 ++----
 ...nitCallFactory.java => DeployUnitReplCall.java} | 33 +++++++++++++---------
 ...Factory.java => DeployUnitReplCallFactory.java} | 16 +++++------
 .../cli/call/cluster/unit/UndeployUnitCall.java    |  8 ++----
 ...tCallFactory.java => UndeployUnitReplCall.java} | 28 ++++++++++--------
 .../cluster/unit/ClusterUnitDeployReplCommand.java |  4 +--
 .../unit/ClusterUnitUndeployReplCommand.java       |  4 +--
 8 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCall.java
index 9526e4c607..a2ad2c490a 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCall.java
@@ -35,7 +35,6 @@ import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
 import org.apache.ignite.internal.cli.core.call.ProgressTracker;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.internal.cli.core.exception.UnitAlreadyExistsException;
-import org.apache.ignite.internal.cli.core.repl.registry.UnitsRegistry;
 import org.apache.ignite.internal.cli.core.rest.ApiClientFactory;
 import org.apache.ignite.internal.cli.core.style.component.MessageUiComponent;
 import org.apache.ignite.internal.cli.core.style.element.UiElements;
@@ -49,12 +48,9 @@ public class DeployUnitCall implements AsyncCall<DeployUnitCallInput, String> {
 
     private final ApiClientFactory clientFactory;
 
-    private final UnitsRegistry unitsRegistry;
-
-    DeployUnitCall(ProgressTracker tracker, ApiClientFactory clientFactory, UnitsRegistry registry) {
+    DeployUnitCall(ProgressTracker tracker, ApiClientFactory clientFactory) {
         this.tracker = tracker;
         this.clientFactory = clientFactory;
-        this.unitsRegistry = registry;
     }
 
     @Override
@@ -91,7 +87,6 @@ public class DeployUnitCall implements AsyncCall<DeployUnitCallInput, String> {
             } else if (callback.exception() != null) {
                 return handleException(callback.exception(), input);
             } else {
-                unitsRegistry.refresh();
                 return DefaultCallOutput.success(MessageUiComponent.from(UiElements.done()).render());
             }
         });
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
index d444c87375..5e208d1b66 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.cli.call.cluster.unit;
 
 import jakarta.inject.Singleton;
 import org.apache.ignite.internal.cli.core.call.ProgressTracker;
-import org.apache.ignite.internal.cli.core.repl.registry.UnitsRegistry;
 import org.apache.ignite.internal.cli.core.rest.ApiClientFactory;
 
 /** Factory for {@link DeployUnitCall}. */
@@ -28,14 +27,11 @@ public class DeployUnitCallFactory {
 
     private final ApiClientFactory factory;
 
-    private final UnitsRegistry registry;
-
-    public DeployUnitCallFactory(ApiClientFactory factory, UnitsRegistry registry) {
+    public DeployUnitCallFactory(ApiClientFactory factory) {
         this.factory = factory;
-        this.registry = registry;
     }
 
     public DeployUnitCall create(ProgressTracker tracker) {
-        return new DeployUnitCall(tracker, factory, registry);
+        return new DeployUnitCall(tracker, factory);
     }
 }
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitReplCall.java
similarity index 50%
copy from modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
copy to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitReplCall.java
index d444c87375..ff3256722c 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitReplCall.java
@@ -17,25 +17,30 @@
 
 package org.apache.ignite.internal.cli.call.cluster.unit;
 
-import jakarta.inject.Singleton;
-import org.apache.ignite.internal.cli.core.call.ProgressTracker;
+import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.internal.cli.core.call.AsyncCall;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
 import org.apache.ignite.internal.cli.core.repl.registry.UnitsRegistry;
-import org.apache.ignite.internal.cli.core.rest.ApiClientFactory;
 
-/** Factory for {@link DeployUnitCall}. */
-@Singleton
-public class DeployUnitCallFactory {
+/** Call to deploy a unit and refresh units registry. */
+public class DeployUnitReplCall implements AsyncCall<DeployUnitCallInput, String>  {
+    private final DeployUnitCall deployUnitCall;
 
-    private final ApiClientFactory factory;
+    private final UnitsRegistry unitsRegistry;
 
-    private final UnitsRegistry registry;
-
-    public DeployUnitCallFactory(ApiClientFactory factory, UnitsRegistry registry) {
-        this.factory = factory;
-        this.registry = registry;
+    DeployUnitReplCall(DeployUnitCall deployUnitCall, UnitsRegistry unitsRegistry) {
+        this.deployUnitCall = deployUnitCall;
+        this.unitsRegistry = unitsRegistry;
     }
 
-    public DeployUnitCall create(ProgressTracker tracker) {
-        return new DeployUnitCall(tracker, factory, registry);
+    @Override
+    public CompletableFuture<CallOutput<String>> execute(DeployUnitCallInput input) {
+        return deployUnitCall.execute(input)
+                .thenApply(output -> {
+                    if (!output.hasError()) {
+                        unitsRegistry.refresh();
+                    }
+                    return output;
+                });
     }
 }
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitReplCallFactory.java
similarity index 72%
copy from modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
copy to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitReplCallFactory.java
index d444c87375..e9df566bc6 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitReplCallFactory.java
@@ -20,22 +20,20 @@ package org.apache.ignite.internal.cli.call.cluster.unit;
 import jakarta.inject.Singleton;
 import org.apache.ignite.internal.cli.core.call.ProgressTracker;
 import org.apache.ignite.internal.cli.core.repl.registry.UnitsRegistry;
-import org.apache.ignite.internal.cli.core.rest.ApiClientFactory;
 
-/** Factory for {@link DeployUnitCall}. */
+/** Factory for {@link DeployUnitCall} in REPL mode. */
 @Singleton
-public class DeployUnitCallFactory {
-
-    private final ApiClientFactory factory;
+public class DeployUnitReplCallFactory {
+    private final DeployUnitCallFactory callFactory;
 
     private final UnitsRegistry registry;
 
-    public DeployUnitCallFactory(ApiClientFactory factory, UnitsRegistry registry) {
-        this.factory = factory;
+    public DeployUnitReplCallFactory(DeployUnitCallFactory callFactory, UnitsRegistry registry) {
+        this.callFactory = callFactory;
         this.registry = registry;
     }
 
-    public DeployUnitCall create(ProgressTracker tracker) {
-        return new DeployUnitCall(tracker, factory, registry);
+    public DeployUnitReplCall create(ProgressTracker tracker) {
+        return new DeployUnitReplCall(callFactory.create(tracker), registry);
     }
 }
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/UndeployUnitCall.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/UndeployUnitCall.java
index 4f45b36fed..1f7b2d897b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/UndeployUnitCall.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/UndeployUnitCall.java
@@ -23,23 +23,20 @@ import org.apache.ignite.internal.cli.core.call.CallOutput;
 import org.apache.ignite.internal.cli.core.call.DefaultCallOutput;
 import org.apache.ignite.internal.cli.core.exception.IgniteCliApiException;
 import org.apache.ignite.internal.cli.core.exception.UnitNotFoundException;
-import org.apache.ignite.internal.cli.core.repl.registry.UnitsRegistry;
 import org.apache.ignite.internal.cli.core.rest.ApiClientFactory;
 import org.apache.ignite.internal.cli.core.style.component.MessageUiComponent;
 import org.apache.ignite.internal.cli.core.style.element.UiElements;
 import org.apache.ignite.rest.client.api.DeploymentApi;
 import org.apache.ignite.rest.client.invoker.ApiException;
 
-/** Undeploy unit call. */
+/** Call to undeploy a unit. */
 @Singleton
 public class UndeployUnitCall implements Call<UndeployUnitCallInput, String> {
 
     private final ApiClientFactory clientFactory;
-    private final UnitsRegistry unitsRegistry;
 
-    UndeployUnitCall(ApiClientFactory clientFactory, UnitsRegistry unitsRegistry) {
+    UndeployUnitCall(ApiClientFactory clientFactory) {
         this.clientFactory = clientFactory;
-        this.unitsRegistry = unitsRegistry;
     }
 
     @Override
@@ -48,7 +45,6 @@ public class UndeployUnitCall implements Call<UndeployUnitCallInput, String> {
             DeploymentApi api = new DeploymentApi(clientFactory.getClient(input.clusterUrl()));
             api.undeployUnit(input.id(), input.version());
 
-            unitsRegistry.refresh();
             return DefaultCallOutput.success(MessageUiComponent.from(UiElements.done()).render());
         } catch (ApiException e) {
             if (e.getCode() == 404) {
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/UndeployUnitReplCall.java
similarity index 55%
copy from modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
copy to modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/UndeployUnitReplCall.java
index d444c87375..c88c9d89fe 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/DeployUnitCallFactory.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/call/cluster/unit/UndeployUnitReplCall.java
@@ -18,24 +18,28 @@
 package org.apache.ignite.internal.cli.call.cluster.unit;
 
 import jakarta.inject.Singleton;
-import org.apache.ignite.internal.cli.core.call.ProgressTracker;
+import org.apache.ignite.internal.cli.core.call.Call;
+import org.apache.ignite.internal.cli.core.call.CallOutput;
 import org.apache.ignite.internal.cli.core.repl.registry.UnitsRegistry;
-import org.apache.ignite.internal.cli.core.rest.ApiClientFactory;
 
-/** Factory for {@link DeployUnitCall}. */
+/** Call to undeploy a unit and refresh units registry. */
 @Singleton
-public class DeployUnitCallFactory {
+public class UndeployUnitReplCall implements Call<UndeployUnitCallInput, String> {
+    private final UndeployUnitCall undeployUnitCall;
 
-    private final ApiClientFactory factory;
+    private final UnitsRegistry unitsRegistry;
 
-    private final UnitsRegistry registry;
-
-    public DeployUnitCallFactory(ApiClientFactory factory, UnitsRegistry registry) {
-        this.factory = factory;
-        this.registry = registry;
+    UndeployUnitReplCall(UndeployUnitCall undeployUnitCall, UnitsRegistry unitsRegistry) {
+        this.undeployUnitCall = undeployUnitCall;
+        this.unitsRegistry = unitsRegistry;
     }
 
-    public DeployUnitCall create(ProgressTracker tracker) {
-        return new DeployUnitCall(tracker, factory, registry);
+    @Override
+    public CallOutput<String> execute(UndeployUnitCallInput input) {
+        CallOutput<String> output = undeployUnitCall.execute(input);
+        if (!output.hasError()) {
+            unitsRegistry.refresh();
+        }
+        return output;
     }
 }
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java
index 6c801a3803..7c1f15a9ab 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitDeployReplCommand.java
@@ -28,8 +28,8 @@ import static org.apache.ignite.internal.cli.commands.Options.Constants.VERSION_
 import jakarta.inject.Inject;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import org.apache.ignite.internal.cli.call.cluster.unit.DeployUnitCallFactory;
 import org.apache.ignite.internal.cli.call.cluster.unit.DeployUnitCallInput;
+import org.apache.ignite.internal.cli.call.cluster.unit.DeployUnitReplCallFactory;
 import org.apache.ignite.internal.cli.commands.BaseCommand;
 import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
 import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
@@ -71,7 +71,7 @@ public class ClusterUnitDeployReplCommand extends BaseCommand implements Runnabl
     }
 
     @Inject
-    private DeployUnitCallFactory callFactory;
+    private DeployUnitReplCallFactory callFactory;
 
     @Inject
     private ConnectToClusterQuestion question;
diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployReplCommand.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployReplCommand.java
index c03e7528bb..658ffee1fe 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployReplCommand.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/commands/cluster/unit/ClusterUnitUndeployReplCommand.java
@@ -23,8 +23,8 @@ import static org.apache.ignite.internal.cli.commands.Options.Constants.UNIT_VER
 import static org.apache.ignite.internal.cli.commands.Options.Constants.VERSION_OPTION;
 
 import jakarta.inject.Inject;
-import org.apache.ignite.internal.cli.call.cluster.unit.UndeployUnitCall;
 import org.apache.ignite.internal.cli.call.cluster.unit.UndeployUnitCallInput;
+import org.apache.ignite.internal.cli.call.cluster.unit.UndeployUnitReplCall;
 import org.apache.ignite.internal.cli.commands.BaseCommand;
 import org.apache.ignite.internal.cli.commands.cluster.ClusterUrlMixin;
 import org.apache.ignite.internal.cli.commands.questions.ConnectToClusterQuestion;
@@ -53,7 +53,7 @@ public class ClusterUnitUndeployReplCommand extends BaseCommand implements Runna
     private String version;
 
     @Inject
-    private UndeployUnitCall call;
+    private UndeployUnitReplCall call;
 
     @Inject
     private ConnectToClusterQuestion question;