diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/AbstractCliCommandInvoker.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/AbstractCliCommandInvoker.java new file mode 100644 index 0000000000000..8db6425db0b5a --- /dev/null +++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/AbstractCliCommandInvoker.java @@ -0,0 +1,125 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.commandline; + +import java.net.URL; +import java.util.function.Consumer; +import java.util.function.Function; +import javax.cache.configuration.Factory; +import javax.net.ssl.SSLContext; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.dto.IgniteDataTransferObject; +import org.apache.ignite.internal.management.api.Command; +import org.apache.ignite.internal.management.api.CommandInvoker; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.util.spring.IgniteSpringHelperImpl; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.ssl.SslContextFactory; +import org.springframework.context.ApplicationContext; + +/** + * Adapter of new management API command for legacy {@code control.sh} execution flow. + */ +public abstract class AbstractCliCommandInvoker extends CommandInvoker + implements AutoCloseable { + /** */ + protected final ConnectionAndSslParameters args; + + /** */ + protected final Function pwdReader; + + /** */ + protected AbstractCliCommandInvoker( + Command cmd, + ConnectionAndSslParameters args, + Function pwdReader + ) { + super(cmd, args.commandArg(), null); + + this.args = args; + this.pwdReader = pwdReader; + } + + /** @return Message text to show user for. {@code null} means that confirmantion is not required. */ + public String confirmationPrompt() { + return cmd.confirmationPrompt(arg); + } + + /** */ + public abstract R invokeBeforeNodeStart(Consumer printer) throws Exception; + + /** + * @param args Commond args. + * @return Ssl support factory. + */ + protected Factory createSslSupportFactory(ConnectionAndSslParameters args) throws IgniteCheckedException { + if (!F.isEmpty(args.sslKeyStorePath()) && !F.isEmpty(args.sslFactoryConfigPath())) { + throw new IllegalArgumentException("Incorrect SSL configuration. " + + "SSL factory config path should not be specified simultaneously with other SSL options like keystore path."); + } + + if (!F.isEmpty(args.sslFactoryConfigPath())) { + URL springCfg = IgniteUtils.resolveSpringUrl(args.sslFactoryConfigPath()); + + ApplicationContext ctx = IgniteSpringHelperImpl.applicationContext(springCfg); + + return (Factory)ctx.getBean(Factory.class); + } + + SslContextFactory factory = new SslContextFactory(); + + if (args.sslProtocol().length > 1) + factory.setProtocols(args.sslProtocol()); + else + factory.setProtocol(args.sslProtocol()[0]); + + factory.setKeyAlgorithm(args.sslKeyAlgorithm()); + factory.setCipherSuites(args.getSslCipherSuites()); + factory.setKeyStoreFilePath(args.sslKeyStorePath()); + + if (args.sslKeyStorePassword() != null) + factory.setKeyStorePassword(args.sslKeyStorePassword()); + else { + char[] keyStorePwd = pwdReader.apply("SSL keystore password: "); + + args.sslKeyStorePassword(keyStorePwd); + factory.setKeyStorePassword(keyStorePwd); + } + + factory.setKeyStoreType(args.sslKeyStoreType()); + + if (F.isEmpty(args.sslTrustStorePath())) + factory.setTrustManagers(SslContextFactory.getDisabledTrustManager()); + else { + factory.setTrustStoreFilePath(args.sslTrustStorePath()); + + if (args.sslTrustStorePassword() != null) + factory.setTrustStorePassword(args.sslTrustStorePassword()); + else { + char[] trustStorePwd = pwdReader.apply("SSL truststore password: "); + + args.sslTrustStorePassword(trustStorePwd); + factory.setTrustStorePassword(trustStorePwd); + } + + factory.setTrustStoreType(args.sslTrustStoreType()); + } + + return factory; + } +} diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/ArgumentParser.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/ArgumentParser.java index 1a6e1d19cb95a..e6d7c8517b8e6 100644 --- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/ArgumentParser.java +++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/ArgumentParser.java @@ -48,11 +48,13 @@ import org.apache.ignite.ssl.SslContextFactory; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ENABLE_EXPERIMENTAL_COMMAND; +import static org.apache.ignite.configuration.ConnectorConfiguration.DFLT_TCP_PORT; import static org.apache.ignite.internal.client.GridClientConfiguration.DFLT_PING_INTERVAL; import static org.apache.ignite.internal.client.GridClientConfiguration.DFLT_PING_TIMEOUT; import static org.apache.ignite.internal.commandline.CommandHandler.DFLT_HOST; import static org.apache.ignite.internal.commandline.CommandHandler.DFLT_PORT; import static org.apache.ignite.internal.commandline.CommandHandler.UTILITY_NAME; +import static org.apache.ignite.internal.commandline.CommandHandler.useConnectorConnection; import static org.apache.ignite.internal.commandline.argument.parser.CLIArgument.optionalArg; import static org.apache.ignite.internal.management.api.CommandUtils.CMD_WORDS_DELIM; import static org.apache.ignite.internal.management.api.CommandUtils.NAME_PREFIX; @@ -184,7 +186,7 @@ public ArgumentParser(IgniteLogger log, IgniteCommandRegistry registry) { "Whenever possible, use interactive prompt for password (just discard %s option).", name, name)); arg(CMD_HOST, "HOST_OR_IP", String.class, DFLT_HOST); - arg(CMD_PORT, "PORT", Integer.class, DFLT_PORT, PORT_VALIDATOR); + arg(CMD_PORT, "PORT", Integer.class, useConnectorConnection() ? DFLT_TCP_PORT : DFLT_PORT, PORT_VALIDATOR); arg(CMD_USER, "USER", String.class, null); arg(CMD_PASSWORD, "PASSWORD", String.class, null, (BiConsumer)securityWarn); arg(CMD_PING_INTERVAL, "PING_INTERVAL", Long.class, DFLT_PING_INTERVAL, POSITIVE_LONG); diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliCommandInvoker.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliCommandInvoker.java index 816910569fa96..d06c4706f5a48 100644 --- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliCommandInvoker.java +++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliCommandInvoker.java @@ -17,208 +17,89 @@ package org.apache.ignite.internal.commandline; -import java.io.IOException; -import java.net.InetAddress; -import java.util.Collection; -import java.util.List; import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.apache.ignite.internal.client.GridClient; -import org.apache.ignite.internal.client.GridClientBeforeNodeStart; -import org.apache.ignite.internal.client.GridClientCompute; -import org.apache.ignite.internal.client.GridClientConfiguration; -import org.apache.ignite.internal.client.GridClientDisconnectedException; -import org.apache.ignite.internal.client.GridClientException; -import org.apache.ignite.internal.client.GridClientFactory; +import java.util.function.Function; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.Ignition; +import org.apache.ignite.client.IgniteClient; +import org.apache.ignite.client.SslMode; +import org.apache.ignite.configuration.ClientConfiguration; import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.client.GridClientNodeStateBeforeStart; +import org.apache.ignite.internal.client.thin.TcpIgniteClient; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.BeforeNodeStartCommand; import org.apache.ignite.internal.management.api.Command; -import org.apache.ignite.internal.management.api.CommandInvoker; -import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.management.api.CommandUtils; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.lang.IgniteBiTuple; - -import static org.apache.ignite.internal.commandline.CommandHandler.DFLT_HOST; +import org.jetbrains.annotations.Nullable; /** - * Adapter of new management API command for legacy {@code control.sh} execution flow. + * Adapter of new management API command for {@code control.sh} execution flow. */ -public class CliCommandInvoker extends CommandInvoker implements AutoCloseable { - /** Client configuration. */ - private final GridClientConfiguration clientCfg; - +public class CliCommandInvoker extends AbstractCliCommandInvoker { /** Client. */ - private GridClient client; + private final IgniteClient client; /** @param cmd Command to execute. */ - public CliCommandInvoker(Command cmd, A arg, GridClientConfiguration clientCfg) { - super(cmd, arg, null); - this.clientCfg = clientCfg; - } - - /** - * @return Message text to show user for. {@code null} means that confirmantion is not required. - */ - public String confirmationPrompt() { - return cmd.confirmationPrompt(arg); + public CliCommandInvoker( + Command cmd, + ConnectionAndSslParameters args, + Function pwdReader + ) throws IgniteCheckedException { + super(cmd, args, pwdReader); + + client = Ignition.startClient(clientConfiguration(args)); } - /** */ - public R invokeBeforeNodeStart(Consumer printer) throws Exception { - try (GridClientBeforeNodeStart client = startClientBeforeNodeStart(clientCfg)) { - return ((BeforeNodeStartCommand)cmd).execute(client, arg, printer); - } - catch (GridClientDisconnectedException e) { - throw new GridClientException(e.getCause()); - } + /** {@inheritDoc} */ + @Override protected GridClientNode defaultNode() { + return CommandUtils.clusterToClientNode(client.cluster().forOldest().node()); } /** {@inheritDoc} */ - @Override protected GridClientNode defaultNode() throws GridClientException { - GridClientNode node; - - // Prefer node from connect string. - final String cfgAddr = clientCfg.getServers().iterator().next(); - - String[] parts = cfgAddr.split(":"); - - if (DFLT_HOST.equals(parts[0])) { - InetAddress addr; - - try { - addr = IgniteUtils.getLocalHost(); - } - catch (IOException e) { - throw new GridClientException("Can't get localhost name.", e); - } - - if (addr.isLoopbackAddress()) - throw new GridClientException("Can't find localhost name."); - - String origAddr = addr.getHostName() + ":" + parts[1]; - - node = listHosts(client()).filter(tuple -> origAddr.equals(tuple.get2())).findFirst().map(IgniteBiTuple::get1).orElse(null); - - if (node == null) - node = listHostsByClientNode(client()).filter(tuple -> tuple.get2().size() == 1 && cfgAddr.equals(tuple.get2().get(0))). - findFirst().map(IgniteBiTuple::get1).orElse(null); - } - else - node = listHosts(client()).filter(tuple -> cfgAddr.equals(tuple.get2())).findFirst().map(IgniteBiTuple::get1).orElse(null); - - // Otherwise choose random node. - if (node == null) - node = balancedNode(client().compute()); - - return node; + @Override protected @Nullable IgniteClient client() { + return client; } /** {@inheritDoc} */ - @Override protected GridClient client() throws GridClientException { - if (client != null && client.connected()) - return client; - - client = GridClientFactory.start(clientCfg); - - // If connection is unsuccessful, fail before doing any operations: - if (!client.connected()) { - GridClientException lastErr = client.checkLastError(); - - try { - client.close(); - } - catch (Throwable e) { - lastErr.addSuppressed(e); + @Override public R invokeBeforeNodeStart(Consumer printer) throws Exception { + return ((BeforeNodeStartCommand)cmd).execute(new GridClientNodeStateBeforeStart() { + @Override public void stopWarmUp() { + ((TcpIgniteClient)client).stopWarmUp(); } - - throw lastErr; - } - - return client; + }, arg, printer); } /** {@inheritDoc} */ @Override public void close() { - if (client != null) - client.close(); + client.close(); } /** - * Method to create thin client for communication with node before it starts. - * If node has already started, there will be an error. - * - * @param clientCfg Thin client configuration. - * @return Grid thin client instance which is already connected to node before it starts. - * @throws Exception If error occur. + * @param args Common arguments. + * @return Thin client configuration to connect to cluster. + * @throws IgniteCheckedException If error occur. */ - private static GridClientBeforeNodeStart startClientBeforeNodeStart( - GridClientConfiguration clientCfg - ) throws Exception { - GridClientBeforeNodeStart client = GridClientFactory.startBeforeNodeStart(clientCfg); - - // If connection is unsuccessful, fail before doing any operations: - if (!client.connected()) { - GridClientException lastErr = client.checkLastError(); + private ClientConfiguration clientConfiguration( + ConnectionAndSslParameters args + ) throws IgniteCheckedException { + ClientConfiguration clientCfg = new ClientConfiguration(); - try { - client.close(); - } - catch (Throwable e) { - lastErr.addSuppressed(e); - } + clientCfg.setAddresses(args.host() + ":" + args.port()); - throw lastErr; + if (!F.isEmpty(args.userName())) { + clientCfg.setUserName(args.userName()); + clientCfg.setUserPassword(args.password()); } - return client; - } - - /** - * @param client Client. - * @return List of hosts. - */ - private static Stream> listHosts(GridClient client) throws GridClientException { - return client.compute() - .nodes(GridClientNode::connectable) - .stream() - .flatMap(node -> Stream.concat( - node.tcpAddresses() == null ? Stream.empty() : node.tcpAddresses().stream(), - node.tcpHostNames() == null ? Stream.empty() : node.tcpHostNames().stream() - ).map(addr -> new IgniteBiTuple<>(node, addr + ":" + node.tcpPort()))); - } - - /** - * @param client Client. - * @return List of hosts. - */ - private static Stream>> listHostsByClientNode( - GridClient client - ) throws GridClientException { - return client.compute().nodes(GridClientNode::connectable).stream() - .map( - node -> new IgniteBiTuple<>( - node, - Stream.concat( - node.tcpAddresses() == null ? Stream.empty() : node.tcpAddresses().stream(), - node.tcpHostNames() == null ? Stream.empty() : node.tcpHostNames().stream() - ) - .map(addr -> addr + ":" + node.tcpPort()).collect(Collectors.toList()) - ) - ); - } - - /** - * @param compute instance - * @return balanced node - */ - private static GridClientNode balancedNode(GridClientCompute compute) throws GridClientException { - Collection nodes = compute.nodes(GridClientNode::connectable); + if (!F.isEmpty(args.sslKeyStorePath()) || !F.isEmpty(args.sslFactoryConfigPath())) { + clientCfg.setSslContextFactory(createSslSupportFactory(args)); + clientCfg.setSslMode(SslMode.REQUIRED); + } - if (F.isEmpty(nodes)) - throw new GridClientDisconnectedException("Connectable node not found", null); + clientCfg.setClusterDiscoveryEnabled(false); - return compute.balancer().balancedNode(nodes); + return clientCfg; } } diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliGridClientCommandInvoker.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliGridClientCommandInvoker.java new file mode 100644 index 0000000000000..82136772bc2c9 --- /dev/null +++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CliGridClientCommandInvoker.java @@ -0,0 +1,280 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.commandline; + +import java.io.IOException; +import java.net.InetAddress; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientBeforeNodeStart; +import org.apache.ignite.internal.client.GridClientCompute; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.client.GridClientDisconnectedException; +import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientFactory; +import org.apache.ignite.internal.client.GridClientNode; +import org.apache.ignite.internal.dto.IgniteDataTransferObject; +import org.apache.ignite.internal.management.api.BeforeNodeStartCommand; +import org.apache.ignite.internal.management.api.Command; +import org.apache.ignite.internal.util.IgniteUtils; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.lang.IgniteBiTuple; +import org.apache.ignite.plugin.security.SecurityCredentials; +import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider; +import org.apache.ignite.plugin.security.SecurityCredentialsProvider; +import org.jetbrains.annotations.NotNull; + +import static org.apache.ignite.internal.commandline.CommandHandler.DFLT_HOST; + +/** + * Adapter of new management API command for legacy {@code control.sh} execution flow. + */ +public class CliGridClientCommandInvoker extends AbstractCliCommandInvoker { + /** */ + private final GridClientConfiguration clientCfg; + + /** Client. */ + private final GridClient client; + + /** @param cmd Command to execute. */ + public CliGridClientCommandInvoker( + Command cmd, + ConnectionAndSslParameters args, + Function pwdReader + ) throws Exception { + super(cmd, args, pwdReader); + + clientCfg = clientConfiguration(args); + + if (args.command() instanceof BeforeNodeStartCommand) { + client = null; + + return; + } + + client = GridClientFactory.start(clientCfg); + + // If connection is unsuccessful, fail before doing any operations: + if (!client.connected()) { + GridClientException lastErr = client.checkLastError(); + + try { + client.close(); + } + catch (Throwable e) { + lastErr.addSuppressed(e); + } + + throw lastErr; + } + } + + /** */ + /** {@inheritDoc} */ + @Override public R invokeBeforeNodeStart(Consumer printer) throws Exception { + try (GridClientBeforeNodeStart client = startClientBeforeNodeStart(clientCfg)) { + return ((BeforeNodeStartCommand)cmd).execute(client.beforeStartState(), arg, printer); + } + catch (GridClientDisconnectedException e) { + throw new GridClientException(e.getCause()); + } + } + + /** {@inheritDoc} */ + @Override protected GridClientNode defaultNode() throws GridClientException { + GridClientNode node; + + // Prefer node from connect string. + final String cfgAddr = clientCfg.getServers().iterator().next(); + + String[] parts = cfgAddr.split(":"); + + if (DFLT_HOST.equals(parts[0])) { + InetAddress addr; + + try { + addr = IgniteUtils.getLocalHost(); + } + catch (IOException e) { + throw new GridClientException("Can't get localhost name.", e); + } + + if (addr.isLoopbackAddress()) + throw new GridClientException("Can't find localhost name."); + + String origAddr = addr.getHostName() + ":" + parts[1]; + + node = listHosts(gridClient()).filter(tuple -> origAddr.equals(tuple.get2())).findFirst().map(IgniteBiTuple::get1).orElse(null); + + if (node == null) + node = listHostsByClientNode(gridClient()).filter(tuple -> tuple.get2().size() == 1 && cfgAddr.equals(tuple.get2().get(0))). + findFirst().map(IgniteBiTuple::get1).orElse(null); + } + else + node = listHosts(gridClient()).filter(tuple -> cfgAddr.equals(tuple.get2())).findFirst().map(IgniteBiTuple::get1).orElse(null); + + // Otherwise choose random node. + if (node == null) + node = balancedNode(gridClient().compute()); + + return node; + } + + /** {@inheritDoc} */ + @Override protected GridClient gridClient() { + return client; + } + + /** {@inheritDoc} */ + @Override public void close() { + IgniteUtils.closeQuiet(client); + } + + /** + * Method to create thin client for communication with node before it starts. + * If node has already started, there will be an error. + * + * @param clientCfg Thin client configuration. + * @return Grid thin client instance which is already connected to node before it starts. + * @throws Exception If error occur. + */ + private static GridClientBeforeNodeStart startClientBeforeNodeStart( + GridClientConfiguration clientCfg + ) throws Exception { + GridClientBeforeNodeStart client = GridClientFactory.startBeforeNodeStart(clientCfg); + + // If connection is unsuccessful, fail before doing any operations: + if (!client.connected()) { + GridClientException lastErr = client.checkLastError(); + + try { + client.close(); + } + catch (Throwable e) { + lastErr.addSuppressed(e); + } + + throw lastErr; + } + + return client; + } + + /** + * @param client Client. + * @return List of hosts. + */ + private static Stream> listHosts(GridClient client) throws GridClientException { + return client.compute() + .nodes(GridClientNode::connectable) + .stream() + .flatMap(node -> Stream.concat( + node.tcpAddresses() == null ? Stream.empty() : node.tcpAddresses().stream(), + node.tcpHostNames() == null ? Stream.empty() : node.tcpHostNames().stream() + ).map(addr -> new IgniteBiTuple<>(node, addr + ":" + node.tcpPort()))); + } + + /** + * @param client Client. + * @return List of hosts. + */ + private static Stream>> listHostsByClientNode( + GridClient client + ) throws GridClientException { + return client.compute().nodes(GridClientNode::connectable).stream() + .map( + node -> new IgniteBiTuple<>( + node, + Stream.concat( + node.tcpAddresses() == null ? Stream.empty() : node.tcpAddresses().stream(), + node.tcpHostNames() == null ? Stream.empty() : node.tcpHostNames().stream() + ) + .map(addr -> addr + ":" + node.tcpPort()).collect(Collectors.toList()) + ) + ); + } + + /** + * @param compute instance + * @return balanced node + */ + private static GridClientNode balancedNode(GridClientCompute compute) throws GridClientException { + Collection nodes = compute.nodes(GridClientNode::connectable); + + if (F.isEmpty(nodes)) + throw new GridClientDisconnectedException("Connectable node not found", null); + + return compute.balancer().balancedNode(nodes); + } + + /** + * @param args Common arguments. + * @return Thin client configuration to connect to cluster. + * @throws IgniteCheckedException If error occur. + */ + private GridClientConfiguration clientConfiguration( + ConnectionAndSslParameters args + ) throws IgniteCheckedException { + GridClientConfiguration clientCfg = new GridClientConfiguration(); + + clientCfg.setPingInterval(args.pingInterval()); + + clientCfg.setPingTimeout(args.pingTimeout()); + + clientCfg.setServers(Collections.singletonList(args.host() + ":" + args.port())); + + if (!F.isEmpty(args.userName())) + clientCfg.setSecurityCredentialsProvider(getSecurityCredentialsProvider(args.userName(), args.password(), clientCfg)); + + if (!F.isEmpty(args.sslKeyStorePath()) || !F.isEmpty(args.sslFactoryConfigPath())) + clientCfg.setSslContextFactory(createSslSupportFactory(args)); + + return clientCfg; + } + + /** + * @param userName User name for authorization. + * @param password Password for authorization. + * @param clientCfg Thin client configuration to connect to cluster. + * @return Security credentials provider with usage of given user name and password. + * @throws IgniteCheckedException If error occur. + */ + @NotNull private SecurityCredentialsProvider getSecurityCredentialsProvider( + String userName, + String password, + GridClientConfiguration clientCfg + ) throws IgniteCheckedException { + SecurityCredentialsProvider securityCredential = clientCfg.getSecurityCredentialsProvider(); + + if (securityCredential == null) + return new SecurityCredentialsBasicProvider(new SecurityCredentials(userName, password)); + + final SecurityCredentials credential = securityCredential.credentials(); + credential.setLogin(userName); + credential.setPassword(password); + + return securityCredential; + } +} diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java index 98c27b87667b1..93a94db8e3679 100644 --- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java +++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.commandline; import java.lang.reflect.Field; -import java.net.URL; import java.time.Duration; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -31,15 +30,15 @@ import java.util.UUID; import java.util.function.BiConsumer; import java.util.function.Consumer; -import javax.cache.configuration.Factory; -import javax.net.ssl.SSLContext; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.IgniteSystemProperties; +import org.apache.ignite.client.ClientAuthenticationException; +import org.apache.ignite.client.ClientConnectionException; +import org.apache.ignite.configuration.ClientConnectorConfiguration; +import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.internal.client.GridClientAuthenticationException; import org.apache.ignite.internal.client.GridClientClosedException; -import org.apache.ignite.internal.client.GridClientConfiguration; import org.apache.ignite.internal.client.GridClientDisconnectedException; import org.apache.ignite.internal.client.GridClientHandshakeException; import org.apache.ignite.internal.client.GridServerUnreachableException; @@ -58,23 +57,17 @@ import org.apache.ignite.internal.management.api.HelpCommand; import org.apache.ignite.internal.management.api.Positional; import org.apache.ignite.internal.management.cache.CacheCommand; -import org.apache.ignite.internal.util.IgniteUtils; -import org.apache.ignite.internal.util.spring.IgniteSpringHelperImpl; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteExperimental; -import org.apache.ignite.plugin.security.SecurityCredentials; -import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider; -import org.apache.ignite.plugin.security.SecurityCredentialsProvider; import org.apache.ignite.ssl.SslContextFactory; -import org.jetbrains.annotations.NotNull; -import org.springframework.context.ApplicationContext; import static java.lang.System.lineSeparator; import static java.util.Objects.nonNull; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ENABLE_EXPERIMENTAL_COMMAND; +import static org.apache.ignite.IgniteSystemProperties.getBoolean; import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR; import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT; import static org.apache.ignite.internal.commandline.ArgumentParser.CMD_AUTO_CONFIRMATION; @@ -131,7 +124,13 @@ public class CommandHandler { public static final String DFLT_HOST = "127.0.0.1"; /** */ - public static final int DFLT_PORT = 11211; + public static final int DFLT_PORT = 10800; + + /** + * System property for backward compatibility. Will be removed in future releases. + * Enables connection to {@link ConnectorConfiguration REST connector} and forcefully sets default port to 11211. + */ + public static final String IGNITE_CONTROL_UTILITY_USE_CONNECTOR_CONNECTION = "IGNITE_CONTROL_UTILITY_USE_CONNECTOR_CONNECTION"; /** */ private final Scanner in = new Scanner(System.in); @@ -253,6 +252,12 @@ public int execute(List rawArgs) { ConnectionAndSslParameters args = new ArgumentParser(logger, registry).parseAndValidate(rawArgs); + if (args.command() instanceof HelpCommand) { + printUsage(logger, args.cmdPath().peekLast()); + + return EXIT_CODE_OK; + } + cmdName = toFormattedCommandName(args.cmdPath().peekLast().getClass()).toUpperCase(); int tryConnectMaxCnt = 3; @@ -262,9 +267,9 @@ public int execute(List rawArgs) { boolean credentialsRequested = false; while (true) { - try ( - CliCommandInvoker invoker = - new CliCommandInvoker<>(args.command(), args.commandArg(), getClientConfiguration(args)) + try (AbstractCliCommandInvoker invoker = useConnectorConnection() ? + new CliGridClientCommandInvoker<>(args.command(), args, this::requestPasswordFromConsole) : + new CliCommandInvoker<>(args.command(), args, this::requestPasswordFromConsole) ) { if (!invoker.prepare(logger::info)) return EXIT_CODE_OK; @@ -286,9 +291,7 @@ public int execute(List rawArgs) { if (deprecationMsg != null) logger.warning(deprecationMsg); - if (args.command() instanceof HelpCommand) - printUsage(logger, args.cmdPath().peekLast()); - else if (args.command() instanceof BeforeNodeStartCommand) + if (args.command() instanceof BeforeNodeStartCommand) lastOperationRes = invoker.invokeBeforeNodeStart(logger::info); else lastOperationRes = invoker.invoke(logger::info, args.verbose()); @@ -348,8 +351,18 @@ else if (args.command() instanceof BeforeNodeStartCommand) if (isSSLMisconfigurationError(cause)) e = cause; - logger.error("Connection to cluster failed. " + errorMessage(e)); + String errMsg = errorMessage(e); + + logger.error("Connection to cluster failed. " + errMsg); + if (errMsg.contains("Channel is closed") || isSSLMisconfigurationError(cause)) { + logger.error("Make sure you are connecting to the client connector (configured on a node via '" + + ClientConnectorConfiguration.class.getName() + "'). Connection to the REST connector was " + + "deprecated and will be removed for the control utility in future releases. Set up the '" + + IGNITE_CONTROL_UTILITY_USE_CONNECTOR_CONNECTION + "' system property to the 'true' to " + + "forcefully connect to the REST connector (configured on a node via '" + + ConnectorConfiguration.class.getName() + "'). "); + } } logger.info("Command [" + cmdName + "] finished with code: " + EXIT_CODE_CONNECTION_FAILED); @@ -446,6 +459,9 @@ private boolean isSSLMisconfigurationError(Throwable e) { * to secured cluster. */ private boolean isConnectionClosedSilentlyException(Throwable e) { + if (e instanceof ClientConnectionException && "Channel is closed".equals(e.getMessage())) + return true; + if (!(e instanceof GridClientDisconnectedException)) return false; @@ -495,130 +511,6 @@ private String argumentsToString(List rawArgs) { return sb.toString(); } - /** - * @param args Common arguments. - * @return Thin client configuration to connect to cluster. - * @throws IgniteCheckedException If error occur. - */ - @NotNull private GridClientConfiguration getClientConfiguration( - ConnectionAndSslParameters args - ) throws IgniteCheckedException { - return getClientConfiguration(args.userName(), args.password(), args); - } - - /** - * @param userName User name for authorization. - * @param password Password for authorization. - * @param args Common arguments. - * @return Thin client configuration to connect to cluster. - * @throws IgniteCheckedException If error occur. - */ - @NotNull private GridClientConfiguration getClientConfiguration( - String userName, - String password, - ConnectionAndSslParameters args - ) throws IgniteCheckedException { - GridClientConfiguration clientCfg = new GridClientConfiguration(); - - clientCfg.setPingInterval(args.pingInterval()); - - clientCfg.setPingTimeout(args.pingTimeout()); - - clientCfg.setServers(Collections.singletonList(args.host() + ":" + args.port())); - - if (!F.isEmpty(userName)) - clientCfg.setSecurityCredentialsProvider(getSecurityCredentialsProvider(userName, password, clientCfg)); - - if (!F.isEmpty(args.sslKeyStorePath()) || !F.isEmpty(args.sslFactoryConfigPath())) { - if (!F.isEmpty(args.sslKeyStorePath()) && !F.isEmpty(args.sslFactoryConfigPath())) - throw new IgniteCheckedException("Incorrect SSL configuration. " + - "SSL factory config path should not be specified simultaneously with other SSL options like keystore path."); - - clientCfg.setSslContextFactory(createSslSupportFactory(args)); - } - - return clientCfg; - } - - /** - * @param userName User name for authorization. - * @param password Password for authorization. - * @param clientCfg Thin client configuration to connect to cluster. - * @return Security credentials provider with usage of given user name and password. - * @throws IgniteCheckedException If error occur. - */ - @NotNull private SecurityCredentialsProvider getSecurityCredentialsProvider( - String userName, - String password, - GridClientConfiguration clientCfg - ) throws IgniteCheckedException { - SecurityCredentialsProvider securityCredential = clientCfg.getSecurityCredentialsProvider(); - - if (securityCredential == null) - return new SecurityCredentialsBasicProvider(new SecurityCredentials(userName, password)); - - final SecurityCredentials credential = securityCredential.credentials(); - credential.setLogin(userName); - credential.setPassword(password); - - return securityCredential; - } - - /** - * @param args Commond args. - * @return Ssl support factory. - */ - @NotNull private Factory createSslSupportFactory(ConnectionAndSslParameters args) throws IgniteCheckedException { - if (!F.isEmpty(args.sslFactoryConfigPath())) { - URL springCfg = IgniteUtils.resolveSpringUrl(args.sslFactoryConfigPath()); - - ApplicationContext ctx = IgniteSpringHelperImpl.applicationContext(springCfg); - - return (Factory)ctx.getBean(Factory.class); - } - - SslContextFactory factory = new SslContextFactory(); - - if (args.sslProtocol().length > 1) - factory.setProtocols(args.sslProtocol()); - else - factory.setProtocol(args.sslProtocol()[0]); - - factory.setKeyAlgorithm(args.sslKeyAlgorithm()); - factory.setCipherSuites(args.getSslCipherSuites()); - factory.setKeyStoreFilePath(args.sslKeyStorePath()); - - if (args.sslKeyStorePassword() != null) - factory.setKeyStorePassword(args.sslKeyStorePassword()); - else { - char[] keyStorePwd = requestPasswordFromConsole("SSL keystore password: "); - - args.sslKeyStorePassword(keyStorePwd); - factory.setKeyStorePassword(keyStorePwd); - } - - factory.setKeyStoreType(args.sslKeyStoreType()); - - if (F.isEmpty(args.sslTrustStorePath())) - factory.setTrustManagers(SslContextFactory.getDisabledTrustManager()); - else { - factory.setTrustStoreFilePath(args.sslTrustStorePath()); - - if (args.sslTrustStorePassword() != null) - factory.setTrustStorePassword(args.sslTrustStorePassword()); - else { - char[] trustStorePwd = requestPasswordFromConsole("SSL truststore password: "); - - args.sslTrustStorePassword(trustStorePwd); - factory.setTrustStorePassword(trustStorePwd); - } - - factory.setTrustStoreType(args.sslTrustStoreType()); - } - - return factory; - } - /** * Used for tests. * @@ -656,10 +548,11 @@ private boolean confirm(String str) { /** * @param e Exception to check. - * @return {@code true} if specified exception is {@link GridClientAuthenticationException}. + * @return {@code true} if specified exception is an authentication exception. */ public static boolean isAuthError(Throwable e) { - return X.hasCause(e, GridClientAuthenticationException.class); + return X.hasCause(e, GridClientAuthenticationException.class) + || X.hasCause(e, ClientAuthenticationException.class); } /** @@ -671,7 +564,8 @@ private static boolean isConnectionError(Throwable e) { e instanceof GridClientConnectionResetException || e instanceof GridClientDisconnectedException || e instanceof GridClientHandshakeException || - e instanceof GridServerUnreachableException; + e instanceof GridServerUnreachableException || + X.hasCause(e, ClientConnectionException.class); } /** @@ -708,7 +602,7 @@ private String requestDataFromConsole(String msg) { /** @param rawArgs Arguments. */ private void printHelp(List rawArgs) { boolean experimentalEnabled = rawArgs.stream().anyMatch(CMD_ENABLE_EXPERIMENTAL::equalsIgnoreCase) || - IgniteSystemProperties.getBoolean(IGNITE_ENABLE_EXPERIMENTAL_COMMAND); + getBoolean(IGNITE_ENABLE_EXPERIMENTAL_COMMAND); logger.info("Control utility script is used to execute admin commands on cluster or get common cluster info. " + "The command has the following syntax:"); @@ -949,6 +843,11 @@ private static class LengthCalculator implements Consumer { } } + /** */ + public static boolean useConnectorConnection() { + return getBoolean(IGNITE_CONTROL_UTILITY_USE_CONNECTOR_CONNECTION); + } + /** */ public static class CommandName implements Consumer { /** */ diff --git a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java index 59df6748ece5e..c56d8e2199094 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.security.impl.TestSecurityData; import org.apache.ignite.internal.processors.security.impl.TestSecurityPluginProvider; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.plugin.security.SecurityPermissionSet; import org.apache.ignite.plugin.security.SecurityPermissionSetBuilder; @@ -64,7 +65,7 @@ public class SecurityCommandHandlerPermissionsTest extends GridCommandHandlerAbs /** */ @Parameterized.Parameters(name = "cmdHnd={0}") public static List commandHandlers() { - return Collections.singletonList(CLI_CMD_HND); + return F.asList(CLI_CMD_HND, CLI_GRID_CLIENT_CMD_HND); } /** {@inheritDoc} */ diff --git a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java index fdc404820ce52..aeb0a57c96e34 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java @@ -61,6 +61,7 @@ import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.lang.GridTuple3; import org.apache.ignite.internal.util.lang.IgnitePair; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.A; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; @@ -155,7 +156,7 @@ public class IgniteIndexReaderTest extends GridCommandHandlerAbstractTest { /** */ @Parameterized.Parameters(name = "cmdHnd={0}") public static List commandHandlers() { - return Collections.singletonList(CLI_CMD_HND); + return F.asList(CLI_CMD_HND, CLI_GRID_CLIENT_CMD_HND); } /** {@inheritDoc} */ diff --git a/modules/control-utility/src/test/java/org/apache/ignite/internal/processors/security/GridCommandHandlerSslWithSecurityTest.java b/modules/control-utility/src/test/java/org/apache/ignite/internal/processors/security/GridCommandHandlerSslWithSecurityTest.java index dfcaaf113b21d..f1803259c3759 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/internal/processors/security/GridCommandHandlerSslWithSecurityTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/internal/processors/security/GridCommandHandlerSslWithSecurityTest.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.configuration.ClientConnectorConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; @@ -72,7 +73,7 @@ public class GridCommandHandlerSslWithSecurityTest extends GridCommandHandlerFac /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); super.beforeTest(); } @@ -97,14 +98,26 @@ protected void injectTestSystemOut() { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - return super.getConfiguration(igniteInstanceName) + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName) .setPluginProviders(new TestSecurityPluginProvider(login, pwd, ALL_PERMISSIONS, null, false)) - .setSslContextFactory(sslTrustedFactory("node01", "trustone")) - .setConnectorConfiguration( - new ConnectorConfiguration() - .setSslEnabled(true) - .setSslFactory(sslTrustedFactory("connectorServer", "trustthree")) + .setSslContextFactory(sslTrustedFactory("node01", "trustone")); + + if (commandHandler.equals(CLI_GRID_CLIENT_CMD_HND)) { + cfg.setConnectorConfiguration(new ConnectorConfiguration() + .setSslEnabled(true) + .setSslFactory(sslTrustedFactory("connectorServer", "trustthree")) + ); + } + + if (commandHandler.equals(CLI_CMD_HND)) { + cfg.setClientConnectorConfiguration(new ClientConnectorConfiguration() + .setSslEnabled(true) + .setSslContextFactory(sslTrustedFactory("connectorServer", "trustthree")) + .setUseIgniteSslContextFactory(false) ); + } + + return cfg; } /** diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java index 9b78e79ce5e2e..90359af8c7fca 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java @@ -208,7 +208,7 @@ public void testDeleteLostSegmentLinksApplicationNotClosed() throws Exception { String out = executeCommand(EXIT_CODE_UNEXPECTED_ERROR, CDC, DELETE_LOST_SEGMENT_LINKS, NODE_ID, srv0.localNode().id().toString()); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, out, "Failed to delete lost segment CDC links. Unable to acquire lock to lock CDC folder."); assertFalse(fut.isDone()); @@ -330,7 +330,7 @@ public void testResendCachesNotExist() { String out = executeCommand(EXIT_CODE_UNEXPECTED_ERROR, CDC, RESEND, CACHES, "unknown_cache"); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, out, "Cache does not exist"); String cdcDisabledCacheName = "cdcDisabledCache"; @@ -341,7 +341,7 @@ public void testResendCachesNotExist() { out = executeCommand(EXIT_CODE_UNEXPECTED_ERROR, CDC, RESEND, CACHES, cdcDisabledCacheName); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, out, "CDC is not enabled for given cache"); } @@ -372,7 +372,7 @@ public void testResendCancelOnNodeLeft() { /** */ @Test public void testResendCancelOnRebalanceInProgress() throws Exception { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); injectTestSystemOut(); @@ -426,7 +426,7 @@ public void testResendCancelOnTopologyChangeBeforeStart() throws Exception { String out = executeCommand(EXIT_CODE_UNEXPECTED_ERROR, CDC, RESEND, CACHES, DEFAULT_CACHE_NAME); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, out, "CDC cache data resend cancelled. Topology changed"); }); @@ -466,7 +466,7 @@ public void testResendCancelOnTopologyChange() throws Exception { String out = executeCommand(EXIT_CODE_UNEXPECTED_ERROR, CDC, RESEND, CACHES, DEFAULT_CACHE_NAME); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, out, "CDC cache data resend cancelled. Topology changed"); }); diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java index 76a124ef409d8..e2089d5bde094 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java @@ -40,6 +40,7 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.AtomicConfiguration; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.ClientConnectorConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.DataRegionConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; @@ -77,10 +78,12 @@ import static org.apache.ignite.configuration.EncryptionConfiguration.DFLT_REENCRYPTION_BATCH_SIZE; import static org.apache.ignite.configuration.EncryptionConfiguration.DFLT_REENCRYPTION_RATE_MBPS; import static org.apache.ignite.events.EventType.EVT_CONSISTENCY_VIOLATION; +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_TCP_PORT; import static org.apache.ignite.internal.commandline.ArgumentParser.CMD_AUTO_CONFIRMATION; import static org.apache.ignite.internal.encryption.AbstractEncryptionTest.KEYSTORE_PASSWORD; import static org.apache.ignite.internal.encryption.AbstractEncryptionTest.KEYSTORE_PATH; import static org.apache.ignite.internal.management.cache.VerifyBackupPartitionsDumpTask.IDLE_DUMP_FILE_PREFIX; +import static org.apache.ignite.internal.processors.odbc.ClientListenerProcessor.CLIENT_LISTENER_PORT; /** * Common abstract class for testing {@link CommandHandler}. @@ -262,6 +265,7 @@ protected boolean idleVerifyRes(Path p) { cfg.setCommunicationSpi(new TestRecordingCommunicationSpi()); cfg.setConnectorConfiguration(new ConnectorConfiguration().setSslEnabled(sslEnabled())); + cfg.setClientConnectorConfiguration(new ClientConnectorConfiguration().setSslEnabled(sslEnabled())); if (sslEnabled()) cfg.setSslContextFactory(sslFactory()); @@ -529,4 +533,10 @@ protected void createCacheAndPreload( protected void createCacheAndPreload(Ignite ignite, int countEntries) { createCacheAndPreload(ignite, DEFAULT_CACHE_NAME, countEntries, 32, null); } + + /** */ + protected String connectorPort(IgniteEx srv) { + return srv.localNode().attribute(commandHandler.equals(CLI_GRID_CLIENT_CMD_HND) ? ATTR_REST_TCP_PORT + : CLIENT_LISTENER_PORT).toString(); + } } diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java index b98b168a0786a..e9fd8090a175e 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassTest.java @@ -67,6 +67,7 @@ import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.client.IgniteClient; +import org.apache.ignite.client.SslMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.AtomicConfiguration; import org.apache.ignite.configuration.BinaryConfiguration; @@ -225,16 +226,16 @@ public void testFindAndDeleteGarbage() { new CacheConfiguration<>("garbage1").setGroupName("groupGarbage"), new CacheConfiguration<>("garbage2").setGroupName("groupGarbage"))); - assertEquals(EXIT_CODE_OK, execute("--port", "11212", "--cache", "find_garbage")); + assertEquals(EXIT_CODE_OK, execute("--port", connectorPort(grid(1)), "--cache", "find_garbage")); assertContains(log, testOut.toString(), "garbage not found"); - assertEquals(EXIT_CODE_OK, execute("--port", "11212", "--cache", "find_garbage", + assertEquals(EXIT_CODE_OK, execute("--port", connectorPort(grid(1)), "--cache", "find_garbage", ignite(0).localNode().id().toString())); assertContains(log, testOut.toString(), "garbage not found"); - assertEquals(EXIT_CODE_OK, execute("--port", "11212", "--cache", "find_garbage", + assertEquals(EXIT_CODE_OK, execute("--port", connectorPort(grid(1)), "--cache", "find_garbage", "groupGarbage")); assertContains(log, testOut.toString(), "garbage not found"); @@ -399,7 +400,7 @@ public void testTransactionHistoryInfo() throws Exception { /** */ @Test public void testCacheHelp() throws Exception { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); injectTestSystemOut(); @@ -452,7 +453,7 @@ public void testCacheHelp() throws Exception { /** */ @Test public void testHelp() throws Exception { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); injectTestSystemOut(); @@ -530,7 +531,7 @@ public void testOldReadOnlyApiNotAvailable() { /** */ @Test public void testPrintTimestampAtEndsOfExecution() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); injectTestSystemOut(); @@ -798,6 +799,11 @@ public void testCacheIdleVerifyDump() throws Exception { .setAutoBinaryConfigurationEnabled(false) .setBinaryConfiguration(new BinaryConfiguration().setCompactFooter(false)); + if (sslEnabled()) { + cliCfg.setSslMode(SslMode.REQUIRED); + cliCfg.setSslContextFactory(sslFactory()); + } + try (IgniteClient cli = TcpIgniteClient.start(cliCfg)) { for (int i = keysCnt; i < keysCnt * 3; i++) cli.cache(DEFAULT_CACHE_NAME).put(new TestClass(i, String.valueOf(i)), i); @@ -1393,7 +1399,7 @@ public void testCacheCreate() { String out = executeCommand(EXIT_CODE_UNEXPECTED_ERROR, "--cache", CREATE, SPRING_XML_CONFIG, cfgPath + "/cache-create-with-spel.xml"); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, out, "Spring expressions are prohibited."); assertEquals(expSize, G.allGrids().size()); @@ -1469,7 +1475,7 @@ public void testCacheDestroy() throws IgniteCheckedException { injectTestSystemIn(CONFIRM_MSG); assertEquals(EXIT_CODE_OK, execute("--cache", DESTROY, DESTROY_ALL_ARG)); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, testOut.toString(), expConfirmation); assertTrue("Caches must be destroyed: " + crd.cacheNames().toString(), crd.cacheNames().isEmpty()); @@ -1497,7 +1503,7 @@ public void testCacheClear() { assertEquals(EXIT_CODE_INVALID_ARGUMENTS, execute("--cache", CLEAR, CACHES, "X,Y", "Z")); assertContains(log, testOut.toString(), "Unexpected argument: Z"); - if (commandHandler.equals(CLI_CMD_HND)) { + if (cliCommandHandler()) { autoConfirmation = false; String expConfirmation = String.format(CacheClearCommand.CONFIRM_MSG, 2, "cache1, cache2"); @@ -2308,7 +2314,7 @@ private IgniteInternalFuture startTransactions( @Test @WithSystemProperty(key = IGNITE_ENABLE_EXPERIMENTAL_COMMAND, value = "true") public void testContainsNotExperimentalCmdInHelpOutputWhenEnableExperimentalTrue() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); checkContainsNotExperimentalCmdInHelpOutput(); } @@ -2322,7 +2328,7 @@ public void testContainsNotExperimentalCmdInHelpOutputWhenEnableExperimentalTrue @Test @WithSystemProperty(key = IGNITE_ENABLE_EXPERIMENTAL_COMMAND, value = "false") public void testContainsNotExperimentalCmdInHelpOutputWhenEnableExperimentalFalse() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); checkContainsNotExperimentalCmdInHelpOutput(); } @@ -2334,7 +2340,7 @@ public void testContainsNotExperimentalCmdInHelpOutputWhenEnableExperimentalFals @Test @WithSystemProperty(key = IGNITE_ENABLE_EXPERIMENTAL_COMMAND, value = "true") public void testContainsExperimentalCmdInHelpOutput() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); checkExperimentalCmdInHelpOutput(true); } @@ -2346,7 +2352,7 @@ public void testContainsExperimentalCmdInHelpOutput() { @Test @WithSystemProperty(key = IGNITE_ENABLE_EXPERIMENTAL_COMMAND, value = "false") public void testNotContainsExperimentalCmdInHelpOutput() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); checkExperimentalCmdInHelpOutput(false); } @@ -2421,7 +2427,7 @@ public void testCorrectExecCmdWithVerboseInDiffParamsOrder() { */ @Test public void testErrInvalidArgumentsWithVerbose() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); injectTestSystemOut(); @@ -2441,7 +2447,7 @@ public void testErrInvalidArgumentsWithVerbose() { */ @Test public void testErrConnectionWithVerbose() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); injectTestSystemOut(); @@ -2461,7 +2467,7 @@ public void testErrConnectionWithVerbose() { */ @Test public void testErrUnexpectedWithWithoutVerbose() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); injectTestSystemOut(); diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassWithSSLTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassWithSSLTest.java index 6a4a5f7c37c61..f090664a738df 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassWithSSLTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerClusterByClassWithSSLTest.java @@ -30,7 +30,7 @@ public class GridCommandHandlerClusterByClassWithSSLTest extends GridCommandHand /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); super.beforeTest(); } diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerDefragmentationTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerDefragmentationTest.java index f250b3d6c064d..5e80455d8dba4 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerDefragmentationTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerDefragmentationTest.java @@ -34,7 +34,6 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; -import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.defragmentation.maintenance.DefragmentationParameters; import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory; @@ -188,7 +187,7 @@ public void testDefragmentationCancel() throws Exception { assertEquals(EXIT_CODE_OK, execute( cmd, "--port", - grid(0).localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(), + connectorPort(grid(0)), "--defragmentation", "cancel" )); @@ -204,7 +203,7 @@ public void testDefragmentationCancel() throws Exception { assertEquals(EXIT_CODE_OK, execute( cmd, "--port", - grid(1).localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(), + connectorPort(grid(1)), "--defragmentation", "cancel" )); @@ -242,7 +241,7 @@ public void testDefragmentationCancelInProgress() throws Exception { grid0ConsId )); - String port = grid(0).localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(); + String port = connectorPort(grid(0)); stopGrid(0); @@ -354,7 +353,7 @@ public void testDefragmentationStatus() throws Exception { grid0ConsId )); - String port = grid(0).localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(); + String port = connectorPort(grid(0)); stopGrid(0); diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerFactoryAbstractTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerFactoryAbstractTest.java index 2f979642d8b72..24d749dc427bc 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerFactoryAbstractTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerFactoryAbstractTest.java @@ -56,10 +56,10 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_TCP_PORT; import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_INVALID_ARGUMENTS; import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_OK; import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_UNEXPECTED_ERROR; +import static org.apache.ignite.internal.commandline.CommandHandler.IGNITE_CONTROL_UTILITY_USE_CONNECTOR_CONNECTION; import static org.apache.ignite.internal.commandline.CommandHandler.setupJavaLogger; import static org.apache.ignite.internal.commandline.CommandLogger.errorMessage; import static org.apache.ignite.internal.management.api.CommandMBean.INVOKE; @@ -68,6 +68,7 @@ import static org.apache.ignite.internal.management.api.CommandUtils.isBoolean; import static org.apache.ignite.internal.management.api.CommandUtils.toFormattedCommandName; import static org.apache.ignite.internal.management.api.CommandUtils.visitCommandParams; +import static org.apache.ignite.internal.processors.odbc.ClientListenerProcessor.CLIENT_LISTENER_PORT; /** Class to check command execution via all available handlers. */ @RunWith(Parameterized.class) @@ -75,6 +76,9 @@ public class GridCommandHandlerFactoryAbstractTest extends GridCommonAbstractTes /** @see JmxCommandHandler */ public static final String JMX_CMD_HND = "jmx"; + /** @see CliCommandHandler */ + public static final String CLI_GRID_CLIENT_CMD_HND = "cli_GridClient"; + /** @see CliCommandHandler */ public static final String CLI_CMD_HND = "cli"; @@ -120,6 +124,11 @@ protected TestCommandHandler newCommandHandler(@Nullable IgniteLogger log) { return CMD_HNDS.get(commandHandler).apply(log); } + /** */ + protected boolean cliCommandHandler() { + return commandHandler.equals(CLI_CMD_HND) || commandHandler.equals(CLI_GRID_CLIENT_CMD_HND); + } + /** */ public interface TestCommandHandler { /** */ @@ -135,6 +144,36 @@ public interface TestCommandHandler { public String name(); } + /** */ + public static class CliGridClientCommandHandler extends CliCommandHandler { + /** */ + public CliGridClientCommandHandler() { + super(); + } + + /** */ + public CliGridClientCommandHandler(@Nullable IgniteLogger log) { + super(log); + } + + /** {@inheritDoc} */ + @Override public int execute(List rawArgs) { + System.setProperty(IGNITE_CONTROL_UTILITY_USE_CONNECTOR_CONNECTION, "true"); + + try { + return super.execute(rawArgs); + } + finally { + System.clearProperty(IGNITE_CONTROL_UTILITY_USE_CONNECTOR_CONNECTION); + } + } + + /** {@inheritDoc} */ + @Override public String name() { + return CLI_GRID_CLIENT_CMD_HND; + } + } + /** */ public static class CliCommandHandler implements TestCommandHandler { /** */ @@ -281,7 +320,7 @@ private IgniteEx ignite(ConnectionAndSslParameters p) return ignite; for (Ignite node : IgnitionEx.allGrids()) { - Integer nodePort = ((IgniteEx)node).localNode().attribute(ATTR_REST_TCP_PORT); + Integer nodePort = ((IgniteEx)node).localNode().attribute(CLIENT_LISTENER_PORT); if (nodePort != null && port == nodePort) { this.port = port; @@ -333,6 +372,6 @@ private static String toString(Object val) { /** */ protected int commandHandlerExtraLines() { - return commandHandler.equals(CLI_CMD_HND) ? 11 : 0; + return cliCommandHandler() ? 11 : 0; } } diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIncompatibleSslConfigTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIncompatibleSslConfigTest.java index d8fc8f3874311..d177243a416a0 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIncompatibleSslConfigTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIncompatibleSslConfigTest.java @@ -21,7 +21,7 @@ import org.junit.Assume; import org.junit.Test; -import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_UNEXPECTED_ERROR; +import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_INVALID_ARGUMENTS; import static org.apache.ignite.testframework.GridTestUtils.assertContains; /** @@ -43,7 +43,7 @@ public class GridCommandHandlerIncompatibleSslConfigTest extends GridCommandHand /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); super.beforeTest(); } @@ -55,7 +55,7 @@ public void test() throws Exception { injectTestSystemOut(); - assertEquals(EXIT_CODE_UNEXPECTED_ERROR, execute("--set-state", "ACTIVE")); + assertEquals(EXIT_CODE_INVALID_ARGUMENTS, execute("--set-state", "ACTIVE")); assertContains(log, testOut.toString(), "Incorrect SSL configuration."); } diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java index dd6e62b730d6e..6f6df903fa98f 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java @@ -87,7 +87,7 @@ public void testCacheIndexList() { String outStr = testOut.toString(); - String typePattern = commandHandler.equals(CLI_CMD_HND) ? "ArrayList" : "LinkedKeySet"; + String typePattern = cliCommandHandler() ? "ArrayList" : "LinkedKeySet"; assertTrue(outStr.contains("grpName=" + GROUP_NAME + ", cacheName=" + CACHE_NAME + ", idxName=PERSON_ORGID_ASC_IDX, " + "colsNames=" + typePattern + " [ORGID, _KEY], tblName=PERSON")); @@ -139,7 +139,7 @@ public void tesAllArgs() { "--cache-name", CACHE_NAME, "--index-name", idxName)); - String typePattern = commandHandler.equals(CLI_CMD_HND) ? "ArrayList" : "LinkedKeySet"; + String typePattern = cliCommandHandler() ? "ArrayList" : "LinkedKeySet"; assertTrue(testOut.toString().contains("grpName=" + GROUP_NAME + ", cacheName=" + CACHE_NAME + ", idxName=PERSON_ORGID_ASC_IDX, colsNames=" + typePattern + " [ORGID, _KEY], tblName=PERSON")); diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingWithSSLTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingWithSSLTest.java index 178024460ea87..2921f7d5c6e2a 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingWithSSLTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingWithSSLTest.java @@ -30,7 +30,7 @@ public class GridCommandHandlerIndexingWithSSLTest extends GridCommandHandlerInd /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); super.beforeTest(); } diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java index f5cc0c981de20..36a9229bedf45 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java @@ -66,7 +66,7 @@ public class GridCommandHandlerInterruptCommandTest extends GridCommandHandlerAb /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(commandHandler.equals(CLI_GRID_CLIENT_CMD_HND)); super.beforeTest(); diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerMetadataTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerMetadataTest.java index c2938b75e9eb5..621937e18f9f1 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerMetadataTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerMetadataTest.java @@ -22,15 +22,9 @@ import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; import java.time.LocalDate; import java.util.Collection; import java.util.Date; -import java.util.HashMap; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; @@ -38,13 +32,10 @@ import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.Ignition; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.BinaryType; -import org.apache.ignite.client.ClientCacheConfiguration; -import org.apache.ignite.client.IgniteClient; import org.apache.ignite.configuration.ClientConfiguration; import org.apache.ignite.internal.binary.BinarySchema; import org.apache.ignite.internal.binary.BinaryTypeImpl; @@ -354,95 +345,6 @@ public void testRemoveUpdate() throws Exception { } } - /** - * Check the all thin connections are dropped on the command '--meta remove' and '--meta update'. - * Steps: - * - opens thin client connection. - * - creates Type0 on thin client side. - * - removes type by cmd line util. - * - executes any command on thin client to detect disconnect. - * - creates Type0 on thin client side with other type of field (checks the type was removed). - */ - @Test - public void testDropThinConnectionsOnRemove() throws Exception { - Path typeFile = FS.getPath("type0.bin"); - - try (IgniteClient cli = Ignition.startClient(clientConfiguration())) { - createType(cli.binary(), "Type0", 1); - - assertEquals(EXIT_CODE_OK, execute("--meta", "remove", - "--typeName", "Type0", - "--out", typeFile.toString())); - - // Executes command to check disconnect / reconnect. - GridTestUtils.assertThrows(log, () -> - cli.createCache(new ClientCacheConfiguration().setName("test")), - Exception.class, null); - - createType(cli.binary(), "Type0", "str"); - } - finally { - if (Files.exists(typeFile)) - Files.delete(typeFile); - } - } - - /** - * Check the all thin connections are dropped on the command '--meta remove' and '--meta update'. - * Steps: - * - opens JDBC thin client connection. - * - executes: CREATE TABLE test(id INT PRIMARY KEY, objVal OTHER). - * - inserts the instance of the 'TestValue' class to the table. - * - removes the type 'TestValue' by cmd line. - * - executes any command on JDBC driver to detect disconnect. - * - checks metadata on client side. It must be empty. - */ - @Test - public void testDropJdbcThinConnectionsOnRemove() throws Exception { - Path typeFile = FS.getPath("type0.bin"); - - try (Connection conn = DriverManager.getConnection(jdbcThinUrl())) { - try (final Statement stmt = conn.createStatement()) { - stmt.execute("CREATE TABLE test(id INT PRIMARY KEY, objVal OTHER)"); - - try (PreparedStatement pstmt = conn.prepareStatement("INSERT INTO test(id, objVal) VALUES (?, ?)")) { - pstmt.setInt(1, 0); - pstmt.setObject(2, new TestValue()); - - pstmt.execute(); - } - - stmt.execute("DELETE FROM test WHERE id >= 0"); - } - - HashMap metasOld = GridTestUtils.getFieldValue(conn, "metaHnd", "cache", "metas"); - - assertFalse(metasOld.isEmpty()); - - assertEquals(EXIT_CODE_OK, execute("--meta", "remove", - "--typeName", TestValue.class.getName(), - "--out", typeFile.toString())); - - // Executes any command to check disconnect. - GridTestUtils.assertThrows(log, () -> { - try (Statement stmt = conn.createStatement()) { - stmt.execute("SELECT * FROM test"); - } - - return null; - }, SQLException.class, "Failed to communicate with Ignite cluster"); - - HashMap metas = GridTestUtils.getFieldValue(conn, "metaHnd", "cache", "metas"); - - assertNotSame(metasOld, metas); - assertTrue(metas.isEmpty()); - } - finally { - if (Files.exists(typeFile)) - Files.delete(typeFile); - } - } - /** * Check the type successfully merged after remove-recreate-update operations. * Steps: diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerPropertiesTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerPropertiesTest.java index c81733098d4fc..ea247e0fbce23 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerPropertiesTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerPropertiesTest.java @@ -61,7 +61,7 @@ public void clear() { */ @Test public void testHelp() { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); assertEquals(EXIT_CODE_OK, execute("--property", "help")); diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java index d41a43377b598..c393f3bc81d8b 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerSslTest.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.List; import org.apache.ignite.Ignite; +import org.apache.ignite.configuration.ClientConnectorConfiguration; import org.apache.ignite.configuration.ConnectorConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; @@ -55,7 +56,7 @@ public class GridCommandHandlerSslTest extends GridCommandHandlerClusterPerMetho /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); super.beforeTest(); } @@ -68,10 +69,18 @@ public class GridCommandHandlerSslTest extends GridCommandHandlerClusterPerMetho cfg.getDataStorageConfiguration().getDefaultDataRegionConfiguration().setMaxSize(100 * 1024 * 1024); cfg.getDataStorageConfiguration().getDefaultDataRegionConfiguration().setPersistenceEnabled(true); - cfg.setConnectorConfiguration(new ConnectorConfiguration()); - cfg.getConnectorConfiguration().setSslEnabled(true); cfg.setSslContextFactory(createSslFactory()); + if (commandHandler.equals(CLI_GRID_CLIENT_CMD_HND)) { + cfg.setConnectorConfiguration(new ConnectorConfiguration() + .setSslEnabled(true)); + } + + if (commandHandler.equals(CLI_CMD_HND)) { + cfg.setClientConnectorConfiguration(new ClientConnectorConfiguration() + .setSslEnabled(true)); + } + return cfg; } diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java index 51dd7ff9629f1..16637b96dfe1f 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java @@ -77,7 +77,6 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; -import org.apache.ignite.internal.IgniteNodeAttributes; import org.apache.ignite.internal.TestRecordingCommunicationSpi; import org.apache.ignite.internal.client.GridClientFactory; import org.apache.ignite.internal.client.impl.GridClientImpl; @@ -271,7 +270,7 @@ public void testActivate() throws Exception { assertEquals(ACTIVE, ignite.cluster().state()); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, testOut.toString(), "Command deprecated. Use --set-state instead."); } @@ -282,7 +281,7 @@ public void testActivate() throws Exception { */ @Test public void testClientsLeakage() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); startGrids(1); @@ -400,7 +399,7 @@ public void testPersistenceCleanSpecifiedCachesCommand() throws Exception { IgniteEx ig1 = startGrid(1); - String port = ig1.localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(); + String port = connectorPort(ig1); assertEquals(EXIT_CODE_INVALID_ARGUMENTS, execute( "--host", "localhost", "--port", port, @@ -466,7 +465,7 @@ public void testPersistenceCleanCorruptedCachesCommand() throws Exception { IgniteEx ig1 = startGrid(1); - String port = ig1.localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(); + String port = connectorPort(ig1); assertEquals(EXIT_CODE_OK, execute("--host", "localhost", "--port", port, "--persistence")); assertEquals(EXIT_CODE_OK, execute("--host", "localhost", "--port", port, "--persistence", "info")); @@ -510,9 +509,8 @@ public void testPersistenceCleanAllCachesCommand() throws Exception { IgniteEx ig1 = startGrid(1); - String port = ig1.localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(); - - assertEquals(EXIT_CODE_OK, execute("--host", "localhost", "--port", port, "--persistence", "clean", "all")); + assertEquals(EXIT_CODE_OK, execute("--host", "localhost", "--port", connectorPort(ig1), + "--persistence", "clean", "all")); boolean allEmpty = Arrays.stream(mntcNodeWorkDir.listFiles()) .filter(File::isDirectory) @@ -548,9 +546,8 @@ public void testPersistenceBackupAllCachesCommand() throws Exception { IgniteEx ig1 = startGrid(1); - String port = ig1.localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(); - - assertEquals(EXIT_CODE_OK, execute("--host", "localhost", "--port", port, "--persistence", "backup", "all")); + assertEquals(EXIT_CODE_OK, execute("--host", "localhost", "--port", connectorPort(ig1), + "--persistence", "backup", "all")); Set backedUpCacheDirs = Arrays.stream(mntcNodeWorkDir.listFiles()) .filter(File::isDirectory) @@ -589,9 +586,7 @@ public void testPersistenceBackupCorruptedCachesCommand() throws Exception { IgniteEx ig1 = startGrid(1); - String port = ig1.localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(); - - assertEquals(EXIT_CODE_OK, execute("--host", "localhost", "--port", port, + assertEquals(EXIT_CODE_OK, execute("--host", "localhost", "--port", connectorPort(ig1), "--persistence", "backup", "corrupted")); long backedUpCachesCnt = Arrays.stream(mntcNodeWorkDir.listFiles()) @@ -629,7 +624,7 @@ public void testPersistenceBackupSpecifiedCachesCommand() throws Exception { IgniteEx ig1 = startGrid(1); - String port = ig1.localNode().attribute(IgniteNodeAttributes.ATTR_REST_TCP_PORT).toString(); + String port = connectorPort(ig1);; assertEquals(EXIT_CODE_INVALID_ARGUMENTS, execute("--host", "localhost", "--port", port, "--persistence", "backup", "caches", @@ -776,7 +771,7 @@ public void testDeactivate() throws Exception { assertFalse(ignite.cluster().state().active()); assertEquals(INACTIVE, ignite.cluster().state()); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertContains(log, testOut.toString(), "Command deprecated. Use --set-state instead."); } @@ -904,7 +899,7 @@ private void deactivateWithCheckClusterNameInConfirmation(IgniteEx igniteEx, Str assertEquals(EXIT_CODE_OK, execute("--deactivate")); assertFalse(igniteEx.cluster().state().active()); - if (commandHandler.equals(CLI_CMD_HND)) { + if (cliCommandHandler()) { assertContains( log, testOut.toString(), @@ -1149,7 +1144,7 @@ public void testBaselineCollectCrd() throws Exception { injectTestSystemOut(); - assertEquals(EXIT_CODE_OK, execute("--port", "11212", "--baseline")); + assertEquals(EXIT_CODE_OK, execute("--port", connectorPort(grid(0)), "--baseline")); String crdStr = findCrdInfo(); @@ -1158,7 +1153,7 @@ public void testBaselineCollectCrd() throws Exception { stopGrid(0); - assertEquals(EXIT_CODE_OK, execute("--port", "11212", "--baseline")); + assertEquals(EXIT_CODE_OK, execute("--port", connectorPort(grid(1)), "--baseline")); crdStr = findCrdInfo(); @@ -1167,7 +1162,7 @@ public void testBaselineCollectCrd() throws Exception { startGrid(0); - assertEquals(EXIT_CODE_OK, execute("--port", "11212", "--baseline")); + assertEquals(EXIT_CODE_OK, execute("--port", connectorPort(grid(1)), "--baseline")); crdStr = findCrdInfo(); @@ -1176,7 +1171,7 @@ public void testBaselineCollectCrd() throws Exception { stopGrid(1); - assertEquals(EXIT_CODE_OK, execute("--port", "11211", "--baseline")); + assertEquals(EXIT_CODE_OK, execute("--port", connectorPort(grid(0)), "--baseline")); crdStr = findCrdInfo(); @@ -2086,7 +2081,7 @@ public void testBaselineAddOnNotActiveCluster() throws Exception { assertTrue(testOutStr, testOutStr.contains("Node not found for consistent ID:")); - if (commandHandler.equals(CLI_CMD_HND)) + if (cliCommandHandler()) assertFalse(testOutStr, isInstance1Found); } @@ -2147,7 +2142,7 @@ public void testIdleVerifyCheckCrcFailsOnNotIdleCluster() throws Exception { */ @Test public void testCacheIdleVerifyDumpWhenNodeFailing() throws Exception { - Assume.assumeTrue("CHECKME", CLI_CMD_HND.equalsIgnoreCase(commandHandler)); + Assume.assumeTrue("CHECKME", cliCommandHandler()); Ignite ignite = startGrids(3); @@ -2529,7 +2524,7 @@ public void testDiagnosticPageLocksTracker() throws Exception { ignite.cluster().state(ACTIVE); - if (commandHandler.equals(CLI_CMD_HND)) { + if (cliCommandHandler()) { assertEquals( EXIT_CODE_OK, execute("--diagnostic") @@ -3389,7 +3384,7 @@ public void testSnapshotRestoreSynchronously() throws Exception { // Cache exists. assertEquals(EXIT_CODE_UNEXPECTED_ERROR, execute("--snapshot", "restore", snpName, "--start", "--sync")); - if (commandHandler.equals(CLI_CMD_HND)) { + if (cliCommandHandler()) { assertContains(log, testOut.toString(), "Command option '--start' is redundant and must be avoided."); assertContains(log, testOut.toString(), "Unable to restore cache group - directory is not empty. " + "Cache group should be destroyed manually before perform restore operation [group=" + cacheName); @@ -3399,7 +3394,7 @@ public void testSnapshotRestoreSynchronously() throws Exception { awaitPartitionMapExchange(); assertEquals(EXIT_CODE_OK, execute("--snapshot", "restore", snpName, "--sync")); - if (commandHandler.equals(CLI_CMD_HND)) { + if (cliCommandHandler()) { assertNotContains(log, testOut.toString(), "Command option '--start' is redundant and must be avoided."); assertContains(log, testOut.toString(), "Snapshot cache group restore operation completed successfully"); } @@ -3519,7 +3514,7 @@ public void testSnapshotRestore() throws Exception { else assertEquals(EXIT_CODE_OK, execute(h, "--snapshot", "restore", snpName)); - if (commandHandler.equals(CLI_CMD_HND)) { + if (cliCommandHandler()) { String out = testOut.toString(); assertContains(log, out, "Warning: command will restore ALL USER-CREATED CACHE GROUPS from the snapshot"); assertContains(log, out, "Snapshot cache group restore operation started [name=" + snpName); @@ -3930,7 +3925,7 @@ public void testCleaningGarbageAfterCacheDestroyedAndNodeStop_ControlConsoleUtil */ @Test public void testSuccessStopWarmUp() throws Exception { - Assume.assumeTrue(CLI_CMD_HND.equalsIgnoreCase(commandHandler)); + Assume.assumeTrue(cliCommandHandler()); WarmUpTestPluginProvider provider = new WarmUpTestPluginProvider(); @@ -3970,7 +3965,7 @@ public void testSuccessStopWarmUp() throws Exception { */ @Test public void testFailStopWarmUp() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); startGrid(0); @@ -4028,8 +4023,8 @@ private FindAndDeleteGarbageInPersistenceTaskResult executeTaskViaControlConsole ) { TestCommandHandler hnd = newCommandHandler(); - List args = new ArrayList<>(Arrays.asList("--yes", "--port", "11212", "--cache", "find_garbage", - ignite.localNode().id().toString())); + List args = new ArrayList<>(Arrays.asList("--yes", "--port", connectorPort(ignite), + "--cache", "find_garbage", ignite.localNode().id().toString())); if (delFoundGarbage) args.add("--delete"); diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslFactoryTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslFactoryTest.java index f16e7a886fa8f..0ffc6aae3fd45 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslFactoryTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslFactoryTest.java @@ -49,7 +49,7 @@ public class GridCommandHandlerWithSslFactoryTest extends GridCommandHandlerWith /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); super.beforeTest(); } @@ -63,7 +63,7 @@ public static void tearDown() { /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); super.afterTest(); diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslTest.java index ba3c1467ba8d1..ac3100da60781 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerWithSslTest.java @@ -30,7 +30,7 @@ public class GridCommandHandlerWithSslTest extends GridCommandHandlerTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Assume.assumeTrue(commandHandler.equalsIgnoreCase(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); super.beforeTest(); } diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/KillCommandsControlShTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/KillCommandsControlShTest.java index d57f8f8b15756..26e6ab14dcdd5 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/KillCommandsControlShTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/KillCommandsControlShTest.java @@ -287,7 +287,7 @@ public void testCancelConsistencyTaskSequential() throws InterruptedException { * */ private void testCancelConsistencyTask(boolean parallel) throws InterruptedException { - Assume.assumeTrue(commandHandler.equals(CLI_CMD_HND)); + Assume.assumeTrue(cliCommandHandler()); String consistencyCacheName = "consistencyCache"; diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/MetricCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/MetricCommandTest.java index 3197a041273f0..7450bad6783c4 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/MetricCommandTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/MetricCommandTest.java @@ -471,7 +471,7 @@ private String metric(IgniteEx node, String name) { * @return Metric values. */ private Map parseMetricCommandOutput(String out) { - if (commandHandler.equals(CLI_CMD_HND)) { + if (cliCommandHandler()) { String outStart = "--------------------------------------------------------------------------------"; String outEnd = "Command [METRIC] finished with code: " + EXIT_CODE_OK; diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java index 95a8e79a84fcc..c3c2ed906194b 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/SystemViewCommandTest.java @@ -364,7 +364,7 @@ public void testClientsConnections() throws Exception { IgniteClient ignored1 = Ignition.startClient(new ClientConfiguration().setAddresses(host + ":" + port)); Connection ignored2 = new IgniteJdbcThinDriver().connect("jdbc:ignite:thin://" + host, new Properties()) ) { - assertEquals(2, systemView(ignite0, CLI_CONN_VIEW).size()); + assertEquals(commandHandler.equals(CLI_CMD_HND) ? 3 : 2, systemView(ignite0, CLI_CONN_VIEW).size()); } } @@ -1282,7 +1282,7 @@ private Map>> systemView(Collection nodes, Str * @return System view values. */ private Map>> parseSystemViewCommandOutput(String out) { - if (commandHandler.equals(CLI_CMD_HND)) { + if (cliCommandHandler()) { String outStart = "--------------------------------------------------------------------------------"; String outEnd = "Command [SYSTEM-VIEW] finished with code: " + EXIT_CODE_OK; diff --git a/modules/control-utility/src/test/resources/META-INF/services/org.apache.ignite.util.GridCommandHandlerFactoryAbstractTest$TestCommandHandler b/modules/control-utility/src/test/resources/META-INF/services/org.apache.ignite.util.GridCommandHandlerFactoryAbstractTest$TestCommandHandler index adfad81101539..e9dc47698fe7c 100644 --- a/modules/control-utility/src/test/resources/META-INF/services/org.apache.ignite.util.GridCommandHandlerFactoryAbstractTest$TestCommandHandler +++ b/modules/control-utility/src/test/resources/META-INF/services/org.apache.ignite.util.GridCommandHandlerFactoryAbstractTest$TestCommandHandler @@ -1,2 +1,3 @@ org.apache.ignite.util.GridCommandHandlerFactoryAbstractTest$JmxCommandHandler -org.apache.ignite.util.GridCommandHandlerFactoryAbstractTest$CliCommandHandler \ No newline at end of file +org.apache.ignite.util.GridCommandHandlerFactoryAbstractTest$CliCommandHandler +org.apache.ignite.util.GridCommandHandlerFactoryAbstractTest$CliGridClientCommandHandler \ No newline at end of file diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ThinClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ThinClientConfiguration.java index d84a19695ea47..76ccf01cdb3f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/ThinClientConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/ThinClientConfiguration.java @@ -29,7 +29,7 @@ public class ThinClientConfiguration { public static final int DFLT_MAX_ACTIVE_TX_PER_CONNECTION = 100; /** Default limit of active compute tasks per connection. */ - public static final int DFLT_MAX_ACTIVE_COMPUTE_TASKS_PER_CONNECTION = 0; + public static final int DFLT_MAX_ACTIVE_COMPUTE_TASKS_PER_CONNECTION = 10; /** Active transactions count per connection limit. */ private int maxActiveTxPerConn = DFLT_MAX_ACTIVE_TX_PER_CONNECTION; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/ActivateCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/ActivateCommand.java index f87aa812085b1..8442afcd8cef7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/ActivateCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/ActivateCommand.java @@ -19,6 +19,7 @@ import java.util.function.Consumer; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientClusterState; import org.apache.ignite.internal.client.GridClientException; @@ -44,6 +45,7 @@ public class ActivateCommand implements LocalCommand { /** {@inheritDoc} */ @Override public NoArg execute( @Nullable GridClient cli, + @Nullable IgniteClient client, @Nullable Ignite ignite, NoArg arg, Consumer printer @@ -53,6 +55,8 @@ public class ActivateCommand implements LocalCommand { state.state(ACTIVE, false); } + else if (client != null) + client.cluster().state(ACTIVE); else ignite.cluster().state(ACTIVE); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommand.java index 24e7c9c3ef83c..59d69bafad4d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommand.java @@ -17,16 +17,23 @@ package org.apache.ignite.internal.management; +import java.util.Collections; import java.util.function.Consumer; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientClusterState; import org.apache.ignite.internal.client.GridClientException; +import org.apache.ignite.internal.client.GridClientNode; import org.apache.ignite.internal.cluster.IgniteClusterEx; +import org.apache.ignite.internal.management.api.CommandUtils; import org.apache.ignite.internal.management.api.LocalCommand; import org.apache.ignite.internal.management.api.NoArg; import org.apache.ignite.internal.management.api.PreparableCommand; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.visor.misc.VisorIdAndTagViewTask; +import org.apache.ignite.internal.visor.misc.VisorIdAndTagViewTaskResult; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.cluster.ClusterState.INACTIVE; @@ -52,6 +59,7 @@ public class DeactivateCommand implements LocalCommand printer @@ -61,6 +69,8 @@ public class DeactivateCommand implements LocalCommand printer - ) throws GridClientException { - arg.clusterName(cli != null ? cli.state().clusterName() : ((IgniteEx)ignite).context().cluster().clusterName()); + ) throws Exception { + String clusterName; + + if (cli != null) + clusterName = cli.state().clusterName(); + else if (ignite != null) + clusterName = ((IgniteEx)ignite).context().cluster().clusterName(); + else { + GridClientNode node = F.first(CommandUtils.nodes(cli, client, ignite)); + + VisorIdAndTagViewTaskResult idAndTag = CommandUtils.execute(cli, client, ignite, + VisorIdAndTagViewTask.class, null, Collections.singleton(node)); + + clusterName = idAndTag.clusterName(); + } + + arg.clusterName(clusterName); return true; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommand.java index f6ee5994cbd49..bbfaec323fe05 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommand.java @@ -19,6 +19,7 @@ import java.util.function.Consumer; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.cluster.ClusterState; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientException; @@ -41,11 +42,14 @@ public class SetStateCommand implements LocalCommand printer ) throws GridClientException { - ClusterState clusterState = cli != null ? cli.state().state() : ignite.cluster().state(); + ClusterState clusterState = cli != null ? cli.state().state() : + client != null ? client.cluster().state() : + ignite.cluster().state(); if (clusterState == arg.state()) { printer.accept("Cluster state is already " + arg.state() + '.'); @@ -55,8 +59,10 @@ public class SetStateCommand implements LocalCommand execute( @Nullable GridClient cli, + @Nullable IgniteClient client, @Nullable Ignite ignite, NoArg arg, Consumer printer @@ -61,6 +67,14 @@ public class StateCommand implements LocalCommand } /** {@inheritDoc} */ - @Override public Boolean execute(GridClientBeforeNodeStart cli, NoArg arg, Consumer printer) throws Exception { - cli.beforeStartState().stopWarmUp(); + @Override public Boolean execute(GridClientNodeStateBeforeStart beforeStart, NoArg arg, Consumer printer) throws Exception { + beforeStart.stopWarmUp(); return true; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/api/BeforeNodeStartCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/api/BeforeNodeStartCommand.java index 9419acdcf317f..1018ad06d0e5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/api/BeforeNodeStartCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/api/BeforeNodeStartCommand.java @@ -19,6 +19,7 @@ import java.util.function.Consumer; import org.apache.ignite.internal.client.GridClientBeforeNodeStart; +import org.apache.ignite.internal.client.GridClientNodeStateBeforeStart; import org.apache.ignite.internal.dto.IgniteDataTransferObject; /** @@ -26,10 +27,10 @@ */ public interface BeforeNodeStartCommand extends Command { /** - * @param cli Grid client instance. + * @param beforeStart {@link GridClientBeforeNodeStart} client instance. * @param arg Command argument. * @param printer Results printer. * @return Command result. */ - public R execute(GridClientBeforeNodeStart cli, A arg, Consumer printer) throws Exception; + public R execute(GridClientNodeStateBeforeStart beforeStart, A arg, Consumer printer) throws Exception; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandInvoker.java b/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandInvoker.java index 250db201128f5..1c7f54176fe58 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandInvoker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandInvoker.java @@ -19,6 +19,7 @@ import java.util.Collection; import java.util.function.Consumer; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientException; @@ -57,11 +58,11 @@ public CommandInvoker(Command cmd, A arg, @Nullable IgniteEx ignite) { * @return {@code True} of command successfully prepared and can be invoked, {@code false} otherwise. * @throws GridClientException If failed. */ - public boolean prepare(Consumer printer) throws GridClientException { + public boolean prepare(Consumer printer) throws Exception { if (!(cmd instanceof PreparableCommand)) return true; - return ((PreparableCommand)cmd).prepare(client(), ignite, arg, printer); + return ((PreparableCommand)cmd).prepare(gridClient(), client(), ignite, arg, printer); } /** @@ -76,18 +77,23 @@ public R invoke(Consumer printer, boolean verbose) throws Exception R res; if (cmd instanceof LocalCommand) - res = ((LocalCommand)cmd).execute(client(), ignite, arg, printer); + res = ((LocalCommand)cmd).execute(gridClient(), client(), ignite, arg, printer); else if (cmd instanceof ComputeCommand) { ComputeCommand cmd = (ComputeCommand)this.cmd; - Collection cmdNodes = cmd.nodes(CommandUtils.nodes(client(), ignite), arg); + Collection cmdNodes = cmd.nodes(CommandUtils.nodes(gridClient(), client(), ignite), arg); if (cmdNodes == null) cmdNodes = singletonList(defaultNode()); - res = CommandUtils.execute(client(), ignite, cmd.taskClass(), arg, cmdNodes); + try { + res = CommandUtils.execute(gridClient(), client(), ignite, cmd.taskClass(), arg, cmdNodes); - cmd.printResult(arg, res, printer); + cmd.printResult(arg, res, printer); + } + catch (Exception e) { + res = cmd.handleException(e); + } } else throw new IllegalArgumentException("Unknown command type: " + cmd); @@ -100,11 +106,13 @@ protected GridClientNode defaultNode() throws GridClientException { return CommandUtils.clusterToClientNode(ignite.localNode()); } - /** - * @return Grid thin client instance which is already connected to cluster. - * @throws GridClientException If failed. - */ - protected @Nullable GridClient client() throws GridClientException { + /** @return Grid thin client instance which is already connected to cluster. */ + protected @Nullable GridClient gridClient() { + return null; + } + + /** @return Ignite client instance. */ + protected @Nullable IgniteClient client() { return null; } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java index e4f3ed4fb0d0b..c0af3646e147f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/api/CommandUtils.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteException; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientCacheMode; @@ -550,13 +551,18 @@ public static boolean executable(Command cmd) { * @param ignite Ignite node. * @return Collection of cluster nodes. */ - public static Collection nodes(@Nullable GridClient cli, @Nullable Ignite ignite) throws GridClientException { + public static Collection nodes( + @Nullable GridClient cli, + @Nullable IgniteClient client, + @Nullable Ignite ignite + ) throws GridClientException { if (cli != null) return cli.compute().nodes(); - return ignite.cluster().nodes().stream() - .map(CommandUtils::clusterToClientNode) - .collect(Collectors.toList()); + if (client != null) + return F.viewReadOnly(client.cluster().nodes(), CommandUtils::clusterToClientNode); + + return F.viewReadOnly(ignite.cluster().nodes(), CommandUtils::clusterToClientNode); } /** @@ -764,6 +770,7 @@ public static A argument( /** */ public static R execute( @Nullable GridClient cli, + @Nullable IgniteClient client, @Nullable Ignite ignite, Class> taskCls, A arg, @@ -790,6 +797,19 @@ public static R execute( )).result(); } + if (client != null) { + try { + return client.compute(client.cluster().forNodes(client.cluster().nodes())) + ., VisorTaskResult>execute( + taskCls.getName(), + new VisorTaskArgument<>(nodesIds, arg, false) + ).result(); + } + catch (InterruptedException e) { + throw new IgniteException(e); + } + } + return ignite .compute(ignite.cluster()) .execute(taskCls, new VisorTaskArgument<>(nodesIds, arg, false)) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/api/ComputeCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/api/ComputeCommand.java index b773bfd3f4b40..47477b6170d9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/api/ComputeCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/api/ComputeCommand.java @@ -49,4 +49,12 @@ public default void printResult(A arg, R res, Consumer printer) { public default @Nullable Collection nodes(Collection nodes, A arg) { return null; } + + /** + * @param e Task execution exception to handle. + * @return Result if the exception is suppressed. + */ + default R handleException(Exception e) throws Exception { + throw e; + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/api/LocalCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/api/LocalCommand.java index a878708fa72f9..42dca47fde0e1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/api/LocalCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/api/LocalCommand.java @@ -19,6 +19,7 @@ import java.util.function.Consumer; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.jetbrains.annotations.Nullable; @@ -43,5 +44,11 @@ public interface LocalCommand extends Com * @param printer Results printer. * @return Command result. */ - R execute(@Nullable GridClient cli, @Nullable Ignite ignite, A arg, Consumer printer) throws Exception; + public R execute( + @Nullable GridClient cli, + @Nullable IgniteClient client, + @Nullable Ignite ignite, + A arg, + Consumer printer + ) throws Exception; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/api/PreparableCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/api/PreparableCommand.java index 14ff4d0e8c4e6..9fc7855782f61 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/api/PreparableCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/api/PreparableCommand.java @@ -19,8 +19,8 @@ import java.util.function.Consumer; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.internal.client.GridClient; -import org.apache.ignite.internal.client.GridClientException; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.jetbrains.annotations.Nullable; @@ -34,5 +34,11 @@ public interface PreparableCommand extend * @param printer Implementation specific printer. * @return {@code True} if command must be executed, {@code false} otherwise. */ - public boolean prepare(@Nullable GridClient cli, @Nullable Ignite ignite, A arg, Consumer printer) throws GridClientException; + public boolean prepare( + @Nullable GridClient cli, + @Nullable IgniteClient client, + @Nullable Ignite ignite, + A arg, + Consumer printer + ) throws Exception; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommand.java index 6853adc80a995..55ac4dacda086 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommand.java @@ -22,6 +22,7 @@ import java.util.TreeSet; import java.util.function.Consumer; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientException; import org.apache.ignite.internal.client.GridClientNode; @@ -53,6 +54,7 @@ public class CacheDestroyCommand /** {@inheritDoc} */ @Override public boolean prepare( @Nullable GridClient cli, + @Nullable IgniteClient client, @Nullable Ignite ignite, CacheDestroyCommandArg arg, Consumer printer @@ -64,6 +66,8 @@ public class CacheDestroyCommand for (GridClientNode node : cli.compute().nodes(GridClientNode::connectable)) caches.addAll(node.caches().keySet()); } + else if (client != null) + caches.addAll(client.cacheNames()); else caches.addAll(ignite.cacheNames()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommand.java index 3cff6b84c3ace..ef537435c87ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommand.java @@ -27,6 +27,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientNode; import org.apache.ignite.internal.management.api.CommandUtils; @@ -60,6 +61,7 @@ public class CacheListCommand implements LocalCommand printer @@ -68,7 +70,7 @@ public class CacheListCommand implements LocalCommand node = nodes(cli, ignite) + Optional node = nodes(cli, client, ignite) .stream() .filter(FILTER.apply(arg)) .findFirst(); @@ -76,10 +78,11 @@ public class CacheListCommand implements LocalCommand future; - - /** Job result: metadata info for removed type (used for job continuation). */ - private transient MetadataMarshalled res; - /** * @param arg Argument. * @param debug Debug. @@ -100,38 +82,21 @@ protected MetadataRemoveJob(@Nullable MetaRemoveCommandArg arg, boolean debug) { /** {@inheritDoc} */ @Override protected MetadataMarshalled run(@Nullable MetaRemoveCommandArg arg) throws IgniteException { try { - if (future == null) { - assert Objects.nonNull(arg); - - int typeId = typeId(ignite.context(), arg.typeId(), arg.typeName()); - - BinaryMetadata meta = ((CacheObjectBinaryProcessorImpl)ignite.context().cacheObjects()) - .binaryMetadata(typeId); + assert Objects.nonNull(arg); - if (meta == null) - return new MetadataMarshalled(null, null); + int typeId = typeId(ignite.context(), arg.typeId(), arg.typeName()); - byte[] marshalled = U.marshal(ignite.context(), meta); + BinaryMetadata meta = ((CacheObjectBinaryProcessorImpl)ignite.context().cacheObjects()) + .binaryMetadata(typeId); - res = new MetadataMarshalled(marshalled, meta); + if (meta == null) + return new MetadataMarshalled(null, null); - ignite.context().cacheObjects().removeType(typeId); + byte[] marshalled = U.marshal(ignite.context(), meta); - future = ignite.context().closure().runAsync( - BROADCAST, - new DropAllThinSessionsJob(), - options(ignite.cluster().forServers().nodes()) - ); + MetadataMarshalled res = new MetadataMarshalled(marshalled, meta); - jobCtx.holdcc(); - - future.listen(() -> { - if (future.isDone()) - jobCtx.callcc(); - }); - - return null; - } + ignite.context().cacheObjects().removeType(typeId); return res; } @@ -140,22 +105,4 @@ protected MetadataRemoveJob(@Nullable MetaRemoveCommandArg arg, boolean debug) { } } } - - /** - * Job to drop all thin session. - */ - @GridInternal - private static class DropAllThinSessionsJob implements IgniteRunnable { - /** */ - private static final long serialVersionUID = 0L; - - /** Grid */ - @IgniteInstanceResource - private IgniteEx ignite; - - /** {@inheritDoc} */ - @Override public void run() throws IgniteException { - ignite.context().clientListener().closeAllSessions(); - } - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommand.java index 6823cda9b7bb2..46b1a00df090f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommand.java @@ -25,6 +25,7 @@ import java.util.Set; import java.util.function.Consumer; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientNode; @@ -54,13 +55,14 @@ public class TxInfoCommand implements LocalCommand execute( @Nullable GridClient cli, + @Nullable IgniteClient client, @Nullable Ignite ignite, AbstractTxCommandArg arg0, Consumer printer ) throws Exception { TxInfoCommandArg arg = (TxInfoCommandArg)arg0; - Optional node = CommandUtils.nodes(cli, ignite).stream() + Optional node = CommandUtils.nodes(cli, client, ignite).stream() .filter(n -> !n.isClient()) .filter(GridClientNode::connectable) .findFirst(); @@ -70,6 +72,7 @@ public class TxInfoCommand implements LocalCommand res = CommandUtils.execute( cli, + client, ignite, TxTask.class, arg, diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index dd494991b956a..2135779c3c8d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -5752,6 +5752,9 @@ else if (start && log.isInfoEnabled()) * @throws IgniteCheckedException If there is an error when stopping warm-up. */ public boolean stopWarmUp() throws IgniteCheckedException { + if (!ctx.recoveryMode()) + throw new IgniteException("Node has already started."); + if (recovery.stopWarmUp.compareAndSet(false, true)) { WarmUpStrategy strat = recovery.curWarmUpStrat; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java index 1a8768d75dae6..0e2819b35016b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java @@ -64,7 +64,7 @@ private static class IdAndTagViewJob extends VisorJob action, ClusterState stateTo) { - Class cause = SecurityException.class; String errMsg = "Authorization failed [perm=" + ADMIN_CLUSTER_STATE; + Class cause; - if (Initiator.THIN_CLIENT == initiator) { - cause = ClientAuthorizationException.class; - errMsg = "User is not authorized to perform this operation"; - } + if (Initiator.THIN_CLIENT == initiator) + cause = ClientException.class; else if (Initiator.REMOTE_CONTROL == initiator) cause = GridClientException.class; + else + cause = SecurityException.class; assertThrowsAnyCause( null, diff --git a/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassTest_cache_help.output b/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassTest_cache_help.output index ff0a15de65086..afcb1c5d1dc5d 100644 --- a/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassTest_cache_help.output +++ b/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassTest_cache_help.output @@ -2,9 +2,6 @@ Control utility [ver. User: Time: -Command [CACHE] started -Arguments: --cache help --yes --------------------------------------------------------------------------------- The '--cache subcommand' is used to get information about and perform actions with caches. The command has the following syntax: control.(sh|bat) [--host HOST_OR_IP] [--port PORT] [--user USER] [--password PASSWORD] [--ping-interval PING_INTERVAL] [--ping-timeout PING_TIMEOUT] [--verbose] [--ssl-protocol SSL_PROTOCOL[, SSL_PROTOCOL_2, ..., SSL_PROTOCOL_N]] [--ssl-cipher-suites SSL_CIPHER_1[, SSL_CIPHER_2, ..., SSL_CIPHER_N]] [--ssl-key-algorithm SSL_KEY_ALGORITHM] [--ssl-factory SSL_FACTORY_PATH] [--keystore-type KEYSTORE_TYPE] [--keystore KEYSTORE_PATH] [--keystore-password KEYSTORE_PASSWORD] [--truststore-type TRUSTSTORE_TYPE] [--truststore TRUSTSTORE_PATH] [--truststore-password TRUSTSTORE_PASSWORD] [--enable-experimental] --cache [subcommand] @@ -148,6 +145,5 @@ Arguments: --cache help --yes --output-format table - Pluggable output format. 'default', 'table' exists by default. --limit N - limit count of entries to scan (1000 by default). -Command [CACHE] finished with code: 0 Control utility has completed execution at: Execution time: diff --git a/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassTest_help.output b/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassTest_help.output index 6be8a41e0e9bc..3533fd4d95b79 100644 --- a/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassTest_help.output +++ b/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassTest_help.output @@ -469,7 +469,7 @@ Use --yes option to disable it. Default values: HOST_OR_IP=127.0.0.1 - PORT=11211 + PORT=10800 PING_INTERVAL=5000 PING_TIMEOUT=30000 SSL_PROTOCOL=TLS diff --git a/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassWithSSLTest_cache_help.output b/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassWithSSLTest_cache_help.output index ff0a15de65086..afcb1c5d1dc5d 100644 --- a/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassWithSSLTest_cache_help.output +++ b/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassWithSSLTest_cache_help.output @@ -2,9 +2,6 @@ Control utility [ver. User: Time: -Command [CACHE] started -Arguments: --cache help --yes --------------------------------------------------------------------------------- The '--cache subcommand' is used to get information about and perform actions with caches. The command has the following syntax: control.(sh|bat) [--host HOST_OR_IP] [--port PORT] [--user USER] [--password PASSWORD] [--ping-interval PING_INTERVAL] [--ping-timeout PING_TIMEOUT] [--verbose] [--ssl-protocol SSL_PROTOCOL[, SSL_PROTOCOL_2, ..., SSL_PROTOCOL_N]] [--ssl-cipher-suites SSL_CIPHER_1[, SSL_CIPHER_2, ..., SSL_CIPHER_N]] [--ssl-key-algorithm SSL_KEY_ALGORITHM] [--ssl-factory SSL_FACTORY_PATH] [--keystore-type KEYSTORE_TYPE] [--keystore KEYSTORE_PATH] [--keystore-password KEYSTORE_PASSWORD] [--truststore-type TRUSTSTORE_TYPE] [--truststore TRUSTSTORE_PATH] [--truststore-password TRUSTSTORE_PASSWORD] [--enable-experimental] --cache [subcommand] @@ -148,6 +145,5 @@ Arguments: --cache help --yes --output-format table - Pluggable output format. 'default', 'table' exists by default. --limit N - limit count of entries to scan (1000 by default). -Command [CACHE] finished with code: 0 Control utility has completed execution at: Execution time: diff --git a/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassWithSSLTest_help.output b/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassWithSSLTest_help.output index 15ea52c27ceff..3a0c4a683e6fa 100644 --- a/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassWithSSLTest_help.output +++ b/modules/core/src/test/resources/org.apache.ignite.util/GridCommandHandlerClusterByClassWithSSLTest_help.output @@ -469,7 +469,7 @@ Use --yes option to disable it. Default values: HOST_OR_IP=127.0.0.1 - PORT=11211 + PORT=10800 PING_INTERVAL=5000 PING_TIMEOUT=30000 SSL_PROTOCOL=TLS diff --git a/modules/extdata/pluggable/src/test/java/org/apache/ignite/internal/commandline/CommandsProviderExtImpl.java b/modules/extdata/pluggable/src/test/java/org/apache/ignite/internal/commandline/CommandsProviderExtImpl.java index f47659b6e1a03..b0372d34d97a3 100644 --- a/modules/extdata/pluggable/src/test/java/org/apache/ignite/internal/commandline/CommandsProviderExtImpl.java +++ b/modules/extdata/pluggable/src/test/java/org/apache/ignite/internal/commandline/CommandsProviderExtImpl.java @@ -24,12 +24,14 @@ import java.util.Collections; import java.util.function.Consumer; import org.apache.ignite.Ignite; +import org.apache.ignite.client.IgniteClient; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.Command; import org.apache.ignite.internal.management.api.LocalCommand; import org.apache.ignite.internal.util.typedef.internal.U; +import org.jetbrains.annotations.Nullable; /** * Additional commands provider for control utility. @@ -65,7 +67,8 @@ public static class TestCommandCommand implements LocalCommand printer) { + @Override public Void execute(@Nullable GridClient cli, @Nullable IgniteClient client, @Nullable Ignite ignite, + TestCommandCommandArg arg, Consumer printer) { printer.accept(TEST_COMMAND_OUTPUT + ": " + arg.testPrint); return null;