timoninmaxim commented on a change in pull request #8267: URL: https://github.com/apache/ignite/pull/8267#discussion_r493407882
########## File path: modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/UuidStreamerApplication.java ########## @@ -0,0 +1,54 @@ +/* + * 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.ducktest.tests; + +import com.fasterxml.jackson.databind.JsonNode; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.internal.ducktest.utils.IgniteAwareApplication; + +import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Review comment: Please add meaningful java doc ########## File path: modules/ducktests/tests/ignitetest/tests/snapshot_test.py ########## @@ -0,0 +1,162 @@ +# 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. + +""" +Module contains discovery tests. +""" + +import time +import re + +from ducktape.mark.resource import cluster + +from ignitetest.services.ignite import IgniteService +from ignitetest.services.ignite_app import IgniteApplicationService +from ignitetest.services.utils.control_utility import ControlUtility +from ignitetest.services.utils.ignite_configuration import IgniteConfiguration, DataStorageConfiguration +from ignitetest.services.utils.ignite_configuration.data_storage import DataRegionConfiguration +from ignitetest.utils import ignite_versions +from ignitetest.utils.ignite_test import IgniteTest +from ignitetest.utils.version import DEV_BRANCH, IgniteVersion + + +# pylint: disable=W0223 +class SnapshotTest(IgniteTest): + """ + Test Snapshot. + """ + NUM_NODES = 4 + + SNAPSHOT_NAME = "test_snap" + + @cluster(num_nodes=NUM_NODES) + @ignite_versions(str(DEV_BRANCH)) + def snapshot_test(self, ignite_version): + """ + Test Snapshot. + 1. Start of ignite cluster. + 2. Activate cluster. + 3. Load. + 4. Idle verify dump1. + 5. Snapshot. + 6. Load. + 7. Idle verify dump2. + 8. Сhecking that dump1 and dump2 are differentю Review comment: Type, "ю" instead of "." ########## File path: modules/ducktests/tests/ignitetest/tests/snapshot_test.py ########## @@ -0,0 +1,162 @@ +# 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. + +""" +Module contains discovery tests. +""" + +import time +import re + +from ducktape.mark.resource import cluster + +from ignitetest.services.ignite import IgniteService +from ignitetest.services.ignite_app import IgniteApplicationService +from ignitetest.services.utils.control_utility import ControlUtility +from ignitetest.services.utils.ignite_configuration import IgniteConfiguration, DataStorageConfiguration +from ignitetest.services.utils.ignite_configuration.data_storage import DataRegionConfiguration +from ignitetest.utils import ignite_versions +from ignitetest.utils.ignite_test import IgniteTest +from ignitetest.utils.version import DEV_BRANCH, IgniteVersion + + +# pylint: disable=W0223 +class SnapshotTest(IgniteTest): + """ + Test Snapshot. + """ + NUM_NODES = 4 + + SNAPSHOT_NAME = "test_snap" + + @cluster(num_nodes=NUM_NODES) + @ignite_versions(str(DEV_BRANCH)) + def snapshot_test(self, ignite_version): + """ + Test Snapshot. + 1. Start of ignite cluster. + 2. Activate cluster. + 3. Load. + 4. Idle verify dump1. + 5. Snapshot. + 6. Load. + 7. Idle verify dump2. + 8. Сhecking that dump1 and dump2 are differentю + 9. Stop ignite and replace db from snapshot + 10. Run ignite cluster. + 11. Idle verify dump3. + 12. Checking the equality of dump1 and dump3. + """ + data_cfg = DataStorageConfiguration(default=DataRegionConfiguration(persistent=True)) + + ignite_config = IgniteConfiguration( + version=IgniteVersion(ignite_version), + data_storage=data_cfg, + ) + + service = IgniteService(self.test_context, ignite_config, num_nodes=self.NUM_NODES - 1) + service.start() + + control_utility = ControlUtility(service, self.test_context) + control_utility.activate() + + client_config = ignite_config._replace(client_mode=True, data_storage=None) + + streamer = IgniteApplicationService( + self.test_context, + client_config, + java_class_name="org.apache.ignite.internal.ducktest.tests.UuidStreamerApplication", + params={"cacheName": "test-cache"}) + + load(streamer) + + node = service.nodes[0] + + check_idle_verify(control_utility) + check_validate_indexes(control_utility) + dump_1 = get_dump_path(control_utility, node) + + self.logger.warn("Path to dump_1=" + dump_1) + + data = control_utility.snapshot_create(self.SNAPSHOT_NAME) + + self.logger.warn(data) + + load(streamer) + + dump_2 = get_dump_path(control_utility, node) + + self.logger.warn("Path to dump_2=" + dump_2) + + diff = node.account.ssh_output(f'diff {dump_1} {dump_2}', allow_fail=True) + assert len(diff) != 0, diff + + service.rename_db(new_db_name='old_db') + service.copy_snap_to_db(self.SNAPSHOT_NAME) + + service.run() + + control_utility.activate() + + check_idle_verify(control_utility) + check_validate_indexes(control_utility) + dump_3 = get_dump_path(control_utility, node) + + self.logger.warn("Path to dump_3=" + dump_2) + + diff = node.account.ssh_output(f'diff {dump_1} {dump_3}', allow_fail=True) + assert len(diff) == 0, diff Review comment: Am I correct that equality of dump1 and dump3 is achieved by the fact that streamer loads data the same time (1 min long for every load)? ########## File path: modules/ducktests/tests/ignitetest/services/ignite.py ########## @@ -136,6 +158,35 @@ def clean_node(self, node): node.account.kill_java_processes(self.APP_SERVICE_CLASS, clean_shutdown=False, allow_fail=True) node.account.ssh("sudo rm -rf -- %s" % self.PERSISTENT_ROOT, allow_fail=False) + def rename_db(self, new_db_name: str): + """ + Rename db. + """ + for node in self.nodes: + self._rename_db(node, new_db_name) + + def _rename_db(self, node, new_db_name: str): + """ + Rename db. + """ + node.account.kill_java_processes(self.APP_SERVICE_CLASS, clean_shutdown=False, allow_fail=True) + node.account.ssh(f"sudo mv {self.WORK_DIR}/db {self.WORK_DIR}/{new_db_name}", allow_fail=False) + + def copy_snap_to_db(self, snapshot_name: str): + """ + Copy from snapshot to db. + """ + for node in self.nodes: + self._copy_snap_to_db(node, snapshot_name) + + def _copy_snap_to_db(self, node, snapshot_name: str): + """ + Copy from snapshot to db. + """ + node.account.kill_java_processes(self.APP_SERVICE_CLASS, clean_shutdown=False, allow_fail=True) + node.account.ssh(f"sudo cp -r {self.SNAPSHOT}/{snapshot_name}/db {self.WORK_DIR}", allow_fail=False) + node.account.ssh(f"sudo chown -R ducker:ducker {self.PERSISTENT_ROOT}", allow_fail=False) Review comment: Why do you use sudo? There are chances that this operation will be forbidden on test cluster. Looks like this ownership must exist on cluster before tests run ########## File path: modules/ducktests/tests/ignitetest/tests/snapshot_test.py ########## @@ -0,0 +1,162 @@ +# 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. + +""" +Module contains discovery tests. +""" + +import time +import re + +from ducktape.mark.resource import cluster + +from ignitetest.services.ignite import IgniteService +from ignitetest.services.ignite_app import IgniteApplicationService +from ignitetest.services.utils.control_utility import ControlUtility +from ignitetest.services.utils.ignite_configuration import IgniteConfiguration, DataStorageConfiguration +from ignitetest.services.utils.ignite_configuration.data_storage import DataRegionConfiguration +from ignitetest.utils import ignite_versions +from ignitetest.utils.ignite_test import IgniteTest +from ignitetest.utils.version import DEV_BRANCH, IgniteVersion + + +# pylint: disable=W0223 +class SnapshotTest(IgniteTest): + """ + Test Snapshot. + """ + NUM_NODES = 4 + + SNAPSHOT_NAME = "test_snap" + + @cluster(num_nodes=NUM_NODES) + @ignite_versions(str(DEV_BRANCH)) + def snapshot_test(self, ignite_version): + """ + Test Snapshot. + 1. Start of ignite cluster. + 2. Activate cluster. + 3. Load. + 4. Idle verify dump1. + 5. Snapshot. + 6. Load. + 7. Idle verify dump2. + 8. Сhecking that dump1 and dump2 are differentю + 9. Stop ignite and replace db from snapshot Review comment: Type, miss "." in the end of line. ########## File path: modules/ducktests/tests/ignitetest/tests/snapshot_test.py ########## @@ -0,0 +1,162 @@ +# 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. + +""" +Module contains discovery tests. +""" + +import time +import re + +from ducktape.mark.resource import cluster + +from ignitetest.services.ignite import IgniteService +from ignitetest.services.ignite_app import IgniteApplicationService +from ignitetest.services.utils.control_utility import ControlUtility +from ignitetest.services.utils.ignite_configuration import IgniteConfiguration, DataStorageConfiguration +from ignitetest.services.utils.ignite_configuration.data_storage import DataRegionConfiguration +from ignitetest.utils import ignite_versions +from ignitetest.utils.ignite_test import IgniteTest +from ignitetest.utils.version import DEV_BRANCH, IgniteVersion + + +# pylint: disable=W0223 +class SnapshotTest(IgniteTest): + """ + Test Snapshot. + """ + NUM_NODES = 4 + + SNAPSHOT_NAME = "test_snap" + + @cluster(num_nodes=NUM_NODES) + @ignite_versions(str(DEV_BRANCH)) + def snapshot_test(self, ignite_version): + """ + Test Snapshot. + 1. Start of ignite cluster. + 2. Activate cluster. + 3. Load. + 4. Idle verify dump1. + 5. Snapshot. + 6. Load. + 7. Idle verify dump2. + 8. Сhecking that dump1 and dump2 are differentю + 9. Stop ignite and replace db from snapshot + 10. Run ignite cluster. + 11. Idle verify dump3. + 12. Checking the equality of dump1 and dump3. + """ + data_cfg = DataStorageConfiguration(default=DataRegionConfiguration(persistent=True)) + + ignite_config = IgniteConfiguration( + version=IgniteVersion(ignite_version), + data_storage=data_cfg, + ) + + service = IgniteService(self.test_context, ignite_config, num_nodes=self.NUM_NODES - 1) + service.start() + + control_utility = ControlUtility(service, self.test_context) + control_utility.activate() + + client_config = ignite_config._replace(client_mode=True, data_storage=None) + + streamer = IgniteApplicationService( + self.test_context, + client_config, + java_class_name="org.apache.ignite.internal.ducktest.tests.UuidStreamerApplication", + params={"cacheName": "test-cache"}) + + load(streamer) + + node = service.nodes[0] + + check_idle_verify(control_utility) + check_validate_indexes(control_utility) + dump_1 = get_dump_path(control_utility, node) + + self.logger.warn("Path to dump_1=" + dump_1) + + data = control_utility.snapshot_create(self.SNAPSHOT_NAME) + + self.logger.warn(data) + + load(streamer) + + dump_2 = get_dump_path(control_utility, node) + + self.logger.warn("Path to dump_2=" + dump_2) + + diff = node.account.ssh_output(f'diff {dump_1} {dump_2}', allow_fail=True) + assert len(diff) != 0, diff + + service.rename_db(new_db_name='old_db') + service.copy_snap_to_db(self.SNAPSHOT_NAME) + + service.run() + + control_utility.activate() + + check_idle_verify(control_utility) + check_validate_indexes(control_utility) + dump_3 = get_dump_path(control_utility, node) + + self.logger.warn("Path to dump_3=" + dump_2) + + diff = node.account.ssh_output(f'diff {dump_1} {dump_3}', allow_fail=True) + assert len(diff) == 0, diff + + def tearDown(self): + """ + Copy work directory to result. + """ + self.copy_ignite_workdir() + + +def get_dump_path(control_utility: ControlUtility, node): + """ + Control utils idle verify dump. + @return: path to dump file on node. + """ + data = control_utility.idle_verify_dump(node) + assert 'VisorIdleVerifyDumpTask successfully' in data + match = re.search(r'/.*.txt', data) + return match[0] + + +def check_validate_indexes(control_utility: ControlUtility): + """ + Check indexes. + """ + data = control_utility.validate_indexes() + assert 'no issues found.' in data, data + + +def check_idle_verify(control_utility: ControlUtility): + """ + Check idle verify. + """ + data = control_utility.idle_verify() + assert 'idle_verify check has finished, no conflicts have been found.' in data, data + + +def load(service_load, duration: int = 60): Review comment: Is it a real need to load 1 minute long? ########## File path: modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/UuidStreamerApplication.java ########## @@ -0,0 +1,54 @@ +/* + * 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.ducktest.tests; + +import com.fasterxml.jackson.databind.JsonNode; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.internal.ducktest.utils.IgniteAwareApplication; + +import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * + */ +public class UuidStreamerApplication extends IgniteAwareApplication { + /** {@inheritDoc} */ + @Override public void run(JsonNode jsonNode) { + IgniteCache<UUID, UUID> cache = ignite.getOrCreateCache(jsonNode.get("cacheName").asText()); + + AtomicInteger counter = new AtomicInteger(); Review comment: Why do you use atomic for local variable? ########## File path: modules/ducktests/tests/ignitetest/tests/snapshot_test.py ########## @@ -0,0 +1,162 @@ +# 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. + +""" +Module contains discovery tests. +""" + +import time +import re + +from ducktape.mark.resource import cluster + +from ignitetest.services.ignite import IgniteService +from ignitetest.services.ignite_app import IgniteApplicationService +from ignitetest.services.utils.control_utility import ControlUtility +from ignitetest.services.utils.ignite_configuration import IgniteConfiguration, DataStorageConfiguration +from ignitetest.services.utils.ignite_configuration.data_storage import DataRegionConfiguration +from ignitetest.utils import ignite_versions +from ignitetest.utils.ignite_test import IgniteTest +from ignitetest.utils.version import DEV_BRANCH, IgniteVersion + + +# pylint: disable=W0223 +class SnapshotTest(IgniteTest): + """ + Test Snapshot. + """ + NUM_NODES = 4 + + SNAPSHOT_NAME = "test_snap" + + @cluster(num_nodes=NUM_NODES) + @ignite_versions(str(DEV_BRANCH)) + def snapshot_test(self, ignite_version): + """ + Test Snapshot. + 1. Start of ignite cluster. + 2. Activate cluster. + 3. Load. + 4. Idle verify dump1. + 5. Snapshot. + 6. Load. + 7. Idle verify dump2. + 8. Сhecking that dump1 and dump2 are differentю + 9. Stop ignite and replace db from snapshot + 10. Run ignite cluster. + 11. Idle verify dump3. + 12. Checking the equality of dump1 and dump3. + """ + data_cfg = DataStorageConfiguration(default=DataRegionConfiguration(persistent=True)) + + ignite_config = IgniteConfiguration( + version=IgniteVersion(ignite_version), + data_storage=data_cfg, + ) + + service = IgniteService(self.test_context, ignite_config, num_nodes=self.NUM_NODES - 1) + service.start() + + control_utility = ControlUtility(service, self.test_context) + control_utility.activate() + + client_config = ignite_config._replace(client_mode=True, data_storage=None) + + streamer = IgniteApplicationService( + self.test_context, + client_config, + java_class_name="org.apache.ignite.internal.ducktest.tests.UuidStreamerApplication", + params={"cacheName": "test-cache"}) + + load(streamer) + + node = service.nodes[0] + + check_idle_verify(control_utility) + check_validate_indexes(control_utility) + dump_1 = get_dump_path(control_utility, node) + + self.logger.warn("Path to dump_1=" + dump_1) + + data = control_utility.snapshot_create(self.SNAPSHOT_NAME) + + self.logger.warn(data) Review comment: move logging data inside `snapshot_create` (as this is the only reason for defining `data` variable) and move it to DEBUG. ########## File path: modules/ducktests/tests/ignitetest/utils/ignite_test.py ########## @@ -16,12 +16,16 @@ """ This module contains basic ignite test. """ +import os from time import monotonic -from ducktape.tests.test import Test +from ducktape.utils.local_filesystem_utils import mkdir_p +from ducktape.tests.test import Test, TestContext +from ignitetest.services.ignite import IgniteService +from ignitetest.services.utils.ignite_persistence import PersistenceAware, IgnitePersistenceAware -# pylint: disable=W0223 +# pylint: disable=C0103,W0223,W0703 Review comment: C0103 "Used when a name doesn't doesn't fit the naming convention associated to its type". Why do you disable it? ---------------------------------------------------------------- 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]
