From 7061282e08b13b6cd73a22ea5d256a1a1aaf4ce2 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Mon, 6 Apr 2020 01:06:52 +0200 Subject: [PATCH] endpoint: rename abstraction super-"classes" --- ...straction_cursor_and_last_received_hold.go | 4 +-- endpoint/endpoint_zfs_abstraction_step.go | 8 ++--- endpoint/endpoint_zfs_helpers_types.go | 36 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/endpoint/endpoint_zfs_abstraction_cursor_and_last_received_hold.go b/endpoint/endpoint_zfs_abstraction_cursor_and_last_received_hold.go index 3f09ba4..f275002 100644 --- a/endpoint/endpoint_zfs_abstraction_cursor_and_last_received_hold.go +++ b/endpoint/endpoint_zfs_abstraction_cursor_and_last_received_hold.go @@ -314,7 +314,7 @@ func ReplicationCursorV2Extractor(fs *zfs.DatasetPath, v zfs.FilesystemVersion) // TODO log this possibly tinkered-with bookmark return nil } - return &ListHoldsAndBookmarksOutputBookmark{ + return &bookmarkBasedAbstraction{ Type: AbstractionReplicationCursorBookmarkV2, FS: fs.ToString(), FilesystemVersion: v, @@ -351,7 +351,7 @@ func LastReceivedHoldExtractor(fs *zfs.DatasetPath, v zfs.FilesystemVersion, hol jobID, err := ParseLastReceivedHoldTag(holdTag) if err == nil { - return &ListHoldsAndBookmarksOutputHold{ + return &holdBasedAbstraction{ Type: AbstractionLastReceivedHold, FS: fs.ToString(), FilesystemVersion: v, diff --git a/endpoint/endpoint_zfs_abstraction_step.go b/endpoint/endpoint_zfs_abstraction_step.go index 61e57dd..029e9c5 100644 --- a/endpoint/endpoint_zfs_abstraction_step.go +++ b/endpoint/endpoint_zfs_abstraction_step.go @@ -75,7 +75,7 @@ func HoldStep(ctx context.Context, fs string, v zfs.FilesystemVersion, jobID Job return nil, errors.Wrap(err, "step hold: zfs") } - return &ListHoldsAndBookmarksOutputHold{ + return &holdBasedAbstraction{ Type: AbstractionStepHold, FS: fs, Tag: tag, @@ -105,7 +105,7 @@ func HoldStep(ctx context.Context, fs string, v zfs.FilesystemVersion, jobID Job } return nil, errors.Wrap(err, "create step bookmark: zfs") } - return &ListHoldsAndBookmarksOutputBookmark{ + return &bookmarkBasedAbstraction{ Type: AbstractionStepBookmark, FS: fs, FilesystemVersion: v, @@ -251,7 +251,7 @@ func StepBookmarkExtractor(fs *zfs.DatasetPath, v zfs.FilesystemVersion) (_ Abst return nil } if err == nil { - bm := &ListHoldsAndBookmarksOutputBookmark{ + bm := &bookmarkBasedAbstraction{ Type: AbstractionStepBookmark, FS: fs.ToString(), FilesystemVersion: v, @@ -271,7 +271,7 @@ func StepHoldExtractor(fs *zfs.DatasetPath, v zfs.FilesystemVersion, holdTag str jobID, err := ParseStepHoldTag(holdTag) if err == nil { - return &ListHoldsAndBookmarksOutputHold{ + return &holdBasedAbstraction{ Type: AbstractionStepHold, FS: fs.ToString(), Tag: holdTag, diff --git a/endpoint/endpoint_zfs_helpers_types.go b/endpoint/endpoint_zfs_helpers_types.go index b3f4eaf..c0892b2 100644 --- a/endpoint/endpoint_zfs_helpers_types.go +++ b/endpoint/endpoint_zfs_helpers_types.go @@ -10,38 +10,38 @@ import ( "github.com/zrepl/zrepl/zfs" ) -type ListHoldsAndBookmarksOutputBookmark struct { +type bookmarkBasedAbstraction struct { Type AbstractionType FS string zfs.FilesystemVersion JobID JobID } -func (b ListHoldsAndBookmarksOutputBookmark) GetType() AbstractionType { return b.Type } -func (b ListHoldsAndBookmarksOutputBookmark) GetFS() string { return b.FS } -func (b ListHoldsAndBookmarksOutputBookmark) GetJobID() *JobID { return &b.JobID } -func (b ListHoldsAndBookmarksOutputBookmark) GetFullPath() string { +func (b bookmarkBasedAbstraction) GetType() AbstractionType { return b.Type } +func (b bookmarkBasedAbstraction) GetFS() string { return b.FS } +func (b bookmarkBasedAbstraction) GetJobID() *JobID { return &b.JobID } +func (b bookmarkBasedAbstraction) GetFullPath() string { return fmt.Sprintf("%s#%s", b.FS, b.Name) // TODO use zfs.FilesystemVersion.ToAbsPath } -func (b ListHoldsAndBookmarksOutputBookmark) MarshalJSON() ([]byte, error) { +func (b bookmarkBasedAbstraction) MarshalJSON() ([]byte, error) { return json.Marshal(AbstractionJSON{b}) } -func (b ListHoldsAndBookmarksOutputBookmark) String() string { +func (b bookmarkBasedAbstraction) String() string { return fmt.Sprintf("%s %s", b.Type, b.GetFullPath()) } -func (b ListHoldsAndBookmarksOutputBookmark) GetFilesystemVersion() zfs.FilesystemVersion { +func (b bookmarkBasedAbstraction) GetFilesystemVersion() zfs.FilesystemVersion { return b.FilesystemVersion } -func (b ListHoldsAndBookmarksOutputBookmark) Destroy(ctx context.Context) error { +func (b bookmarkBasedAbstraction) Destroy(ctx context.Context) error { if err := zfs.ZFSDestroyIdempotent(ctx, b.GetFullPath()); err != nil { return errors.Wrapf(err, "destroy %s: zfs", b) } return nil } -type ListHoldsAndBookmarksOutputHold struct { +type holdBasedAbstraction struct { Type AbstractionType FS string zfs.FilesystemVersion @@ -49,24 +49,24 @@ type ListHoldsAndBookmarksOutputHold struct { JobID JobID } -func (h ListHoldsAndBookmarksOutputHold) GetType() AbstractionType { return h.Type } -func (h ListHoldsAndBookmarksOutputHold) GetFS() string { return h.FS } -func (h ListHoldsAndBookmarksOutputHold) GetJobID() *JobID { return &h.JobID } -func (h ListHoldsAndBookmarksOutputHold) GetFullPath() string { +func (h holdBasedAbstraction) GetType() AbstractionType { return h.Type } +func (h holdBasedAbstraction) GetFS() string { return h.FS } +func (h holdBasedAbstraction) GetJobID() *JobID { return &h.JobID } +func (h holdBasedAbstraction) GetFullPath() string { return fmt.Sprintf("%s@%s", h.FS, h.GetName()) // TODO use zfs.FilesystemVersion.ToAbsPath } -func (h ListHoldsAndBookmarksOutputHold) MarshalJSON() ([]byte, error) { +func (h holdBasedAbstraction) MarshalJSON() ([]byte, error) { return json.Marshal(AbstractionJSON{h}) } -func (h ListHoldsAndBookmarksOutputHold) String() string { +func (h holdBasedAbstraction) String() string { return fmt.Sprintf("%s %q on %s", h.Type, h.Tag, h.GetFullPath()) } -func (h ListHoldsAndBookmarksOutputHold) GetFilesystemVersion() zfs.FilesystemVersion { +func (h holdBasedAbstraction) GetFilesystemVersion() zfs.FilesystemVersion { return h.FilesystemVersion } -func (h ListHoldsAndBookmarksOutputHold) Destroy(ctx context.Context) error { +func (h holdBasedAbstraction) Destroy(ctx context.Context) error { if err := zfs.ZFSRelease(ctx, h.Tag, h.GetFullPath()); err != nil { return errors.Wrapf(err, "release %s: zfs", h) }