Skip to content

[store] Change the Restore action on objects to update instead of delete/create #2281

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
aaronlehmann merged 1 commit into from
Jun 23, 2017
Merged

[store] Change the Restore action on objects to update instead of delete/create #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 4 additions & 14 deletions manager/state/store/clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,11 @@ func init() {
return err
},
Restore: func(tx Tx, snapshot *api.StoreSnapshot) error {
clusters, err := FindClusters(tx, All)
if err != nil {
return err
toStoreObj := make([]api.StoreObject, len(snapshot.Clusters))
for i, x := range snapshot.Clusters {
toStoreObj[i] = x
}
for _, n := range clusters {
if err := DeleteCluster(tx, n.ID); err != nil {
return err
}
}
for _, n := range snapshot.Clusters {
if err := CreateCluster(tx, n); err != nil {
return err
}
}
return nil
return RestoreTable(tx, tableCluster, toStoreObj)
},
ApplyStoreAction: func(tx Tx, sa api.StoreAction) error {
switch v := sa.Target.(type) {
Expand Down
18 changes: 4 additions & 14 deletions manager/state/store/configs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,11 @@ func init() {
return err
},
Restore: func(tx Tx, snapshot *api.StoreSnapshot) error {
configs, err := FindConfigs(tx, All)
if err != nil {
return err
toStoreObj := make([]api.StoreObject, len(snapshot.Configs))
for i, x := range snapshot.Configs {
toStoreObj[i] = x
}
for _, s := range configs {
if err := DeleteConfig(tx, s.ID); err != nil {
return err
}
}
for _, s := range snapshot.Configs {
if err := CreateConfig(tx, s); err != nil {
return err
}
}
return nil
return RestoreTable(tx, tableConfig, toStoreObj)
},
ApplyStoreAction: func(tx Tx, sa api.StoreAction) error {
switch v := sa.Target.(type) {
Expand Down
26 changes: 12 additions & 14 deletions manager/state/store/extensions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,11 @@ func init() {
return err
},
Restore: func(tx Tx, snapshot *api.StoreSnapshot) error {
extensions, err := FindExtensions(tx, All)
if err != nil {
return err
toStoreObj := make([]api.StoreObject, len(snapshot.Extensions))
for i, x := range snapshot.Extensions {
toStoreObj[i] = extensionEntry{x}
}
for _, e := range extensions {
if err := DeleteExtension(tx, e.ID); err != nil {
return err
}
}
for _, e := range snapshot.Extensions {
if err := CreateExtension(tx, e); err != nil {
return err
}
}
return nil
return RestoreTable(tx, tableExtension, toStoreObj)
},
ApplyStoreAction: func(tx Tx, sa api.StoreAction) error {
switch v := sa.Target.(type) {
Expand Down Expand Up @@ -80,6 +70,14 @@ func (e extensionEntry) CopyStoreObject() api.StoreObject {
return extensionEntry{Extension: e.Extension.Copy()}
}

// ensure that when update events are emitted, we unwrap extensionEntry
func (e extensionEntry) EventUpdate(oldObject api.StoreObject) api.Event {
if oldObject != nil {
return api.EventUpdateExtension{Extension: e.Extension, OldExtension: oldObject.(extensionEntry).Extension}
}
return api.EventUpdateExtension{Extension: e.Extension}
}

// CreateExtension adds a new extension to the store.
// Returns ErrExist if the ID is already taken.
func CreateExtension(tx Tx, e *api.Extension) error {
Expand Down
Loading