Add twophase_validate_config_timeout variable __

CHANGELOG.md

@@ -14,6 +14,7 @@ README.md to use the newest tag with new release
 
 - Add `backup_instance_dirs` step to archive files of stopped instance
 - Add `cartridge_restore_backup_path_local` to restore instance from local backup
+- Add `twophase_validate_config_timeout` variable
 
 ### Fixed
 

defaults/main.yml

@@ -91,6 +91,7 @@ weight: null
 twophase_netbox_call_timeout: null
 twophase_upload_config_timeout: null
 twophase_apply_config_timeout: null
+twophase_validate_config_timeout: null
 
 edit_topology_timeout: null  # DEPRECATED
 edit_topology_healthy_timeout: 60
@@ -278,6 +279,7 @@ cartridge_cached_fact_names_by_target:
     - twophase_netbox_call_timeout
     - twophase_upload_config_timeout
     - twophase_apply_config_timeout
+    - twophase_validate_config_timeout
     - edit_topology_timeout
     - edit_topology_healthy_timeout
     - edit_topology_allow_missed_instances

doc/steps.md

@@ -288,6 +288,8 @@ Input variables from config (for two-phase commit):
   while two-phase commit (Cartridge 2.5+ is required);
 - `twophase_apply_config_timeout` - time in seconds to wait config apply
   while two-phase commit (Cartridge 2.5+ is required);
+- `twophase_validate_config_timeout` - time in seconds to wait config validate
+  while two-phase commit (Cartridge 2.5+ is required);
 - `edit_topology_healthy_timeout` - time in seconds to wait until a cluster become healthy after editing topology;
 - [DEPRECATED] `edit_topology_timeout` - the same timeout as `edit_topology_healthy_timeout`.
 

doc/variables.md

@@ -137,6 +137,8 @@ For more details see [scenario documentation](/doc/scenario.md).
   commit (Cartridge 2.5+ is required);
 - `twophase_apply_config_timeout` (`number`): time in seconds to wait config apply while two-phase
   commit (Cartridge 2.5+ is required);
+- `twophase_validate_config_timeout` (`number`): time in seconds to wait config validate while two-phase
+  commit (Cartridge 2.5+ is required);
 - `edit_topology_healthy_timeout` (`number`, default: `60`): time in seconds to wait until a cluster
   become healthy after editing topology;
 - [DEPRECATED] `edit_topology_timeout` (`number`): the same timeout

library/cartridge_apply_app_config.py

@@ -21,6 +21,7 @@
     'netbox_call_timeout': {'required': False, 'type': 'int'},
     'upload_config_timeout': {'required': False, 'type': 'int'},
     'apply_config_timeout': {'required': False, 'type': 'int'},
+    'validate_config_timeout': {'required': False, 'type': 'int'},
 }
 
 LUA_MODE = 'lua'

library/cartridge_bootstrap_vshard.py

@@ -7,6 +7,7 @@
     'netbox_call_timeout': {'required': False, 'type': 'int'},
     'upload_config_timeout': {'required': False, 'type': 'int'},
     'apply_config_timeout': {'required': False, 'type': 'int'},
+    'validate_config_timeout': {'required': False, 'type': 'int'},
 }
 
 

library/cartridge_configure_app_config.py

@@ -8,6 +8,7 @@
     'netbox_call_timeout': {'required': False, 'type': 'int'},
     'upload_config_timeout': {'required': False, 'type': 'int'},
     'apply_config_timeout': {'required': False, 'type': 'int'},
+    'validate_config_timeout': {'required': False, 'type': 'int'},
 }
 
 

library/cartridge_configure_auth.py

@@ -8,6 +8,7 @@
     'netbox_call_timeout': {'required': False, 'type': 'int'},
     'upload_config_timeout': {'required': False, 'type': 'int'},
     'apply_config_timeout': {'required': False, 'type': 'int'},
+    'validate_config_timeout': {'required': False, 'type': 'int'},
 }
 
 

library/cartridge_configure_failover.py

@@ -8,6 +8,7 @@
     'netbox_call_timeout': {'required': False, 'type': 'int'},
     'upload_config_timeout': {'required': False, 'type': 'int'},
     'apply_config_timeout': {'required': False, 'type': 'int'},
+    'validate_config_timeout': {'required': False, 'type': 'int'},
 }
 
 NEW_FAILOVER_API_CARTRIDGE_VERSION = '2.1.0'

library/cartridge_edit_topology.py

@@ -12,6 +12,7 @@
     'netbox_call_timeout': {'required': False, 'type': 'int'},
     'upload_config_timeout': {'required': False, 'type': 'int'},
     'apply_config_timeout': {'required': False, 'type': 'int'},
+    'validate_config_timeout': {'required': False, 'type': 'int'},
     'allow_missed_instances': {'required': True, 'type': 'bool'},
     'check_mode': {'required': False, 'type': 'bool', 'default': False},
     'ignore_errors_of_checks': {'required': False, 'type': 'dict', 'default': {}},

library/cartridge_failover_promote.py

@@ -14,6 +14,7 @@
     'netbox_call_timeout': {'required': False, 'type': 'int'},
     'upload_config_timeout': {'required': False, 'type': 'int'},
     'apply_config_timeout': {'required': False, 'type': 'int'},
+    'validate_config_timeout': {'required': False, 'type': 'int'},
 }
 
 

library/cartridge_validate_config.py

