rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sql/snapshot: Bugfix

Browse source
This commit is contained in:
Tom Wiesing 2023-03-08 15:03:26 +01:00
parent 9d74397512
commit 4681f3c33d
No known key found for this signature in database
3 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/dis/component/sql/backup.go
View file

@ -18,7 +18,7 @@ func (*SQL) BackupName() string {
// Backup makes a backup of all SQL databases into the path dest. // Backup makes a backup of all SQL databases into the path dest.
func (sql *SQL) Backup(scontext component.StagingContext) error { func (sql *SQL) Backup(scontext component.StagingContext) error {
return scontext.AddFile("", func(ctx context.Context, file io.Writer) error { return scontext.AddFile("", func(ctx context.Context, file io.Writer) error {
code := sql.Stack().Exec(ctx, stream.NonInteractive(scontext.Progress()), "sql", "mysqldump", "--all-databases")() code := sql.Stack().Exec(ctx, stream.NewIOStream(file, scontext.Progress(), nil, 0), "sql", "mysqldump", "--all-databases")()
if code != 0 { if code != 0 {
return errSQLBackup return errSQLBackup
} }

2
internal/dis/component/sql/snapshot.go
View file

@ -23,7 +23,7 @@ func (sql *SQL) Snapshot(wisski models.Instance, scontext component.StagingConte
// SnapshotDB makes a backup of the sql database into dest. // SnapshotDB makes a backup of the sql database into dest.
func (sql *SQL) SnapshotDB(ctx context.Context, progress io.Writer, dest io.Writer, database string) error { func (sql *SQL) SnapshotDB(ctx context.Context, progress io.Writer, dest io.Writer, database string) error {
code := sql.Stack().Exec(ctx, stream.NonInteractive(progress), "sql", "mysqldump", "--databases", database)() code := sql.Stack().Exec(ctx, stream.NewIOStream(dest, progress, nil, 0), "sql", "mysqldump", "--databases", database)()
if code != 0 { if code != 0 {
return errSQLBackup return errSQLBackup
} }

3
internal/dis/component/sql/sql.go
View file

@ -7,7 +7,6 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/pkg/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/tkw1536/pkglib/lazy"
) )
type SQL struct { type SQL struct {
@ -19,8 +18,6 @@ type SQL struct {
ServerURL string // upstream server url ServerURL string // upstream server url
PollInterval time.Duration // duration to wait for during wait PollInterval time.Duration // duration to wait for during wait
lazyNetwork lazy.Lazy[string]
} }
var ( var (