Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

USHIFT-5381: Check microshift.service for all healthchecks #4538

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions pkg/healthcheck/healthcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ func MicroShiftHealthcheck(ctx context.Context, timeout time.Duration) error {
}

func CustomWorkloadHealthcheck(ctx context.Context, timeout time.Duration, definition string) error {
if enabled, err := microshiftServiceShouldBeOk(ctx, timeout); err != nil {
printPrerunLog()
return err
} else if !enabled {
return nil
}

workloads := map[string]NamespaceWorkloads{}

err := json.Unmarshal([]byte(definition), &workloads)
Expand All @@ -47,6 +54,13 @@ func CustomWorkloadHealthcheck(ctx context.Context, timeout time.Duration, defin
}

func EasyCustomWorkloadHealthcheck(ctx context.Context, timeout time.Duration, namespace string, deployments, daemonsets, statefulsets []string) error {
if enabled, err := microshiftServiceShouldBeOk(ctx, timeout); err != nil {
printPrerunLog()
return err
} else if !enabled {
return nil
}

workloads := map[string]NamespaceWorkloads{
namespace: {
Deployments: deployments,
Expand Down
31 changes: 31 additions & 0 deletions test/suites/optional/healthchecks-disabled-service.robot
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
*** Settings ***
Documentation Test if healthcheck exits quickly when MicroShift service is disabled

Resource ../../resources/common.resource
Resource ../../resources/microshift-process.resource
Library DateTime

Suite Setup Setup Suite
Suite Teardown Teardown Suite


*** Test Cases ***
Healthchecks Should Exit Fast And Successful When MicroShift Is Disabled
[Documentation] When microshift.service is disabled, the healtchecks should
... exit quickly and without an error. They should not attempt to query API Server.
[Tags] ushift-5381
[Setup] Disable MicroShift
${before}= Get Current Date
${stdout} ${stderr} ${rc}= SSHLibrary.Execute Command
... /etc/greenboot/check/required.d/41_microshift_running_check_multus.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this for all the scripts in that directory except the main one?

... sudo=True
... return_rc=True
... return_stderr=True
... return_stdout=True
Should Be Equal As Integers 0 ${rc}
${after}= Get Current Date
Should Contain ${stderr} microshift.service is not enabled
${diff}= Subtract Date From Date ${after} ${before}
# Verify that the command returned very quickly - it didn't waste time trying to access API Server.
Should Be True ${diff} < 5 Multus healthcheck script took too long to finish
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need the time check? Is getting the right error message not enough?

[Teardown] Enable MicroShift