From 852e5f7cbce6103874cb2b09e5e124276f298657 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 17 Sep 2020 21:50:52 -0700 Subject: [PATCH] filer: fix mongodb insert fix https://github.com/chrislusf/seaweedfs/issues/1471 --- weed/filer/mongodb/mongodb_store.go | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/weed/filer/mongodb/mongodb_store.go b/weed/filer/mongodb/mongodb_store.go index b7e855165..d20c6477a 100644 --- a/weed/filer/mongodb/mongodb_store.go +++ b/weed/filer/mongodb/mongodb_store.go @@ -95,6 +95,12 @@ func (store *MongodbStore) RollbackTransaction(ctx context.Context) error { func (store *MongodbStore) InsertEntry(ctx context.Context, entry *filer.Entry) (err error) { + return store.UpdateEntry(ctx, entry) + +} + +func (store *MongodbStore) UpdateEntry(ctx context.Context, entry *filer.Entry) (err error) { + dir, name := entry.FullPath.DirAndName() meta, err := entry.EncodeAttributesAndChunks() if err != nil { @@ -107,23 +113,19 @@ func (store *MongodbStore) InsertEntry(ctx context.Context, entry *filer.Entry) c := store.connect.Database(store.database).Collection(store.collectionName) - _, err = c.InsertOne(ctx, Model{ - Directory: dir, - Name: name, - Meta: meta, - }) + opts := options.Update().SetUpsert(true) + filter := bson.D{{"directory", dir}, {"name", name}} + update := bson.D{{"$set", bson.D{{"meta", meta}}}} + + _, err = c.UpdateOne(ctx, filter, update, opts) if err != nil { - return fmt.Errorf("InsertEntry %st: %v", entry.FullPath, err) + return fmt.Errorf("UpdateEntry %s: %v", entry.FullPath, err) } return nil } -func (store *MongodbStore) UpdateEntry(ctx context.Context, entry *filer.Entry) (err error) { - return store.InsertEntry(ctx, entry) -} - func (store *MongodbStore) FindEntry(ctx context.Context, fullpath util.FullPath) (entry *filer.Entry, err error) { dir, name := fullpath.DirAndName()