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

Fix repair float intensity #3688

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Conversation

Michal-Leszczynski
Copy link
Collaborator

There are still some bugs (one described in the issue below) regarding using float intensity. In order to get rid of them, we should only tolerate float intensity at the entrypoint, but completely remove it from SM repair internals (both in service and progress display).

We keep float intensity in task properties and in swagger endpoint parameters, but we convert it to int intensity as a first thing in internals, which happens in:

  • GetTarget (from task properties)
  • sctool repair control endpoint (from query param)

Fixes #3665

@Michal-Leszczynski
Copy link
Collaborator Author

sctool progress output:

[miles@fedora scylla-manager]$ ./sctool repair -c myc --intensity 0.5
repair/7f3676d6-35ee-4958-9cb3-35f9a78e723e
[miles@fedora scylla-manager]$ ./sctool progress -c myc repair/7f3676d6-35ee-4958-9cb3-35f9a78e723e
Run:            51fc9f56-b3d2-11ee-ba36-0892040e83bb
Status:         RUNNING
Start time:     15 Jan 24 19:17:19 CET
Duration:       7s
Progress:       1%
Intensity:      1/1
Parallel:       3/3 (max)
Datacenters:    
  - dc1
  - dc2

╭───────────────────────────────┬────────────────────────────────┬──────────┬──────────╮
│ Keyspace                      │                          Table │ Progress │ Duration │
├───────────────────────────────┼────────────────────────────────┼──────────┼──────────┤
│ system_auth                   │                role_attributes │ 100%     │ 0s       │
│ system_auth                   │                   role_members │ 100%     │ 0s       │
│ system_auth                   │               role_permissions │ 100%     │ 0s       │
│ system_auth                   │                          roles │ 100%     │ 0s       │
├───────────────────────────────┼────────────────────────────────┼──────────┼──────────┤
│ system_distributed_everywhere │ cdc_generation_descriptions_v2 │ 0%       │ 0s       │
├───────────────────────────────┼────────────────────────────────┼──────────┼──────────┤
│ system_distributed            │      cdc_generation_timestamps │ 0%       │ 0s       │
│ system_distributed            │    cdc_streams_descriptions_v2 │ 0%       │ 0s       │
│ system_distributed            │                 service_levels │ 65%      │ 6s       │
│ system_distributed            │              view_build_status │ 0%       │ 0s       │
╰───────────────────────────────┴────────────────────────────────┴──────────┴──────────╯
[miles@fedora scylla-manager]$ ./sctool progress -c myc repair/7f3676d6-35ee-4958-9cb3-35f9a78e723e
Run:            51fc9f56-b3d2-11ee-ba36-0892040e83bb
Status:         DONE
Start time:     15 Jan 24 19:17:19 CET
End time:       15 Jan 24 19:17:58 CET
Duration:       39s
Progress:       100%
Intensity:      1
Parallel:       0
Datacenters:    
  - dc1
  - dc2

╭───────────────────────────────┬────────────────────────────────┬──────────┬──────────╮
│ Keyspace                      │                          Table │ Progress │ Duration │
├───────────────────────────────┼────────────────────────────────┼──────────┼──────────┤
│ system_auth                   │                role_attributes │ 100%     │ 0s       │
│ system_auth                   │                   role_members │ 100%     │ 0s       │
│ system_auth                   │               role_permissions │ 100%     │ 0s       │
│ system_auth                   │                          roles │ 100%     │ 0s       │
├───────────────────────────────┼────────────────────────────────┼──────────┼──────────┤
│ system_distributed_everywhere │ cdc_generation_descriptions_v2 │ 100%     │ 0s       │
├───────────────────────────────┼────────────────────────────────┼──────────┼──────────┤
│ system_distributed            │      cdc_generation_timestamps │ 100%     │ 9s       │
│ system_distributed            │    cdc_streams_descriptions_v2 │ 100%     │ 9s       │
│ system_distributed            │                 service_levels │ 100%     │ 10s      │
│ system_distributed            │              view_build_status │ 100%     │ 9s       │
╰───────────────────────────────┴────────────────────────────────┴──────────┴──────────╯

There are still some bugs (one described in the issue below) regarding using float intensity. In order to get rid of them, we should only tolerate float intensity at the entrypoint, but completely remove it from SM repair internals (both in service and progress display).

We keep float intensity in task properties and in swagger endpoint parameters, but we convert it to int intensity as a first thing in internals, which happens in:
- GetTarget (from task properties)
- sctool repair control endpoint (from query param)

Fixes #3665
Copy link
Collaborator

@karol-kokoszka karol-kokoszka left a comment

Choose a reason for hiding this comment

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

👍

@Michal-Leszczynski Michal-Leszczynski merged commit 0014876 into master Jan 17, 2024
41 checks passed
@Michal-Leszczynski Michal-Leszczynski deleted the ml/fix-repair-float-intensity branch January 17, 2024 11:22
@karol-kokoszka karol-kokoszka mentioned this pull request Feb 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Scylla manager setting intensity incorrectly when intensity is between 0 and 1
2 participants