Skip to content

Commit

Permalink
Fix CursorResourceManager.close (#1440) (#1447)
Browse files Browse the repository at this point in the history
  • Loading branch information
stIncMale authored Jul 12, 2024
1 parent a8b686d commit 251041b
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void endOperation() {
void close() {
boolean doClose = withLock(lock, () -> {
State localState = state;
if (localState == State.OPERATION_IN_PROGRESS) {
if (localState.inProgress()) {
state = State.CLOSE_PENDING;
} else if (localState != State.CLOSED) {
state = State.CLOSED;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright 2008-present MongoDB, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.mongodb.internal.operation;

import com.mongodb.MongoNamespace;
import com.mongodb.ServerCursor;
import com.mongodb.internal.binding.AsyncConnectionSource;
import com.mongodb.internal.binding.ReferenceCounted;
import com.mongodb.internal.connection.Connection;
import com.mongodb.internal.mockito.MongoMockito;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.Mockito.when;

final class CursorResourceManagerTest {
@Test
void doubleCloseExecutedConcurrentlyWithOperationBeingInProgressShouldNotFail() {
CursorResourceManager<?, ?> cursorResourceManager = new CursorResourceManager<ReferenceCounted, ReferenceCounted>(
new MongoNamespace("db", "coll"),
MongoMockito.mock(AsyncConnectionSource.class, mock -> {
when(mock.retain()).thenReturn(mock);
when(mock.release()).thenReturn(1);
}),
null,
MongoMockito.mock(ServerCursor.class)) {
@Override
void markAsPinned(final ReferenceCounted connectionToPin, final Connection.PinningMode pinningMode) {
}

@Override
void doClose() {
}
};
cursorResourceManager.tryStartOperation();
try {
assertDoesNotThrow(() -> {
cursorResourceManager.close();
cursorResourceManager.close();
cursorResourceManager.setServerCursor(null);
});
} finally {
cursorResourceManager.endOperation();
}
}
}

0 comments on commit 251041b

Please sign in to comment.