From fe22b633bbfdc8c5b60799e007c9a887acc73686 Mon Sep 17 00:00:00 2001 From: Nate Maninger Date: Fri, 3 May 2024 08:13:24 -0700 Subject: [PATCH 1/2] sqlite: default pinned settings when unset --- persist/sqlite/settings.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/persist/sqlite/settings.go b/persist/sqlite/settings.go index 28f11f9a..7a96f8bd 100644 --- a/persist/sqlite/settings.go +++ b/persist/sqlite/settings.go @@ -23,7 +23,10 @@ FROM host_pinned_settings;` err = s.queryRow(query).Scan(&pinned.Currency, &pinned.Threshold, &pinned.Storage.Pinned, &pinned.Storage.Value, &pinned.Ingress.Pinned, &pinned.Ingress.Value, &pinned.Egress.Pinned, &pinned.Egress.Value, &pinned.MaxCollateral.Pinned, &pinned.MaxCollateral.Value) if errors.Is(err, sql.ErrNoRows) { - return pin.PinnedSettings{}, nil + return pin.PinnedSettings{ + Currency: "usd", + Threshold: 0.02, + }, nil } return } From c6f1ae040d97037b7e99bdcb3914e1b2309953b0 Mon Sep 17 00:00:00 2001 From: Nate Maninger Date: Fri, 3 May 2024 08:37:10 -0700 Subject: [PATCH 2/2] storage: fix volume NDFs --- host/storage/storage.go | 114 ++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 58 deletions(-) diff --git a/host/storage/storage.go b/host/storage/storage.go index e603810a..1167ba7c 100644 --- a/host/storage/storage.go +++ b/host/storage/storage.go @@ -461,8 +461,6 @@ func (vm *VolumeManager) AddVolume(ctx context.Context, localPath string, maxSec vm.vs.SetAvailable(volumeID, true) go func() { - defer vol.SetStatus(VolumeStatusReady) - log := vm.log.Named("initialize").With(zap.Int64("volumeID", volumeID), zap.Uint64("maxSectors", maxSectors)) start := time.Now() @@ -486,7 +484,7 @@ func (vm *VolumeManager) AddVolume(ctx context.Context, localPath string, maxSec alert.Severity = alerts.SeverityInfo } vm.a.Register(alert) - + vol.SetStatus(VolumeStatusReady) select { case result <- err: default: @@ -565,8 +563,6 @@ func (vm *VolumeManager) RemoveVolume(ctx context.Context, id int64, force bool, } go func() { - defer vol.SetStatus(oldStatus) - var migrated, failed int updateRemovalAlert := func(message string, severity alerts.Severity, err error) { @@ -580,53 +576,56 @@ func (vm *VolumeManager) RemoveVolume(ctx context.Context, id int64, force bool, vm.a.Register(alert) } - migrated, failed, err := vm.vs.MigrateSectors(ctx, id, 0, func(newLoc SectorLocation) error { - err := vm.migrateSector(newLoc) + doMigration := func() error { + migrated, failed, err = vm.vs.MigrateSectors(ctx, id, 0, func(newLoc SectorLocation) error { + err := vm.migrateSector(newLoc) + if err != nil { + failed++ + } else { + migrated++ + } + updateRemovalAlert("Removing volume", alerts.SeverityInfo, nil) // error is ignored during migration + return err + }) if err != nil { - failed++ - } else { - migrated++ + log.Error("failed to migrate sectors", zap.Error(err)) + // update the alert + updateRemovalAlert("Failed to remove volume", alerts.SeverityError, err) + return err + } else if !force && failed > 0 { + updateRemovalAlert("Failed to remove volume", alerts.SeverityError, ErrMigrationFailed) + return ErrMigrationFailed } - updateRemovalAlert("Removing volume", alerts.SeverityInfo, nil) // error is ignored during migration - return err - }) - if err != nil { - log.Error("failed to migrate sectors", zap.Error(err)) - // update the alert - updateRemovalAlert("Failed to remove volume", alerts.SeverityError, err) - result <- err - return - } else if !force && failed > 0 { - updateRemovalAlert("Failed to remove volume", alerts.SeverityError, ErrMigrationFailed) - result <- ErrMigrationFailed - return - } - // remove the volume from the volume store - if err := vm.vs.RemoveVolume(id, force); err != nil { - log.Error("failed to remove volume", zap.Error(err)) - // update the alert - updateRemovalAlert("Failed to remove volume", alerts.SeverityError, err) - result <- err - return + // remove the volume from the volume store + if err := vm.vs.RemoveVolume(id, force); err != nil { + log.Error("failed to remove volume", zap.Error(err)) + // update the alert + updateRemovalAlert("Failed to remove volume", alerts.SeverityError, err) + return err + } + delete(vm.volumes, id) + + // close the volume file and remove it from disk + if err := vol.Close(); err != nil { + log.Error("failed to close volume", zap.Error(err)) + updateRemovalAlert("Failed to close volume files", alerts.SeverityError, err) + return err + } else if err := os.Remove(stat.LocalPath); err != nil && !errors.Is(err, os.ErrNotExist) { + log.Error("failed to remove volume file", zap.Error(err)) + updateRemovalAlert("Failed to delete volume file", alerts.SeverityError, err) + return err + } + updateRemovalAlert("Volume removed", alerts.SeverityInfo, nil) + return nil } - delete(vm.volumes, id) - // close the volume file and remove it from disk - if err := vol.Close(); err != nil { - log.Error("failed to close volume", zap.Error(err)) - updateRemovalAlert("Failed to close volume files", alerts.SeverityError, err) - result <- err - return - } else if err := os.Remove(stat.LocalPath); err != nil && !errors.Is(err, os.ErrNotExist) { - log.Error("failed to remove volume file", zap.Error(err)) - updateRemovalAlert("Failed to delete volume file", alerts.SeverityError, err) - result <- err - return + err := doMigration() + vol.SetStatus(oldStatus) + select { + case result <- err: + default: } - - updateRemovalAlert("Volume removed", alerts.SeverityInfo, nil) - result <- nil }() return nil @@ -670,20 +669,12 @@ func (vm *VolumeManager) ResizeVolume(ctx context.Context, id int64, maxSectors go func() { log := vm.log.Named("resize").With(zap.Int64("volumeID", id)) - - defer func() { - if resetReadOnly { - // reset the volume to read-write - if err := vm.vs.SetReadOnly(id, false); err != nil { - vm.log.Error("failed to set volume to read-write", zap.Error(err)) - } - } - vol.SetStatus(VolumeStatusReady) - }() - ctx, cancel, err := vm.tg.AddContext(ctx) if err != nil { - result <- err + select { + case result <- err: + default: + } return } defer cancel() @@ -722,6 +713,13 @@ func (vm *VolumeManager) ResizeVolume(ctx context.Context, id int64, maxSectors alert.Severity = alerts.SeverityInfo } vm.a.Register(alert) + if resetReadOnly { + // reset the volume to read-write + if err := vm.vs.SetReadOnly(id, false); err != nil { + vm.log.Error("failed to set volume to read-write", zap.Error(err)) + } + } + vol.SetStatus(VolumeStatusReady) select { case result <- err: default: