Merge sync node to develop, update monitors logic #1045

dmytrotkk · 2024-02-07T19:30:00Z

This PR merges sync-node branch into develop with minor modifications to the codebase to incorporate sync node into the new node architecture with separate config/skaled monitors.

Breaking news:

1 new monitor added

Existing monitors from the regular node are reused for the sync node.

Monitors available on the sync node:

NoConfigSkaledMonitor
RecreateSkaledMonitor
UpdateConfigSkaledMonitor
ReloadGroupSkaledMonitor

Also, SyncConfigMonitor was added to handle config generation on sync node.

Tests were slightly modified to work with the new sync node params, no new tests added.
No performance changes.

Fixes https://github.com/skalenetwork/internal-support/issues/907

…-node SKALE-799 Sync node functionality

…-node SKALE-779 Add fix for schain finish_ts

…-node SKALE-779 Add generate IMA sChain ABI

…-node SKALE-779 Fix ecdsa_key_name for sync node

…-node SKALE-779 SGX for sync node fix

Hotfix: add firewall rules to sync monitor and SSL reload support

Hotfix: update reload monitor test

…-admin into feature/add-static-accounts-for-chains

…-for-chains Feature/add static accounts for chains

Merge beta sync node to stable

codecov · 2024-02-13T18:14:13Z

Codecov Report

Attention: 111 lines in your changes are missing coverage. Please review.

Comparison is base (b049f2b) 81.43% compared to head (ae8f90b) 80.88%.

Files	Patch %	Lines
sync_node.py	0.00%	52 Missing ⚠️
core/schains/volume.py	57.14%	15 Missing ⚠️
core/schains/process_manager.py	14.28%	12 Missing ⚠️
core/schains/monitor/skaled_monitor.py	31.25%	11 Missing ⚠️
core/schains/monitor/config_monitor.py	20.00%	8 Missing ⚠️
core/schains/monitor/main.py	14.28%	6 Missing ⚠️
core/schains/monitor/action.py	86.66%	2 Missing ⚠️
core/schains/config/node_info.py	92.30%	1 Missing ⚠️
core/schains/config/static_accounts.py	91.66%	1 Missing ⚠️
tools/docker_utils.py	66.66%	1 Missing ⚠️
... and 2 more

Additional details and impacted files

@@            Coverage Diff             @@
##           v2.7.x    #1045      +/-   ##
==========================================
- Coverage   81.43%   80.88%   -0.56%     
==========================================
  Files         101      103       +2     
  Lines        5709     5900     +191     
==========================================
+ Hits         4649     4772     +123     
- Misses       1060     1128      +68

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

badrogger · 2024-02-14T13:24:48Z

core/schains/config/generator.py

 ) -> SChainConfig:
    """Main function that is used to generate sChain config"""
    logger.info(
        f'Going to generate sChain config for {schain["name"]}, '
        f'node_name: {node["name"]}, node_id: {node_id}, rotation_id: {rotation_id}, '
-        f'ecdsa keyname: {ecdsa_key_name}'


Suggest to remove keyname and add sync_node logging.

badrogger · 2024-02-14T13:25:35Z

core/schains/config/node_info.py

                'info-acceptors': 1,
                **self.static_node_info
            }
        }
+        if self.archive is not None and self.sync_node:


Might be better to simply put true/false for archiveMode / syncFromCatchup.

badrogger · 2024-02-14T13:26:43Z

core/schains/config/node_info.py

+    wallets = {} if sync_node else generate_wallets_config(schain['name'], rotation_id)
+
+    if ecdsa_key_name is None:
+        logger.warning(f'Generating CurrentNodeInfo for {schain["name"]}, ecdsa_key_name is None')


It's not a warning if sync node=true, since it's expected. Also if for sync_node=false it's better to raise and exception.

badrogger · 2024-02-14T13:29:56Z

core/schains/monitor/containers.py

@@ -113,8 +117,8 @@ def monitor_ima_container(
 ) -> None:
    schain_name = schain["name"]

-    if DISABLE_IMA:
-        logger.info(f'{schain_name} - IMA is disabled, skipping')
+    if SYNC_NODE:


