Merge pull request #86 from kakao/fix-dup-register-logstream

fix(mr): handle duplicated RegisterLogStream(#62)
kakao · Aug 26, 2022 · 16a35ea · 16a35ea
2 parents 9870ad2 + 861b3b0
commit 16a35ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/internal/metarepos/raft_metadata_repository.go b/internal/metarepos/raft_metadata_repository.go
@@ -135,6 +135,7 @@ func NewRaftMetadataRepository(options *MetadataRepositoryOptions) *RaftMetadata
 		sw:                stopwaiter.New(),
 		tmStub:            tmStub,
 		topicEndPos:       make(map[types.TopicID]int),
+		requestNum:        uint64(time.Now().UnixNano()),
 	}
 
 	mr.storage = NewMetadataStorage(mr.sendAck, options.SnapCount, mr.logger.Named("storage"))

diff --git a/internal/metarepos/storage.go b/internal/metarepos/storage.go
@@ -431,6 +431,11 @@ func (ms *MetadataStorage) registerLogStream(ls *varlogpb.LogStreamDescriptor) e
 		return verrors.ErrAlreadyExists
 	}
 
+	if equal {
+		// To ensure that it is applied to the meta cache
+		return nil
+	}
+
 	_, cur := ms.getStateMachine()
 
 	ms.mtMu.Lock()