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

Test automatic stop mechanism #264

Merged
merged 22 commits into from
Mar 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
7 changes: 6 additions & 1 deletion task/az/resources/resource_virtual_machine_scale_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"fmt"
"net"
"regexp"
"time"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute"

Expand Down Expand Up @@ -249,8 +250,12 @@ func (v *VirtualMachineScaleSet) Read(ctx context.Context) error {
}
if scaleSetView.Statuses != nil {
for _, status := range *scaleSetView.Statuses {
statusTime := time.Unix(0, 0)
if status.Time != nil {
statusTime = status.Time.Time
}
v.Attributes.Events = append(v.Attributes.Events, common.Event{
Time: status.Time.Time,
Time: statusTime,
Code: to.String(status.Code),
Description: []string{
string(status.Level),
Expand Down
2 changes: 1 addition & 1 deletion task/common/machine/script.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ sudo tee /etc/systemd/system/tpi-task.service > /dev/null <<END
[Service]
Type=simple
ExecStart=/usr/bin/tpi-task
ExecStop=/bin/bash -c 'systemctl is-system-running | grep stopping || echo "{\\\\"result\\\\": \\\\"\$SERVICE_RESULT\\\\", \\\\"code\\\\": \\\\"\$EXIT_STATUS\\\\", \\\\"status\\\\": \\\\"\$EXIT_CODE\\\\"}" > "$TPI_LOG_DIRECTORY/status-$TPI_MACHINE_IDENTITY" && rclone copy "$TPI_LOG_DIRECTORY" "$RCLONE_REMOTE/reports"'
ExecStop=/bin/bash -c 'systemctl is-system-running | grep stopping || echo "{\\\\"result\\\\": \\\\"\$SERVICE_RESULT\\\\", \\\\"code\\\\": \\\\"\$EXIT_STATUS\\\\", \\\\"status\\\\": \\\\"\$EXIT_CODE\\\\"}" > "$TPI_LOG_DIRECTORY/status-$TPI_MACHINE_IDENTITY" && rclone copy "$TPI_LOG_DIRECTORY" "\$RCLONE_REMOTE/reports"'
ExecStopPost=/usr/bin/tpi-task-shutdown
Environment=HOME=/root
EnvironmentFile=/tmp/tpi-environment
Expand Down
48 changes: 21 additions & 27 deletions task/task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package task
import (
"context"
"os"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -48,8 +49,8 @@ func TestTask(t *testing.T) {
}

t.Run(string(provider), func(t *testing.T) {
oldData := gofakeit.Phrase()
newData := gofakeit.Phrase()
oldData := gofakeit.UUID()
newData := gofakeit.UUID()

dataDirectory := t.TempDir()
dataFile := filepath.Join(dataDirectory, "data")
Expand All @@ -75,20 +76,21 @@ func TestTask(t *testing.T) {
Environment: common.Environment{
Image: "ubuntu",
Script: `#!/bin/bash
echo "$ENVIRONMENT_VARIABLE_DATA" | tee --append data
sleep 60
cat data
echo "$ENVIRONMENT_VARIABLE_DATA" | tee data
`,
Variables: map[string]*string{
"ENVIRONMENT_VARIABLE_DATA": &newData,
},
Directory: dataDirectory,
Timeout: 10 * time.Minute,
Directory: dataDirectory,
DirectoryOut: dataDirectory,
Timeout: 10 * time.Minute,
},
Firewall: common.Firewall{
Ingress: common.FirewallRule{
Ports: &[]uint16{22},
},
// Egress: everything open.
},
Spot: common.SpotEnabled,
Parallelism: 1,
Expand Down Expand Up @@ -120,38 +122,30 @@ func TestTask(t *testing.T) {
require.Nil(t, err)

for _, log := range logs {
if assert.Contains(t, log, oldData) &&
assert.Contains(t, log, newData) {
if strings.Contains(log, oldData) &&
strings.Contains(log, newData) {
break loop
}
}

time.Sleep(10 * time.Second)
}

if provider == common.ProviderK8S {
require.Equal(t, newTask.Start(ctx), common.NotImplementedError)
require.Equal(t, newTask.Stop(ctx), common.NotImplementedError)
} else {
require.Nil(t, newTask.Stop(ctx))
require.Nil(t, newTask.Stop(ctx))

for assert.Nil(t, newTask.Read(ctx)) {
status, err := newTask.Status(ctx)
require.Nil(t, err)
if status[common.StatusCodeActive] > 0 {
break
}
}
}

require.Nil(t, newTask.Start(ctx))
require.Nil(t, newTask.Start(ctx))
for assert.Nil(t, newTask.Read(ctx)) {
status, err := newTask.Status(ctx)
require.Nil(t, err)

for assert.Nil(t, newTask.Read(ctx)) {
status, err := newTask.Status(ctx)
require.Nil(t, err)
if status[common.StatusCodeActive] == 0 {
break
}
if status[common.StatusCodeActive] == 0 &&
status[common.StatusCodeSucceeded] > 0 {
break
}

time.Sleep(10 * time.Second)
}

require.Nil(t, newTask.Delete(ctx))
Expand Down