Skip to content

Commit

Permalink
MB-47760 Delete s.muSnap.Unlock() calls from handleIndexMergeSnapshot()
Browse files Browse the repository at this point in the history
Backport to 7.0.1 from 7.1.0 MB-47749.

Change-Id: I4d128e721a6467cab3f53f8b7d9931fa9a02bf38
  • Loading branch information
cherkauer-couchbase committed Aug 5, 2021
1 parent c77b174 commit 6e28177
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions secondary/indexer/storage_manager.go
Expand Up @@ -1668,7 +1668,6 @@ func (s *storageMgr) handleIndexMergeSnapshot(cmd Message) {
//collection level while MAINT_STREAM works at bucket level.
/*
if !source.Timestamp().EqualOrGreater(target.Timestamp()) {
s.muSnap.Unlock()
s.supvCmdch <- &MsgError{
err: Error{code: ERROR_STORAGE_MGR_MERGE_SNAPSHOT_FAIL,
severity: FATAL,
Expand All @@ -1693,7 +1692,6 @@ func (s *storageMgr) handleIndexMergeSnapshot(cmd Message) {
}
}
if count != len(partitions) || count != len(source.Partitions()) {
s.muSnap.Unlock()
s.supvCmdch <- &MsgError{
err: Error{code: ERROR_STORAGE_MGR_MERGE_SNAPSHOT_FAIL,
severity: FATAL,
Expand All @@ -1717,7 +1715,6 @@ func (s *storageMgr) handleIndexMergeSnapshot(cmd Message) {
}

if found {
s.muSnap.Unlock()
s.supvCmdch <- &MsgError{
err: Error{code: ERROR_STORAGE_MGR_MERGE_SNAPSHOT_FAIL,
severity: FATAL,
Expand Down

0 comments on commit 6e28177

Please sign in to comment.