@@ -31,6 +31,7 @@
     'twophase_netbox_call_timeout',
     'twophase_upload_config_timeout',
     'twophase_apply_config_timeout',
+    'twophase_validate_config_timeout',
     'edit_topology_timeout',
     'edit_topology_healthy_timeout',
     'edit_topology_allow_missed_instances',
@@ -137,6 +138,7 @@
     'twophase_netbox_call_timeout': int,
     'twophase_upload_config_timeout': int,
     'twophase_apply_config_timeout': int,
+    'twophase_validate_config_timeout': int,
     'edit_topology_timeout': int,
     'edit_topology_healthy_timeout': int,
     'edit_topology_allow_missed_instances': bool,

module_utils/helpers.py

@@ -9,7 +9,7 @@
 from ansible.module_utils.basic import AnsibleModule
 
 DEFAULT_RUN_DIR = '/var/run/tarantool'
-TWOPHASE_OPTION_NAMES = ['netbox_call_timeout', 'upload_config_timeout', 'apply_config_timeout']
+TWOPHASE_OPTION_NAMES = ['netbox_call_timeout', 'upload_config_timeout', 'validate_config_timeout', 'apply_config_timeout']
 
 # parameters of instance configuration that can be changed dynamically
 DYNAMIC_BOX_CFG_PARAMS = {

tasks/set_instance_facts.yml

@@ -93,6 +93,7 @@
       twophase_netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
       twophase_upload_config_timeout: '{{ twophase_upload_config_timeout }}'
       twophase_apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+      twophase_validate_config_timeout: '{{ twophase_validate_config_timeout }}'
 
       edit_topology_timeout: '{{ edit_topology_timeout }}'
       edit_topology_healthy_timeout: '{{ edit_topology_healthy_timeout }}'

tasks/steps/blocks/check_new_topology.yml

@@ -9,6 +9,7 @@
     netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
     upload_config_timeout: '{{ twophase_upload_config_timeout }}'
     apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+    validate_config_timeout: '{{ twophase_validate_config_timeout }}'
     allow_missed_instances: '{{ edit_topology_allow_missed_instances }}'
     check_mode: true
     ignore_errors_of_checks:

tasks/steps/bootstrap_vshard.yml

@@ -17,6 +17,7 @@
         netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
         upload_config_timeout: '{{ twophase_upload_config_timeout }}'
         apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+        validate_config_timeout: '{{ twophase_validate_config_timeout }}'
       register: bootstrap_vshard
       until: not bootstrap_vshard.failed
       retries: '{{ bootstrap_vshard_retries }}'

tasks/steps/configure_app_config.yml

@@ -15,5 +15,6 @@
         netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
         upload_config_timeout: '{{ twophase_upload_config_timeout }}'
         apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+        validate_config_timeout: '{{ twophase_validate_config_timeout }}'
       run_once: true
       delegate_to: '{{ control_instance.name }}'

tasks/steps/configure_auth.yml

@@ -15,5 +15,6 @@
         netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
         upload_config_timeout: '{{ twophase_upload_config_timeout }}'
         apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+        validate_config_timeout: '{{ twophase_validate_config_timeout }}'
       run_once: true
       delegate_to: '{{ control_instance.name }}'

tasks/steps/configure_failover.yml

@@ -15,5 +15,6 @@
         netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
         upload_config_timeout: '{{ twophase_upload_config_timeout }}'
         apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+        validate_config_timeout: '{{ twophase_validate_config_timeout }}'
       run_once: true
       delegate_to: '{{ control_instance.name }}'

tasks/steps/edit_topology.yml

@@ -18,6 +18,7 @@
         netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
         upload_config_timeout: '{{ twophase_upload_config_timeout }}'
         apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+        validate_config_timeout: '{{ twophase_validate_config_timeout }}'
         allow_missed_instances: '{{ edit_topology_allow_missed_instances }}'
       run_once: true
       delegate_to: '{{ control_instance.name }}'

tasks/steps/failover_promote.yml

@@ -16,5 +16,6 @@
         netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
         upload_config_timeout: '{{ twophase_upload_config_timeout }}'
         apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+        validate_config_timeout: '{{ twophase_validate_config_timeout }}'
       run_once: true
       delegate_to: '{{ control_instance.name }}'

tasks/steps/force_leaders.yml

@@ -19,5 +19,6 @@
         netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
         upload_config_timeout: '{{ twophase_upload_config_timeout }}'
         apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+        validate_config_timeout: '{{ twophase_validate_config_timeout }}'
       run_once: true
       delegate_to: '{{ control_instance.name }}'

tasks/steps/upload_app_config.yml

@@ -37,6 +37,7 @@
         netbox_call_timeout: '{{ twophase_netbox_call_timeout }}'
         upload_config_timeout: '{{ twophase_upload_config_timeout }}'
         apply_config_timeout: '{{ twophase_apply_config_timeout }}'
+        validate_config_timeout: '{{ twophase_validate_config_timeout }}'
       register: apply_app_config_res
 
     - name: 'Add uploaded config to "temporary_files" fact'

unit/test_validate_config.py

@@ -128,6 +128,7 @@
         'twophase_netbox_call_timeout',
         'twophase_upload_config_timeout',
         'twophase_apply_config_timeout',
+        'twophase_validate_config_timeout',
         'edit_topology_timeout',
         'edit_topology_healthy_timeout',
         'wait_members_alive_retries',