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

rbd: add types.Snapshot interface #4902

Merged
merged 2 commits into from
Oct 17, 2024
Merged
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
4 changes: 4 additions & 0 deletions internal/rbd/rbd_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -1641,6 +1641,10 @@ func (ri *rbdImage) GetCreationTime(ctx context.Context) (*time.Time, error) {
return nil, err
}

if ri.CreatedAt == nil {
return nil, fmt.Errorf("failed to get creation time for image %q", ri)
}

return ri.CreatedAt, nil
}

Expand Down
7 changes: 6 additions & 1 deletion internal/rbd/snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,16 @@ func (rbdSnap *rbdSnapshot) toVolume() *rbdVolume {
}

func (rbdSnap *rbdSnapshot) ToCSI(ctx context.Context) (*csi.Snapshot, error) {
created, err := rbdSnap.GetCreationTime(ctx)
if err != nil {
return nil, err
}

return &csi.Snapshot{
SizeBytes: rbdSnap.VolSize,
SnapshotId: rbdSnap.VolID,
SourceVolumeId: rbdSnap.SourceVolumeID,
CreationTime: timestamppb.New(*rbdSnap.CreatedAt),
CreationTime: timestamppb.New(*created),
ReadyToUse: true,
}, nil
}
Expand Down
38 changes: 38 additions & 0 deletions internal/rbd/types/snapshot.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
Copyright 2024 The Ceph-CSI Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package types

import (
"context"
"time"

"github.com/container-storage-interface/spec/lib/go/csi"
)

type Snapshot interface {
journalledObject

// Destroy frees the resources used by the Snapshot.
Destroy(ctx context.Context)

// Delete removes the snapshot from the storage backend.
Delete(ctx context.Context) error

ToCSI(ctx context.Context) (*csi.Snapshot, error)

GetCreationTime(ctx context.Context) (*time.Time, error)
}