Fix monitor plugin for resilient stack
The original work for monitor to plugin migration missed important parts of resilient stack implementation due to lack of SlapOS Profile Integration test coverage for those cases.
This MR tackles this issue by:
-
having a
kvm-resilientsoftware type test for KVM SR -
having a
resilientsoftware type test for slaprunner SR - fixing and improving resilient stack integration with monitor stack
- making added tests pass with promises as plugin and resilient stack
Merged
by 
The changes were merged into master. The source branch has been removed.
-
This is a fix for problem found by @Nicolas in 04ea0535 (comment 93527)
-
changed title from WIP: Fix/resilient slaprunner promise to plugin to WIP: Fix monitor plugin for resilient stack
Toggle commit list -
marked the task having a
kvm-resilienttest as completedToggle commit list -
marked the task having a software release slaprunner test as completed
Toggle commit list -
marked the task fixing and improving resilient stack integration with monitor stack as completed
Toggle commit list -
added 5 commits
- 8ffa610e - software/kvm/test: Add tests for kvm-resilient software type
- 825836ce - software/slaprunner/test: Add tests for resilient software type
- 59239c9d - stack/resilient: Fix switch to monitor-promise-base
- f2bbb538 - software/slaprunner: Fix switch to monitor-promise-base
- 0e99bbd6 - stack/resilient: Keep etc/promise
Toggle commit list -
marked the task making added tests pass with promises as plugin and resilient stack as completed
Toggle commit list -
@Nicolas this branch improves handling
resilientsoftware type ofkvmandslaprunnerSRs. They are both instantiated with that software type, and checked if all promises pass (default behaviour of test system) and assert that returned keys are correct.As soon as tests pass, I'll merge it.
-
So the kvm
TestInstanceResilientand slaprunnerTestInstanceResilientpassed, I'll merge. -
unmarked as a Work In Progress
Toggle commit list -
merged
Toggle commit list -
88 recipe = slapos.cookbook:check_url_available 89 path = $${directory:promises}/custom_frontend_promise 90 url = https://$${request-custom-frontend:connection-domain} 88 <= monitor-promise-base 89 module = check_url_available 90 name = custom_frontend_promise.py 91 config-url = https://$${request-custom-frontend:connection-domain} 91 92 {% if slapparameter_dict.get('custom-frontend-basic-auth') -%} 92 check-secure = 1 93 config-check-secure = 1 93 94 {% endif -%} 94 dash_path = {{ dash_executable_location }} 95 curl_path = {{ curl_executable_location }} 96 95 97 [custom-frontend-url-ready-promise] 96 [custom-frontend-url-ready-promise-bin] -
this created a problem here L118
-
-
110 108 exit 1 111 109 fi 112 110 111 [custom-frontend-url-ready-promise] 112 <= monitor-promise-base 113 module = check_command_execute 114 name = custom_frontend_ready_promise.py 115 config-command = $${custom-frontend-url-ready-promise-bin:rendered} 116 113 117 [publish-connection-information] 114 118 custom-frontend-url = $${custom-frontend-url-ready-promise:url} -
Edited
here:
[2019-11-28 19:51:36,477] INFO Installing switch_softwaretype. [2019-11-28 19:51:36,477] INFO switch_softwaretype: Invoking commandline : '/opt/slapgrid/633edf3510136e903494ec350a9bd818/bin/buildout -U -c /srv/slapgrid/slappart11/buildout-switch_softwaretype.cfg' [2019-11-28 19:51:36,477] INFO While: [2019-11-28 19:51:36,477] INFO Installing. [2019-11-28 19:51:36,477] INFO Getting section publish-connection-information. [2019-11-28 19:51:36,477] INFO Initializing section publish-connection-information. [2019-11-28 19:51:36,478] INFO Getting option publish-connection-information:custom-frontend-url. [2019-11-28 19:51:36,478] INFO Error: Referenced option does not exist: custom-frontend-url-ready-promise url
-
-
-
In order to fix, I suggest this commit : tomo/slapos@a514a2b3
I tested in production and it works
-
I will pick up your commit, add a test for it and will push it on nexedi/master ASAP. Thanks for catching this issue!
-
-
Please register or sign in to post a comment