Skip to content

Snapshot update #116

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

Merged
kwonkwonn merged 4 commits into from
Mar 27, 2026
Merged

Snapshot update #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
907c677
external_snapshor merge function
Jbchan01 Mar 17, 2026
bb08830
revert_anywere
Jbchan01 Mar 17, 2026
0b63881
refactor(snapshot) - separate files
Jbchan01 Mar 27, 2026
918fd9c
cleanup-.json file logic
Jbchan01 Mar 27, 2026
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
61 changes: 53 additions & 8 deletions api/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import (

virerr "github.com/easy-cloud-Knet/KWS_Core/internal/error"
httputil "github.com/easy-cloud-Knet/KWS_Core/pkg/httputil"
snapshotpkg "github.com/easy-cloud-Knet/KWS_Core/services/snapshot"
externalsnapshot "github.com/easy-cloud-Knet/KWS_Core/services/snapshot/external_snap"
internalsnapshot "github.com/easy-cloud-Knet/KWS_Core/services/snapshot/internal_snap"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -37,6 +38,16 @@ type ExternalSnapshotListResponse struct {
SnapNames []string `json:"SnapNames"`
}

type ExternalSnapshotMergeRequest struct {
UUID string `json:"UUID"`
Disk string `json:"Disk,omitempty"`
}

type ExternalSnapshotMergeResponse struct {
UUID string `json:"UUID"`
MergedDisks []string `json:"MergedDisks"`
}

// CreateSnapshot creates a snapshot for the specified domain UUID
func (i *InstHandler) CreateSnapshot(w http.ResponseWriter, r *http.Request) {
param := &SnapshotRequest{}
Expand All @@ -63,7 +74,7 @@ func (i *InstHandler) CreateSnapshot(w http.ResponseWriter, r *http.Request) {
return
}

snapName, err := snapshotpkg.CreateSnapshot(dom, name, &snapshotpkg.SnapshotOptions{
snapName, err := internalsnapshot.CreateSnapshot(dom, name, &internalsnapshot.SnapshotOptions{
Description: param.Description,
Quiesce: param.Quiesce,
})
Expand Down Expand Up @@ -104,7 +115,7 @@ func (i *InstHandler) CreateExternalSnapshot(w http.ResponseWriter, r *http.Requ
}

snapName := name
createdName, err := snapshotpkg.CreateExternalSnapshot(dom, name, &snapshotpkg.ExternalSnapshotOptions{
createdName, err := externalsnapshot.CreateExternalSnapshot(dom, name, &externalsnapshot.ExternalSnapshotOptions{
BaseDir: param.BaseDir,
Description: param.Description,
Quiesce: param.Quiesce,
Expand Down Expand Up @@ -144,7 +155,7 @@ func (i *InstHandler) ListExternalSnapshots(w http.ResponseWriter, r *http.Reque
return
}

names, err := snapshotpkg.ListExternalSnapshots(dom)
names, err := externalsnapshot.ListExternalSnapshots(dom)
if err != nil {
resp.ResponseWriteErr(w, err, http.StatusInternalServerError)
i.Logger.Error("external snapshot list failed", zap.String("domain_uuid", param.UUID), zap.Error(err))
Expand Down Expand Up @@ -183,7 +194,7 @@ func (i *InstHandler) RevertExternalSnapshot(w http.ResponseWriter, r *http.Requ
return
}

if err := snapshotpkg.RevertExternalSnapshot(dom, param.Name); err != nil {
if err := externalsnapshot.RevertExternalSnapshot(dom, param.Name); err != nil {
resp.ResponseWriteErr(w, err, http.StatusInternalServerError)
i.Logger.Error("external snapshot revert failed", zap.String("domain_uuid", param.UUID), zap.String("snapshot_name", param.Name), zap.Error(err))
return
Expand All @@ -196,6 +207,40 @@ func (i *InstHandler) RevertExternalSnapshot(w http.ResponseWriter, r *http.Requ
})
}

// MergeExternalSnapshot merges active external snapshot layers into backing files.
func (i *InstHandler) MergeExternalSnapshot(w http.ResponseWriter, r *http.Request) {
param := &ExternalSnapshotMergeRequest{}
resp := httputil.ResponseGen[ExternalSnapshotMergeResponse]("Merge External Snapshot")

if err := httputil.HttpDecoder(r, param); err != nil {
resp.ResponseWriteErr(w, err, http.StatusInternalServerError)
i.Logger.Error("external snapshot merge decode failed", zap.Error(err))
return
}

i.Logger.Info("external snapshot merge start", zap.String("domain_uuid", param.UUID), zap.String("disk", param.Disk))

dom, err := i.DomainControl.GetDomain(param.UUID)
if err != nil {
resp.ResponseWriteErr(w, err, http.StatusInternalServerError)
i.Logger.Error("external snapshot merge failed - domain not found", zap.String("domain_uuid", param.UUID), zap.Error(err))
return
}

mergedDisks, err := externalsnapshot.MergeExternalSnapshot(dom, param.Disk)
if err != nil {
resp.ResponseWriteErr(w, err, http.StatusInternalServerError)
i.Logger.Error("external snapshot merge failed", zap.String("domain_uuid", param.UUID), zap.String("disk", param.Disk), zap.Error(err))
return
}

i.Logger.Info("external snapshot merge success", zap.String("domain_uuid", param.UUID), zap.String("disk", param.Disk), zap.Int("merged_disk_count", len(mergedDisks)))
resp.ResponseWriteOK(w, &ExternalSnapshotMergeResponse{
UUID: param.UUID,
MergedDisks: mergedDisks,
})
}

// ListSnapshots returns all snapshot names for the specified domain UUID
func (i *InstHandler) ListSnapshots(w http.ResponseWriter, r *http.Request) {
param := &SnapshotRequest{}
Expand All @@ -216,7 +261,7 @@ func (i *InstHandler) ListSnapshots(w http.ResponseWriter, r *http.Request) {
return
}

names, err := snapshotpkg.ListSnapshots(dom)
names, err := internalsnapshot.ListSnapshots(dom)
if err != nil {
resp.ResponseWriteErr(w, err, http.StatusInternalServerError)
i.Logger.Error("snapshot list failed", zap.String("uuid", param.UUID), zap.Error(err))
Expand Down Expand Up @@ -252,7 +297,7 @@ func (i *InstHandler) RevertSnapshot(w http.ResponseWriter, r *http.Request) {
return
}

if err := snapshotpkg.RevertToSnapshot(dom, param.Name); err != nil {
if err := internalsnapshot.RevertToSnapshot(dom, param.Name); err != nil {
resp.ResponseWriteErr(w, err, http.StatusInternalServerError)
i.Logger.Error("snapshot revert failed", zap.String("uuid", param.UUID), zap.String("snapshot_name", param.Name), zap.Error(err))
return
Expand Down Expand Up @@ -287,7 +332,7 @@ func (i *InstHandler) DeleteSnapshot(w http.ResponseWriter, r *http.Request) {
return
}

if err := snapshotpkg.DeleteSnapshot(dom, param.Name); err != nil {
if err := internalsnapshot.DeleteSnapshot(dom, param.Name); err != nil {
resp.ResponseWriteErr(w, err, http.StatusInternalServerError)
i.Logger.Error("snapshot delete failed", zap.String("uuid", param.UUID), zap.String("snapshot_name", param.Name), zap.Error(err))
return
Expand Down
Binary file added doddle
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@kwonkwonn kwonkwonn Mar 27, 2026

Choose a reason for hiding this comment

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

바이너리가 붙어있네요

Binary file not shown.
1 change: 1 addition & 0 deletions internal/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func InitServer(portNum int, libvirtInst *api.InstHandler, logger *zap.Logger) {
mux.HandleFunc("GET /ListExternalSnapshots", libvirtInst.ListExternalSnapshots)
mux.HandleFunc("POST /RevertSnapshot", libvirtInst.RevertSnapshot)
mux.HandleFunc("POST /RevertExternalSnapshot", libvirtInst.RevertExternalSnapshot)
mux.HandleFunc("POST /MergeExternalSnapshot", libvirtInst.MergeExternalSnapshot)
mux.HandleFunc("POST /DeleteSnapshot", libvirtInst.DeleteSnapshot)

libvirtHandler := middleware.LibvirtMiddleware(libvirtInst.IsConnected, logger)(mux)
Expand Down
Loading
Loading