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.

Sign up for GitHub

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

Jump to bottom

Speed up repair test #3931

Merged
merged 3 commits into from
Aug 6, 2024
Merged

Speed up repair test #3931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06608bb
fix(repair_test): reduce the amount of tablets to gain speed
Michal-Leszczynski Jul 16, 2024
e22dd7d
feat(.github/cfg): delete old workflows on generation
Michal-Leszczynski Jul 16, 2024
f9ceb74
feat(.github/cfg): don't test tablets on Scylla 2024.1 as they are st…
Michal-Leszczynski Jul 16, 2024
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
9 changes: 2 additions & 7 deletions .github/cfg/integration-test-cfg.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,12 @@
- scylla-version: scylla-enterprise:2024.1.5
ip-family: IPV4
raft-schema: none
tablets: disabled

- scylla-version: scylla-enterprise:2024.1.5
ip-family: IPV4
raft-schema: none
tablets: enabled
tablets: none

- scylla-version: scylla-enterprise:2024.1.5
ip-family: IPV6
raft-schema: none
tablets: enabled
tablets: none

- scylla-version: scylla:6.0.1
ip-family: IPV4
Expand Down
14 changes: 13 additions & 1 deletion .github/cfg/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ func (cfg integrationTestCfg) scyllaVersion() string {

// This is a simple script used to generate workflow files by applying
// each config from './integration-test-cfg.yaml' onto './integration-test-core.yaml'.
// Note that this script does not delete any existing workflows.
// It also prints github badges syntax that can be pasted into the README.md file.
// It has to be run from the same dir with 'go run main.go' command.
func main() {
Expand All @@ -62,6 +61,19 @@ func main() {
panic(err)
}

// Remove previous integration-test workflows
entries, err := os.ReadDir("../workflows")
if err != nil {
panic(err)
}
for _, e := range entries {
if strings.HasPrefix(e.Name(), "integration-test") {
if err := os.Remove("../workflows/" + e.Name()); err != nil {
panic(err)
}
}
}

fmt.Println("Reference links to badges")
versionBadges := make(map[string][]string)
for _, cfg := range configs {
Expand Down
113 changes: 0 additions & 113 deletions .github/workflows/integration-tests-2024.1.5-IPV4-tablets.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-2024.1.5-IPV4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
scylla-version: scylla-enterprise:2024.1.5
ip-family: IPV4
raft-schema: none
tablets: disabled
tablets: none
jobs:
backup:
name: Test backup
Expand Down
4 changes: 2 additions & 2 deletions ...egration-tests-2024.1.5-IPV6-tablets.yaml → ...lows/integration-tests-2024.1.5-IPV6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
scylla-version: scylla-enterprise:2024.1.5
ip-family: IPV6
raft-schema: none
tablets: enabled
tablets: none
jobs:
backup:
name: Test backup
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
run: make pkg-integration-test PKG=./pkg/schema/migrate
- name: Run netwait tests
run: make pkg-integration-test PKG=./pkg/util/netwait
name: integration-tests-2024.1.5-IPV6-tablets
name: integration-tests-2024.1.5-IPV6
"on":
pull_request:
types:
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ Scylla Manager consists of tree components:
|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
| **latest-enterprise** | ![integration-tests-latest-enterprise-IPV4]<br/>![integration-tests-latest-enterprise-IPV4-tablets] | Restoration of **Authentication** and **Service Levels** is not supported<br/>Restoration of schema containing **Alternator** tables is not supported |
| **6.0.1** | ![integration-tests-6.0.1-IPV4]<br/>![integration-tests-6.0.1-IPV4-tablets]<br/>![integration-tests-6.0.1-IPV6-tablets] | Restoration of **Authentication** and **Service Levels** is not supported<br/>Restoration of schema containing **Alternator** tables is not supported |
| **2024.1.5** | ![integration-tests-2024.1.5-IPV4]<br/>![integration-tests-2024.1.5-IPV4-tablets]<br/>![integration-tests-2024.1.5-IPV6-tablets] | Restoration of schema into cluster with `consistant_cluster_management: true` is not supported |
| **2024.1.5** | ![integration-tests-2024.1.5-IPV4]<br/>![integration-tests-2024.1.5-IPV6] | Restoration of schema into cluster with `consistant_cluster_management: true` is not supported |
| **2023.1.9** | ![integration-tests-2023.1.9-IPV4]<br/>![integration-tests-2023.1.9-IPV4-raftschema]<br/>![integration-tests-2023.1.9-IPV6-raftschema] | Restoration of schema into cluster with `consistant_cluster_management: true` is not supported |

[integration-tests-2023.1.9-IPV4]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2023.1.9-IPV4.yaml/badge.svg?branch=master
[integration-tests-2023.1.9-IPV4-raftschema]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2023.1.9-IPV4-raftschema.yaml/badge.svg?branch=master
[integration-tests-2023.1.9-IPV6-raftschema]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2023.1.9-IPV6-raftschema.yaml/badge.svg?branch=master
[integration-tests-2024.1.5-IPV4]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2024.1.5-IPV4.yaml/badge.svg?branch=master
[integration-tests-2024.1.5-IPV4-tablets]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2024.1.5-IPV4-tablets.yaml/badge.svg?branch=master
[integration-tests-2024.1.5-IPV6-tablets]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2024.1.5-IPV6-tablets.yaml/badge.svg?branch=master
[integration-tests-2024.1.5-IPV6]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-2024.1.5-IPV6.yaml/badge.svg?branch=master
[integration-tests-6.0.1-IPV4]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-6.0.1-IPV4.yaml/badge.svg?branch=master
[integration-tests-6.0.1-IPV4-tablets]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-6.0.1-IPV4-tablets.yaml/badge.svg?branch=master
[integration-tests-6.0.1-IPV6-tablets]: https://github.com/scylladb/scylla-manager/actions/workflows/integration-tests-6.0.1-IPV6-tablets.yaml/badge.svg?branch=master
Expand Down
6 changes: 3 additions & 3 deletions pkg/service/repair/service_repair_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,9 +902,9 @@ func TestServiceRepairResumeAllRangesIntegration(t *testing.T) {
)

// Create keyspaces. Low RF increases repair parallelism.
tryCreateTabletKeyspace(t, clusterSession, ks1, 2, 1, 4096)
tryCreateTabletKeyspace(t, clusterSession, ks2, 1, 1, 4096)
tryCreateTabletKeyspace(t, clusterSession, ks3, 1, 1, 4096)
tryCreateTabletKeyspace(t, clusterSession, ks1, 2, 1, 256)
tryCreateTabletKeyspace(t, clusterSession, ks2, 1, 1, 256)
tryCreateTabletKeyspace(t, clusterSession, ks3, 1, 1, 256)
karol-kokoszka marked this conversation as resolved.
Show resolved Hide resolved

// Create and fill tables
WriteData(t, clusterSession, ks1, 1, t1)
Expand Down
Loading