alex-plekhanov commented on a change in pull request #8242: URL: https://github.com/apache/ignite/pull/8242#discussion_r528683041
########## File path: modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/ReencryptionRateCommand.java ########## @@ -0,0 +1,168 @@ +/* + * 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.encryption; + +import java.util.Map; +import java.util.UUID; +import java.util.logging.Logger; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.commandline.AbstractCommand; +import org.apache.ignite.internal.commandline.Command; +import org.apache.ignite.internal.commandline.CommandArgIterator; +import org.apache.ignite.internal.commandline.CommandLogger; +import org.apache.ignite.internal.commandline.argument.CommandArg; +import org.apache.ignite.internal.commandline.argument.CommandArgUtils; +import org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskResult; +import org.apache.ignite.internal.visor.encryption.VisorReencryptionRateTask; +import org.apache.ignite.internal.visor.encryption.VisorReencryptionRateTaskArg; + +import static java.util.Collections.singletonMap; +import static org.apache.ignite.internal.commandline.CommandList.ENCRYPTION; +import static org.apache.ignite.internal.commandline.CommandLogger.DOUBLE_INDENT; +import static org.apache.ignite.internal.commandline.CommandLogger.INDENT; +import static org.apache.ignite.internal.commandline.CommandLogger.optional; +import static org.apache.ignite.internal.commandline.TaskExecutor.BROADCAST_UUID; +import static org.apache.ignite.internal.commandline.TaskExecutor.executeTaskByNameOnNode; +import static org.apache.ignite.internal.commandline.encryption.EncryptionSubcommands.REENCRYPTION_RATE; + +/** + * View/change cache group re-encryption rate limit subcommand. + */ +public class ReencryptionRateCommand extends AbstractCommand<VisorReencryptionRateTaskArg> { Review comment: The syntax of this command is confusing. Someone can think that `--encryption reencryption_rate` will show current reencryption speed, but not the rate limit. Perhaps, subcommand should be named `reencryption_rate_limit` ########## File path: modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/ReencryptionRateCommand.java ########## @@ -0,0 +1,168 @@ +/* + * 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.encryption; + +import java.util.Map; +import java.util.UUID; +import java.util.logging.Logger; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.commandline.AbstractCommand; +import org.apache.ignite.internal.commandline.Command; +import org.apache.ignite.internal.commandline.CommandArgIterator; +import org.apache.ignite.internal.commandline.CommandLogger; +import org.apache.ignite.internal.commandline.argument.CommandArg; +import org.apache.ignite.internal.commandline.argument.CommandArgUtils; +import org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskResult; +import org.apache.ignite.internal.visor.encryption.VisorReencryptionRateTask; +import org.apache.ignite.internal.visor.encryption.VisorReencryptionRateTaskArg; + +import static java.util.Collections.singletonMap; +import static org.apache.ignite.internal.commandline.CommandList.ENCRYPTION; +import static org.apache.ignite.internal.commandline.CommandLogger.DOUBLE_INDENT; +import static org.apache.ignite.internal.commandline.CommandLogger.INDENT; +import static org.apache.ignite.internal.commandline.CommandLogger.optional; +import static org.apache.ignite.internal.commandline.TaskExecutor.BROADCAST_UUID; +import static org.apache.ignite.internal.commandline.TaskExecutor.executeTaskByNameOnNode; +import static org.apache.ignite.internal.commandline.encryption.EncryptionSubcommands.REENCRYPTION_RATE; + +/** + * View/change cache group re-encryption rate limit subcommand. + */ +public class ReencryptionRateCommand extends AbstractCommand<VisorReencryptionRateTaskArg> { + /** Re-encryption rate task argument. */ + private VisorReencryptionRateTaskArg taskArg; + + /** {@inheritDoc} */ + @Override public Object execute(GridClientConfiguration clientCfg, Logger log) throws Exception { + try (GridClient client = Command.startClient(clientCfg)) { + VisorCacheGroupEncryptionTaskResult<Double> res = executeTaskByNameOnNode( + client, + VisorReencryptionRateTask.class.getName(), + taskArg, + BROADCAST_UUID, + clientCfg + ); + + boolean read = taskArg.rate() == null; + + Map<UUID, IgniteException> exceptions = res.exceptions(); + + for (Map.Entry<UUID, IgniteException> entry : exceptions.entrySet()) { + log.info(INDENT + "Node " + entry.getKey() + ":"); + log.info(String.format("%sfailed to %s re-encryption rate: %s.", Review comment: Something like 'failed to get/set re-encryption rate limit' ########## File path: modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/ChangeCacheGroupKeyCommand.java ########## @@ -0,0 +1,95 @@ +/* + * 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.encryption; + +import java.util.logging.Logger; +import org.apache.ignite.internal.client.GridClient; +import org.apache.ignite.internal.client.GridClientConfiguration; +import org.apache.ignite.internal.commandline.AbstractCommand; +import org.apache.ignite.internal.commandline.Command; +import org.apache.ignite.internal.commandline.CommandArgIterator; +import org.apache.ignite.internal.commandline.CommandLogger; +import org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskArg; +import org.apache.ignite.internal.visor.encryption.VisorChangeCacheGroupKeyTask; + +import static org.apache.ignite.internal.commandline.CommandList.ENCRYPTION; +import static org.apache.ignite.internal.commandline.TaskExecutor.executeTaskByNameOnNode; +import static org.apache.ignite.internal.commandline.encryption.EncryptionSubcommands.CHANGE_CACHE_GROUP_KEY; + +/** + * Change cache group key encryption subcommand. + */ +public class ChangeCacheGroupKeyCommand extends AbstractCommand<VisorCacheGroupEncryptionTaskArg> { Review comment: It also can extend `CacheGroupEncryptionCommand` ########## File path: modules/core/src/main/java/org/apache/ignite/internal/visor/encryption/VisorCacheGroupEncryptionTaskResult.java ########## @@ -0,0 +1,96 @@ +/* + * 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.visor.encryption; + +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.dto.IgniteDataTransferObject; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; + +/** + * Multinode cache group encryption task result. + * + * @param <T> Job result type. + */ +@SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType") +public class VisorCacheGroupEncryptionTaskResult<T> extends IgniteDataTransferObject { + /** */ + private static final long serialVersionUID = 0L; + + /** Per node job result. */ + @GridToStringInclude + private Map<UUID, T> results; + + /** Per node execution problems. */ + @GridToStringInclude + private Map<UUID, IgniteException> exceptions; + + /** + * @param results Per node job result. + * @param exceptions Per node execution problems. + */ + public VisorCacheGroupEncryptionTaskResult(Map<UUID, T> results, Map<UUID, IgniteException> exceptions) { + this.results = results; + this.exceptions = exceptions; + } + + /** */ + public VisorCacheGroupEncryptionTaskResult() { + // No-op. + } + + /** @return Per node job result. */ + public Map<UUID, T> results() { + if (results == null) + results = new HashMap<>(); Review comment: `return results == null ? Collections.emptyMap() : results;`? The same for `exceptions()` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