I think this log line can be ommited.

removed log only

badrogger · 2024-02-14T13:30:50Z

core/schains/monitor/main.py

-    mon = RegularConfigMonitor(config_am, config_checks)
+
+    if SYNC_NODE:
+        logger.info('Sync node mode, running config checks')


Config check was executed before. It's better to remove the line

changed to running config monitor

badrogger · 2024-02-14T13:32:18Z

core/schains/monitor/skaled_monitor.py

+        elif is_config_update_time(status, skaled_status):
+            mon_type = UpdateConfigSkaledMonitor
+        elif is_reload_group_mode(status, action_manager.upstream_finish_ts):
+            mon_type = ReloadGroupSkaledMonitor


What about ReloadIpSkaledMonitor?

added ReloadIpSkaledMonitor to sync node

badrogger · 2024-02-14T13:37:02Z

tools/logger.py

@@ -87,6 +88,9 @@ def init_logger(
    log_file_path=None,
    debug_file_path=None
 ):
+    # for handler in logging.root.handlers[:]:


Better to remove

badrogger · 2024-02-14T13:38:29Z

tools/configs/logs.py

@@ -45,3 +49,4 @@

 ADMIN_LOG_FORMAT = '[%(asctime)s %(levelname)s][%(process)d][%(processName)s][%(threadName)s] - %(name)s:%(lineno)d - %(message)s'  # noqa
 API_LOG_FORMAT = '[%(asctime)s] %(process)d %(levelname)s %(url)s %(module)s: %(message)s'  # noqa
+SYNC_LOG_FORMAT = '[%(asctime)s %(levelname)s] - %(name)s:%(lineno)d - %(message)s'  # noqa


Suggest to use same log formant for regular and sync nodes.

changed to ADMIN_LOG_FORMAT

badrogger · 2024-02-14T13:40:40Z

tests/schains/cmd_test.py

        f'--aa no --ssl-key {ssl_key_path} --ssl-cert {ssl_cert_path}'
    )
+    print(container_opts, 'IVD')


Please, remove

badrogger · 2024-02-14T13:47:02Z

requirements.txt

@@ -30,3 +30,5 @@ pyOpenSSL==23.1.1
 python-dateutil==2.8.2
 python-telegram-bot==12.8
 sh==1.14.1
+
+urllib3<2


It's not necessary anymore.

dmytrotkk added 30 commits May 12, 2022 19:54

SKALE-799 Sync node functionality

71ba0b9

SKALE-779 Merge beta branch

5100a9f

SKALE-779 Merge beta branch

f2e1b86

SKALE-779 Use latest stable SGX wallet

0eaa23d

SKALE-779 Fix sgx wallet version

93d6217

SKALE-779 Add sync-node branch to publish pipeline

70ec39b

SKALE-779 Add sync-node branch to publish pipeline

25be0bb

SKALE-779 Fix admin tests, add sync node tests

5c8195d

SKALE-779 Add sync node monitor test

576dc29

SKALE-779 Add sync node rotation monitor, remove debug info

a5e792b

SKALE-779 Comment out removeHandler for logs

f214a09

Merge pull request #810 from skalenetwork/feature/SKALE-779-full-sync…

1fff447

…-node SKALE-799 Sync node functionality

SKALE-779 Add fix for schain finish_ts

458e1a0

Merge pull request #817 from skalenetwork/feature/SKALE-779-full-sync…

424ddc2

…-node SKALE-779 Add fix for schain finish_ts

SKALE-779 Add generate IMA sChain ABI

2b3c635

Merge pull request #818 from skalenetwork/feature/SKALE-779-full-sync…

8bb5f75

…-node SKALE-779 Add generate IMA sChain ABI

SKALE-779 Fix ecdsa_key_name for sync node

724e772

Merge pull request #819 from skalenetwork/feature/SKALE-779-full-sync…

3e218e8

…-node SKALE-779 Fix ecdsa_key_name for sync node

SKALE-779 SGX for sync node fix

0cf1b21

Merge pull request #821 from skalenetwork/feature/SKALE-779-full-sync…

8b58c47

