|
17 | 17 | # You should have received a copy of the GNU Affero General Public License |
18 | 18 | # along with this program. If not, see <https://www.gnu.org/licenses/>. |
19 | 19 |
|
20 | | -import time |
21 | | - |
22 | | -import distro |
23 | 20 | import functools |
24 | 21 | import logging |
| 22 | +import time |
25 | 23 | from typing import Dict, Optional |
26 | 24 |
|
| 25 | +import distro |
| 26 | + |
| 27 | +from node_cli.cli.info import TYPE, VERSION |
27 | 28 | from node_cli.configs import ( |
28 | 29 | CONTAINER_CONFIG_PATH, |
29 | 30 | CONTAINER_CONFIG_TMP_PATH, |
30 | | - SKALE_DIR, |
31 | 31 | GLOBAL_SKALE_DIR, |
| 32 | + SKALE_DIR, |
32 | 33 | ) |
33 | | -from node_cli.core.checks import CheckType, run_checks as run_host_checks |
| 34 | +from node_cli.core.checks import CheckType |
| 35 | +from node_cli.core.checks import run_checks as run_host_checks |
34 | 36 | from node_cli.core.docker_config import configure_docker |
35 | 37 | from node_cli.core.host import ( |
36 | 38 | ensure_btrfs_kernel_module_autoloaded, |
|
40 | 42 | from node_cli.core.nftables import configure_nftables |
41 | 43 | from node_cli.core.nginx import generate_nginx_config |
42 | 44 | from node_cli.core.node_options import NodeOptions |
43 | | -from node_cli.core.resources import update_resource_allocation, init_shared_space_volume |
| 45 | +from node_cli.core.resources import init_shared_space_volume, update_resource_allocation |
44 | 46 | from node_cli.core.schains import ( |
| 47 | + cleanup_datadir_for_single_chain_node, |
45 | 48 | update_node_cli_schain_status, |
46 | | - cleanup_sync_datadir, |
47 | 49 | ) |
48 | | -from node_cli.cli.info import VERSION, TYPE |
49 | 50 | from node_cli.operations.common import configure_filebeat, configure_flask, unpack_backup_archive |
50 | 51 | from node_cli.operations.docker_lvmpy import lvmpy_install |
51 | 52 | from node_cli.operations.skale_node import ( |
52 | 53 | download_skale_node, |
53 | 54 | sync_skale_node, |
54 | 55 | update_images, |
55 | 56 | ) |
| 57 | +from node_cli.operations.docker_lvmpy import lvmpy_install |
56 | 58 | from node_cli.operations.volume import ( |
57 | 59 | cleanup_volume_artifacts, |
58 | 60 | ensure_filestorage_mapping, |
|
64 | 66 | docker_cleanup, |
65 | 67 | remove_dynamic_containers, |
66 | 68 | ) |
| 69 | +<<<<<<< Updated upstream |
67 | 70 | from node_cli.utils.helper import str_to_bool, rm_dir |
68 | 71 | from node_cli.utils.meta import get_meta_info, update_meta |
| 72 | +======= |
| 73 | +from node_cli.utils.helper import rm_dir, str_to_bool |
| 74 | +from node_cli.utils.meta import CliMetaManager, MirageCliMetaManager |
| 75 | +>>>>>>> Stashed changes |
69 | 76 | from node_cli.utils.node_type import NodeType |
70 | 77 | from node_cli.utils.print_formatters import print_failed_requirements_checks |
71 | 78 |
|
72 | | - |
73 | 79 | logger = logging.getLogger(__name__) |
74 | 80 |
|
75 | 81 |
|
@@ -508,6 +514,6 @@ def restore_mirage(env, backup_path, config_only=False): |
508 | 514 |
|
509 | 515 | def cleanup_sync(env, schain_name: str) -> None: |
510 | 516 | turn_off(env, node_type=NodeType.SYNC) |
511 | | - cleanup_sync_datadir(schain_name=schain_name) |
| 517 | + cleanup_datadir_for_single_chain_node(schain_name=schain_name) |
512 | 518 | rm_dir(GLOBAL_SKALE_DIR) |
513 | 519 | rm_dir(SKALE_DIR) |
0 commit comments