feat: check if the name is duplicated

when add piece storage
ipfs-force-community · Jul 4, 2022 · b6d0bcc · b6d0bcc
1 parent b755d53
commit b6d0bcc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/api/impl/venus_market.go b/api/impl/venus_market.go
@@ -834,7 +834,10 @@ func (m MarketNodeImpl) AddFsPieceStorage(ctx context.Context, readonly bool, pa
 		return err
 	}
 	// add in memory
-	m.PieceStorageMgr.AddPieceStorage(fsps)
+	err = m.PieceStorageMgr.AddPieceStorage(fsps)
+	if err != nil {
+		return err
+	}
 
 	// add to config
 	return m.Config.AddFsPieceStorage(ifs)
@@ -847,7 +850,10 @@ func (m MarketNodeImpl) AddS3PieceStorage(ctx context.Context, readonly bool, en
 		return err
 	}
 	// add in memory
-	m.PieceStorageMgr.AddPieceStorage(s3ps)
+	err = m.PieceStorageMgr.AddPieceStorage(s3ps)
+	if err != nil {
+		return err
+	}
 
 	// add to config
 	return m.Config.AddS3PieceStorage(ifs)

diff --git a/config/config.go b/config/config.go
@@ -288,12 +288,12 @@ func (m *MarketConfig) RemovePieceStorage(name string) error {
 	return fmt.Errorf("piece storage %s not found", name)
 }
 
-func (cfg *MarketConfig) AddFsPieceStorage(fsps *FsPieceStorage) (err error) {
+func (cfg *MarketConfig) AddFsPieceStorage(fsps *FsPieceStorage) error {
 	cfg.PieceStorage.Fs = append(cfg.PieceStorage.Fs, fsps)
 	return SaveConfig(cfg)
 }
 
-func (cfg *MarketConfig) AddS3PieceStorage(fsps *S3PieceStorage) (err error) {
+func (cfg *MarketConfig) AddS3PieceStorage(fsps *S3PieceStorage) error {
 	cfg.PieceStorage.S3 = append(cfg.PieceStorage.S3, fsps)
 	return SaveConfig(cfg)
 }

diff --git a/piecestorage/storagemgr.go b/piecestorage/storagemgr.go
@@ -95,8 +95,20 @@ func (p *PieceStorageManager) AddMemPieceStorage(s IPieceStorage) {
 	p.storages = append(p.storages, s)
 }
 
-func (p *PieceStorageManager) AddPieceStorage(s IPieceStorage) {
+func (p *PieceStorageManager) AddPieceStorage(s IPieceStorage) error {
+	// check if storage already exist in manager and it's name is not empty
+	if s.GetName() == "" {
+		return fmt.Errorf("storage name is empty")
+	}
+	for _, st := range p.storages {
+		if st.GetName() == s.GetName() {
+			return fmt.Errorf("duplicate storage name: %s", s.GetName())
+		}
+	}
+
 	p.storages = append(p.storages, s)
+
+	return nil
 }
 
 func randStorageSelector(storages []IPieceStorage) (IPieceStorage, error) {