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

Set managed hash labels in manager tasks and only update tasks when managed hash changes #2142

Merged
merged 3 commits into from
Oct 14, 2024
Merged

Set managed hash labels in manager tasks and only update tasks when managed hash changes #2142

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
78b8653
Add Labels to manager tasks' statuses in ScyllaCluster API
rzetelskik Oct 3, 2024
82a78bc
Set managed hash labels in manager tasks and only update tasks when m…
rzetelskik Oct 7, 2024
e6eaa65
Update generated
rzetelskik Oct 7, 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
10 changes: 10 additions & 0 deletions deploy/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3221,6 +3221,11 @@ spec:
items:
type: string
type: array
labels:
additionalProperties:
type: string
description: labels reflects the labels of a task.
type: object
location:
description: location reflects a list of backup locations in the format [<dc>:]<provider>:<name> ex. s3:my-bucket.
items:
Expand Down Expand Up @@ -3405,6 +3410,11 @@ spec:
items:
type: string
type: array
labels:
additionalProperties:
type: string
description: labels reflects the labels of a task.
type: object
name:
description: name reflects the name of a task.
type: string
Expand Down
34 changes: 34 additions & 0 deletions docs/source/api-reference/groups/scylla.scylladb.com/scyllaclusters.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4801,6 +4801,9 @@ object
* - keyspace
- array (string)
- keyspace reflects a list of keyspace/tables glob patterns, e.g. 'keyspace,!keyspace.table_prefix_*' used to include or exclude keyspaces from repair.
* - :ref:`labels<api-scylla.scylladb.com-scyllaclusters-v1-.status.backups[].labels>`
- object
- labels reflects the labels of a task.
* - location
- array (string)
- location reflects a list of backup locations in the format [<dc>:]<provider>:<name> ex. s3:my-bucket.
Expand Down Expand Up @@ -4829,6 +4832,20 @@ object
- array (string)
- uploadParallel reflects a list of upload parallelism limits in the format [<dc>:]<limit>.

.. _api-scylla.scylladb.com-scyllaclusters-v1-.status.backups[].labels:

.status.backups[].labels
^^^^^^^^^^^^^^^^^^^^^^^^

Description
"""""""""""
labels reflects the labels of a task.

Type
""""
object


.. _api-scylla.scylladb.com-scyllaclusters-v1-.status.conditions[]:

.status.conditions[]
Expand Down Expand Up @@ -4933,6 +4950,9 @@ object
* - keyspace
- array (string)
- keyspace reflects a list of keyspace/tables glob patterns, e.g. 'keyspace,!keyspace.table_prefix_*' used to include or exclude keyspaces from repair.
* - :ref:`labels<api-scylla.scylladb.com-scyllaclusters-v1-.status.repairs[].labels>`
- object
- labels reflects the labels of a task.
* - name
- string
- name reflects the name of a task.
Expand All @@ -4952,6 +4972,20 @@ object
- string
- timezone reflects the timezone of cron field.

.. _api-scylla.scylladb.com-scyllaclusters-v1-.status.repairs[].labels:

.status.repairs[].labels
^^^^^^^^^^^^^^^^^^^^^^^^

Description
"""""""""""
labels reflects the labels of a task.

Type
""""
object


.. _api-scylla.scylladb.com-scyllaclusters-v1-.status.upgrade:

.status.upgrade
Expand Down
10 changes: 10 additions & 0 deletions pkg/api/scylla/v1/scylla.scylladb.com_scyllaclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2180,6 +2180,11 @@ spec:
items:
type: string
type: array
labels:
additionalProperties:
type: string
description: labels reflects the labels of a task.
type: object
location:
description: location reflects a list of backup locations in the format [<dc>:]<provider>:<name> ex. s3:my-bucket.
items:
Expand Down Expand Up @@ -2364,6 +2369,11 @@ spec:
items:
type: string
type: array
labels:
additionalProperties:
type: string
description: labels reflects the labels of a task.
type: object
name:
description: name reflects the name of a task.
type: string
Expand Down
4 changes: 4 additions & 0 deletions pkg/api/scylla/v1/types_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,10 @@ type TaskStatus struct {
// +optional
ID *string `json:"id,omitempty"`

// labels reflects the labels of a task.
// +optional
Labels map[string]string `json:"labels,omitempty"`

// error holds the task error, if any.
// +optional
Error *string `json:"error,omitempty"`
Expand Down
7 changes: 7 additions & 0 deletions pkg/api/scylla/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/controller/manager/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func (c *Controller) calculateStatus(sc *scyllav1.ScyllaCluster, managerState *s

managerTaskStatus, isInManagerState := managerState.RepairTasks[rt.Name]
if isInManagerState {
repairTaskStatus = scyllav1.RepairTaskStatus(managerTaskStatus)
repairTaskStatus = managerTaskStatus
} else {
// Retain the error from client.
err, hasClientError := repairTaskClientErrorMap[rt.Name]
Expand Down Expand Up @@ -62,7 +62,7 @@ func (c *Controller) calculateStatus(sc *scyllav1.ScyllaCluster, managerState *s

managerTaskStatus, isInManagerState := managerState.BackupTasks[bt.Name]
if isInManagerState {
backupTaskStatus = scyllav1.BackupTaskStatus(managerTaskStatus)
backupTaskStatus = managerTaskStatus
} else {
// Retain the error from client.
err, hasClientError := backupTaskClientErrorMap[bt.Name]
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/manager/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ func (c *Controller) getManagerState(ctx context.Context, clusterID string) (*st
return nil, err
}
var (
repairTasks map[string]RepairTaskStatus
backupTasks map[string]BackupTaskStatus
repairTasks map[string]scyllav1.RepairTaskStatus
backupTasks map[string]scyllav1.BackupTaskStatus
)

if clusterID != "" {
Expand All @@ -48,7 +48,7 @@ func (c *Controller) getManagerState(ctx context.Context, clusterID string) (*st
return nil, err
}

repairTasks = make(map[string]RepairTaskStatus, len(managerRepairTasks.TaskListItemSlice))
repairTasks = make(map[string]scyllav1.RepairTaskStatus, len(managerRepairTasks.TaskListItemSlice))
for _, managerRepairTask := range managerRepairTasks.TaskListItemSlice {
rts, err := NewRepairStatusFromManager(managerRepairTask)
if err != nil {
Expand All @@ -62,7 +62,7 @@ func (c *Controller) getManagerState(ctx context.Context, clusterID string) (*st
return nil, err
}

backupTasks = make(map[string]BackupTaskStatus, len(managerBackupTasks.TaskListItemSlice))
backupTasks = make(map[string]scyllav1.BackupTaskStatus, len(managerBackupTasks.TaskListItemSlice))
for _, managerBackupTask := range managerBackupTasks.TaskListItemSlice {
bts, err := NewBackupStatusFromManager(managerBackupTask)
if err != nil {
Expand Down
Loading