fix(storage): delete storage fails if a panic occurred during initial…

…ization (AlistGo#7501) * fix(storage): store storages map when init storage panic * fix(drivers): add nil check to drop method
xrgzs · Nov 16, 2024 · 08a1707 · 08a1707
1 parent a5a2661
commit 08a1707
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/drivers/chaoxing/driver.go b/drivers/chaoxing/driver.go
@@ -67,7 +67,9 @@ func (d *ChaoXing) Init(ctx context.Context) error {
 }
 
 func (d *ChaoXing) Drop(ctx context.Context) error {
-	d.cron.Stop()
+	if d.cron != nil {
+		d.cron.Stop()
+	}
 	return nil
 }
 

diff --git a/drivers/vtencent/drive.go b/drivers/vtencent/drive.go
@@ -55,7 +55,9 @@ func (d *Vtencent) Init(ctx context.Context) error {
 }
 
 func (d *Vtencent) Drop(ctx context.Context) error {
-	d.cron.Stop()
+	if d.cron != nil {
+		d.cron.Stop()
+	}
 	return nil
 }
 

diff --git a/internal/op/storage.go b/internal/op/storage.go
@@ -101,7 +101,7 @@ func initStorage(ctx context.Context, storage model.Storage, storageDriver drive
 			log.Errorf("panic init storage: %s", errInfo)
 			driverStorage.SetStatus(errInfo)
 			MustSaveDriverStorage(storageDriver)
-			storagesMap.Delete(driverStorage.MountPath)
+			storagesMap.Store(driverStorage.MountPath, storageDriver)
 		}
 	}()
 	// Unmarshal Addition