…-node SKALE-779 SGX for sync node fix

Hotfix: add firewall rules to sync monitor

0d242b6

Hotfix: fix container cmd tests

ce3a495

Add SSL reload support

0b44301

Hotfix: change default value for ssl_change_date

245d543

Restructure SSL monitor, update schain record

b6eb9cd

Hotfix: fix sync node monitor

1963a78

Hotfix: fix all SSL-related tests

abe377d

Merge pull request #825 from skalenetwork/hotfix/add-firewall-ssl

e7eb4a5

Hotfix: add firewall rules to sync monitor and SSL reload support

Hotfix: update reload monitor test

b9e8dc1

Merge pull request #828 from skalenetwork/hotfix/add-firewall-ssl

640df78

Hotfix: update reload monitor test

dmytrotkk and others added 22 commits June 18, 2023 20:49

Add static accounts for schains

1ce0158

Add to build pipeline

8073942

Merge branch 'static-accounts-build' of github.com:skalenetwork/skale…

8d9377b

…-admin into feature/add-static-accounts-for-chains

Tmp fix for docker.py urllib3

f1e8392

Update skale.py, add accounts generator

23fa710

Remove static-accounts-build from publish pipeline

d3c3456

Bump codecov to 2.1.13

f10ab91

Fix flake8

1eb1edc

Fix ssl certs test

e6e397f

Fix flake8

7d10b35

Fix ssl test import

c57316e

Merge pull request #948 from skalenetwork/feature/add-static-accounts…

5cbcd85

…-for-chains Feature/add static accounts for chains

Merge pull request #978 from skalenetwork/merge-beta-sync-node-to-stable

06d542b

Merge beta sync node to stable

Merge sync node branch into develop, update monitors logic

225cd20

Replace get_containers_data with CONTAINERS_INFO

f46c1e1

Fix imports, remove old sync node tests

66b1d7d

Update sync node tests, remove unused functions

4147730

Fix resource allocation file for tests

a38e310

Fix skaled_action tests

e4be235

Add NoConfigSkaledMonitor for the sync node

14a8b9c

Fix sync node data volume creation

c0276be

Update sync node config test

8d22b72

dmytrotkk marked this pull request as ready for review February 13, 2024 19:52

dmytrotkk requested review from kladkogex and badrogger as code owners February 13, 2024 19:52

badrogger requested changes Feb 14, 2024

View reviewed changes

Update type to image_type, add sync node tests

ae8f90b

badrogger merged commit 032f899 into v2.7.x Mar 6, 2024
4 of 6 checks passed

badrogger deleted the merge-sync-node-to-develop branch March 6, 2024 15:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge sync node to develop, update monitors logic #1045

Merge sync node to develop, update monitors logic #1045

dmytrotkk commented Feb 7, 2024 •

edited

Loading

codecov bot commented Feb 13, 2024 •

edited

Loading

badrogger Feb 14, 2024

dmytrotkk Feb 14, 2024

badrogger Feb 14, 2024

dmytrotkk Feb 14, 2024

badrogger Feb 14, 2024

dmytrotkk Feb 14, 2024

badrogger Feb 14, 2024

dmytrotkk Feb 14, 2024 •

edited

Loading

badrogger Feb 14, 2024

dmytrotkk Feb 14, 2024

badrogger Feb 14, 2024

dmytrotkk Feb 15, 2024

badrogger Feb 14, 2024

dmytrotkk Feb 15, 2024

badrogger Feb 14, 2024

dmytrotkk Feb 15, 2024

badrogger Feb 14, 2024

dmytrotkk Feb 15, 2024

badrogger Feb 14, 2024

dmytrotkk Feb 15, 2024

Merge sync node to develop, update monitors logic #1045

Merge sync node to develop, update monitors logic #1045

Conversation

dmytrotkk commented Feb 7, 2024 • edited Loading

1 new monitor added

codecov bot commented Feb 13, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dmytrotkk Feb 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dmytrotkk commented Feb 7, 2024 •

edited

Loading

codecov bot commented Feb 13, 2024 •

edited

Loading

dmytrotkk Feb 14, 2024 •

edited

Loading