You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ignite.apache.org by GitBox <gi...@apache.org> on 2020/09/11 11:47:14 UTC

[GitHub] [ignite] xtern opened a new pull request #8242: IGNITE-13320

xtern opened a new pull request #8242:
URL: https://github.com/apache/ignite/pull/8242


   Thank you for submitting the pull request to the Apache Ignite.
   
   In order to streamline the review of the contribution 
   we ask you to ensure the following steps have been taken:
   
   ### The Contribution Checklist
   - [ ] There is a single JIRA ticket related to the pull request. 
   - [ ] The web-link to the pull request is attached to the JIRA ticket.
   - [ ] The JIRA ticket has the _Patch Available_ state.
   - [ ] The pull request body describes changes that have been made. 
   The description explains _WHAT_ and _WHY_ was made instead of _HOW_.
   - [ ] The pull request title is treated as the final commit message. 
   The following pattern must be used: `IGNITE-XXXX Change summary` where `XXXX` - number of JIRA issue.
   - [ ] A reviewer has been mentioned through the JIRA comments 
   (see [the Maintainers list](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute#HowtoContribute-ReviewProcessandMaintainers)) 
   - [ ] The pull request has been checked by the Teamcity Bot and 
   the `green visa` attached to the JIRA ticket (see [TC.Bot: Check PR](https://mtcga.gridgain.com/prs.html))
   
   ### Notes
   - [How to Contribute](https://cwiki.apache.org/confluence/display/IGNITE/How+to+Contribute)
   - [Coding abbreviation rules](https://cwiki.apache.org/confluence/display/IGNITE/Abbreviation+Rules)
   - [Coding Guidelines](https://cwiki.apache.org/confluence/display/IGNITE/Coding+Guidelines)
   - [Apache Ignite Teamcity Bot](https://cwiki.apache.org/confluence/display/IGNITE/Apache+Ignite+Teamcity+Bot)
   
   If you need any help, please email dev@ignite.apache.org or ask anу advice on http://asf.slack.com _#ignite_ channel.
   


----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] alex-plekhanov commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
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:
users@infra.apache.org



[GitHub] [ignite] ololo3000 commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
ololo3000 commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r515658293



##########
File path: modules/core/src/main/java/org/apache/ignite/internal/managers/encryption/CacheGroupPageScanner.java
##########
@@ -210,21 +210,26 @@ public CacheGroupPageScanner(GridKernalContext ctx) {
             }
 
             Set<Integer> parts = new HashSet<>();
+            long[] pagesLeft = new long[1];

Review comment:
       Why do we need an array here?




----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] xtern commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
xtern commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r532404152



##########
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:
       Done, thanks

##########
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:
       Done, thanks




----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] xtern commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
xtern commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r532403860



##########
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:
       renamed to "reencryption_rate_limit"




----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] ololo3000 commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
ololo3000 commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r517879099



##########
File path: modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/CacheGroupEncryptionCommand.java
##########
@@ -0,0 +1,258 @@
+/*
+ * 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.List;
+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.CommandList;
+import org.apache.ignite.internal.commandline.CommandLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskArg;
+import org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskResult;
+import org.apache.ignite.internal.visor.encryption.VisorEncryptionKeyIdsTask;
+import org.apache.ignite.internal.visor.encryption.VisorReencryptionResumeTask;
+import org.apache.ignite.internal.visor.encryption.VisorReencryptionStatusTask;
+import org.apache.ignite.internal.visor.encryption.VisorReencryptionSuspendTask;
+
+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.TaskExecutor.BROADCAST_UUID;
+import static org.apache.ignite.internal.commandline.TaskExecutor.executeTaskByNameOnNode;
+import static org.apache.ignite.internal.commandline.encryption.EncryptionSubcommands.CACHE_GROUP_KEY_IDS;
+
+/**
+ * Base cache group encryption multinode subcommand.
+ *
+ * @param <T> Command result type.
+ * @param <S> Multinode task result.
+ */
+public abstract class CacheGroupEncryptionCommand<T, S extends VisorCacheGroupEncryptionTaskResult<T>>
+    extends AbstractCommand<VisorCacheGroupEncryptionTaskArg> {
+    /** Cache group reencryption task argument. */
+    private VisorCacheGroupEncryptionTaskArg taskArg;
+
+    /** {@inheritDoc} */
+    @Override public VisorCacheGroupEncryptionTaskArg arg() {
+        return taskArg;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void parseArguments(CommandArgIterator argIter) {
+        String grpName = argIter.nextArg("Сache group name is expected.");
+
+        if (argIter.hasNextSubArg())
+            throw new IllegalArgumentException("Unexpected command argument: " + argIter.peekNextArg());
+
+        taskArg = new VisorCacheGroupEncryptionTaskArg(grpName);
+    }
+
+    /** {@inheritDoc} */
+    @Override public Object execute(GridClientConfiguration clientCfg, Logger log) throws Exception {
+        try (GridClient client = Command.startClient(clientCfg)) {
+            S res = executeTaskByNameOnNode(
+                client,
+                visorTaskName(),
+                taskArg,
+                BROADCAST_UUID,
+                clientCfg
+            );
+
+            printResults(res, taskArg.groupName(), log);
+
+            return res;
+        }
+        catch (Throwable e) {
+            log.severe("Failed to perform operation.");
+            log.severe(CommandLogger.errorMessage(e));
+
+            throw e;
+        }
+    }
+
+    /**
+     * @param res Response.
+     * @param grpName Cache group name.
+     * @param log Logger.
+     */
+    protected void printResults(S res, String grpName, Logger log) {
+        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 execute command for the cache group \"%s\": %s.",
+                DOUBLE_INDENT, grpName, entry.getValue().getMessage()));
+        }
+
+        Map<UUID, T> results = res.results();
+
+        for (Map.Entry<UUID, T> entry : results.entrySet()) {
+            log.info(INDENT + "Node " + entry.getKey() + ":");
+
+            printNodeResult(entry.getValue(), grpName, log);
+        }
+    }
+
+    /**
+     * @param res Response.
+     * @param grpName Cache group name.
+     * @param log Logger.
+     */
+    protected abstract void printNodeResult(T res, String grpName, Logger log);
+
+    /**
+     * @return Visor task name.
+     */
+    protected abstract String visorTaskName();
+
+    /** Subcommand to Display re-encryption status of the cache group. */
+    protected static class ReencryptionStatus extends
+        CacheGroupEncryptionCommand<Long, VisorCacheGroupEncryptionTaskResult<Long>> {
+        /** {@inheritDoc} */
+        @Override protected void printNodeResult(Long bytesLeft, String grpName, Logger log) {
+            if (bytesLeft == -1)
+                log.info(DOUBLE_INDENT + "re-encryption completed or not required");
+            else

Review comment:
       New line is redundant.




----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] alex-plekhanov commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
alex-plekhanov commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r535903057



##########
File path: modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/ReencryptionRateCommand.java
##########
@@ -104,22 +102,13 @@
         Double rateLimit = null;
 
         while (argIter.hasNextSubArg()) {
-            String arg = argIter.nextArg("Failed to read command argument.");
+            String rateLimitArg = argIter.nextArg("Expected decimal value for re-encryption rate.");
 
-            ReencryptionRateCommandArg cmdArg = CommandArgUtils.of(arg, ReencryptionRateCommandArg.class);
-
-            if (cmdArg == ReencryptionRateCommandArg.LIMIT) {
-                String rateLimitArg = argIter.nextArg("Expected decimal value for re-encryption rate.");
-
-                try {
-                    rateLimit = Double.parseDouble(rateLimitArg);
-                } catch (NumberFormatException e) {
-                    throw new IllegalArgumentException("Failed to parse " + ReencryptionRateCommandArg.LIMIT +
-                        " command argument. Decimal value expected.", e);
-                }
+            try {
+                rateLimit = Double.parseDouble(rateLimitArg);
+            } catch (NumberFormatException e) {

Review comment:
       NL between `}` and `catch`




----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] xtern commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
xtern commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r532405125



##########
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:
       The CacheGroupEncryptionCommand has been implemented for multinode re-encryption tasks, ChangeCacheGroupKeyCommand is executed on a single server node.




----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] xtern commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
xtern commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r532404193



##########
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:
       Done, thanks for noticing.




----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] xtern commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
xtern commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r517926171



##########
File path: modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/CacheGroupEncryptionCommand.java
##########
@@ -0,0 +1,258 @@
+/*
+ * 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.List;
+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.CommandList;
+import org.apache.ignite.internal.commandline.CommandLogger;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskArg;
+import org.apache.ignite.internal.visor.encryption.VisorCacheGroupEncryptionTaskResult;
+import org.apache.ignite.internal.visor.encryption.VisorEncryptionKeyIdsTask;
+import org.apache.ignite.internal.visor.encryption.VisorReencryptionResumeTask;
+import org.apache.ignite.internal.visor.encryption.VisorReencryptionStatusTask;
+import org.apache.ignite.internal.visor.encryption.VisorReencryptionSuspendTask;
+
+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.TaskExecutor.BROADCAST_UUID;
+import static org.apache.ignite.internal.commandline.TaskExecutor.executeTaskByNameOnNode;
+import static org.apache.ignite.internal.commandline.encryption.EncryptionSubcommands.CACHE_GROUP_KEY_IDS;
+
+/**
+ * Base cache group encryption multinode subcommand.
+ *
+ * @param <T> Command result type.
+ * @param <S> Multinode task result.
+ */
+public abstract class CacheGroupEncryptionCommand<T, S extends VisorCacheGroupEncryptionTaskResult<T>>
+    extends AbstractCommand<VisorCacheGroupEncryptionTaskArg> {
+    /** Cache group reencryption task argument. */
+    private VisorCacheGroupEncryptionTaskArg taskArg;
+
+    /** {@inheritDoc} */
+    @Override public VisorCacheGroupEncryptionTaskArg arg() {
+        return taskArg;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void parseArguments(CommandArgIterator argIter) {
+        String grpName = argIter.nextArg("Сache group name is expected.");
+
+        if (argIter.hasNextSubArg())
+            throw new IllegalArgumentException("Unexpected command argument: " + argIter.peekNextArg());
+
+        taskArg = new VisorCacheGroupEncryptionTaskArg(grpName);
+    }
+
+    /** {@inheritDoc} */
+    @Override public Object execute(GridClientConfiguration clientCfg, Logger log) throws Exception {
+        try (GridClient client = Command.startClient(clientCfg)) {
+            S res = executeTaskByNameOnNode(
+                client,
+                visorTaskName(),
+                taskArg,
+                BROADCAST_UUID,
+                clientCfg
+            );
+
+            printResults(res, taskArg.groupName(), log);
+
+            return res;
+        }
+        catch (Throwable e) {
+            log.severe("Failed to perform operation.");
+            log.severe(CommandLogger.errorMessage(e));
+
+            throw e;
+        }
+    }
+
+    /**
+     * @param res Response.
+     * @param grpName Cache group name.
+     * @param log Logger.
+     */
+    protected void printResults(S res, String grpName, Logger log) {
+        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 execute command for the cache group \"%s\": %s.",
+                DOUBLE_INDENT, grpName, entry.getValue().getMessage()));
+        }
+
+        Map<UUID, T> results = res.results();
+
+        for (Map.Entry<UUID, T> entry : results.entrySet()) {
+            log.info(INDENT + "Node " + entry.getKey() + ":");
+
+            printNodeResult(entry.getValue(), grpName, log);
+        }
+    }
+
+    /**
+     * @param res Response.
+     * @param grpName Cache group name.
+     * @param log Logger.
+     */
+    protected abstract void printNodeResult(T res, String grpName, Logger log);
+
+    /**
+     * @return Visor task name.
+     */
+    protected abstract String visorTaskName();
+
+    /** Subcommand to Display re-encryption status of the cache group. */
+    protected static class ReencryptionStatus extends
+        CacheGroupEncryptionCommand<Long, VisorCacheGroupEncryptionTaskResult<Long>> {
+        /** {@inheritDoc} */
+        @Override protected void printNodeResult(Long bytesLeft, String grpName, Logger log) {
+            if (bytesLeft == -1)
+                log.info(DOUBLE_INDENT + "re-encryption completed or not required");
+            else

Review comment:
       Fixed, thanks.




----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] asfgit closed pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #8242:
URL: https://github.com/apache/ignite/pull/8242


   


----------------------------------------------------------------
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:
users@infra.apache.org



[GitHub] [ignite] xtern commented on a change in pull request #8242: IGNITE-13320

Posted by GitBox <gi...@apache.org>.
xtern commented on a change in pull request #8242:
URL: https://github.com/apache/ignite/pull/8242#discussion_r535906530



##########
File path: modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/encryption/ReencryptionRateCommand.java
##########
@@ -104,22 +102,13 @@
         Double rateLimit = null;
 
         while (argIter.hasNextSubArg()) {
-            String arg = argIter.nextArg("Failed to read command argument.");
+            String rateLimitArg = argIter.nextArg("Expected decimal value for re-encryption rate.");
 
-            ReencryptionRateCommandArg cmdArg = CommandArgUtils.of(arg, ReencryptionRateCommandArg.class);
-
-            if (cmdArg == ReencryptionRateCommandArg.LIMIT) {
-                String rateLimitArg = argIter.nextArg("Expected decimal value for re-encryption rate.");
-
-                try {
-                    rateLimit = Double.parseDouble(rateLimitArg);
-                } catch (NumberFormatException e) {
-                    throw new IllegalArgumentException("Failed to parse " + ReencryptionRateCommandArg.LIMIT +
-                        " command argument. Decimal value expected.", e);
-                }
+            try {
+                rateLimit = Double.parseDouble(rateLimitArg);
+            } catch (NumberFormatException e) {

Review comment:
       Done, thanks




----------------------------------------------------------------
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:
users@infra.apache.org