Skip to content

GEODE-10106: Use queueConnection snapshot for if #7740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2022
Merged

GEODE-10106: Use queueConnection snapshot for if #7740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions geode-core/src/main/java/org/apache/geode/cache/client/internal/QueueManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,8 +862,7 @@ public void recoverPrimary(Set<ServerLocation> excludedServers) {
return;
}
final boolean isDebugEnabled = logger.isDebugEnabled();
if (queueConnections != null && queueConnections.getPrimary() != null
&& !queueConnections.getPrimary().isDestroyed()) {
if (!isPrimaryRecoveryNeeded(queueConnections)) {
if (isDebugEnabled) {
logger.debug("Primary recovery not needed");
}
Expand Down Expand Up @@ -966,6 +965,16 @@ public void recoverPrimary(Set<ServerLocation> excludedServers) {
}
}

static boolean isPrimaryRecoveryNeeded(final ConnectionList queueConnectionList) {
if (queueConnectionList != null) {
final Connection primaryConnection = queueConnectionList.getPrimary();
if (primaryConnection != null) {
return primaryConnection.isDestroyed();
}
}
return true;
}

private QueueConnectionImpl initializeQueueConnection(Connection connection, boolean isPrimary,
ClientUpdater failedUpdater) {
QueueConnectionImpl queueConnection = null;
Expand Down
37 changes: 37 additions & 0 deletions geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,19 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.util.HashSet;
import java.util.Set;

import org.junit.Before;
import org.junit.Test;
import org.mockito.InOrder;

import org.apache.geode.distributed.internal.ServerLocation;

public class QueueManagerImplTest {
private final InternalPool pool = mock(InternalPool.class, RETURNS_DEEP_STUBS);
private final Endpoint endpoint = mock(Endpoint.class);
Expand All @@ -39,6 +45,9 @@ public class QueueManagerImplTest {
private final ClientUpdater clientUpdater = mock(ClientUpdater.class);
private QueueManagerImpl queueManager;

private final QueueManagerImpl.ConnectionList queueConnections = mock(
QueueManagerImpl.ConnectionList.class);

@Before
public void setup() {
queueManager = new QueueManagerImpl(pool, null, null, null, 1, 1, null, null);
Expand All @@ -53,6 +62,34 @@ public void setup() {
when(backupEndpoint.isClosed()).thenReturn(false);
}

@Test
public void whenPrimaryIsNotDestroyedThenPrimaryRecoveryIsNotNeeded() {
assertThat(queueManager.addToConnectionList((primary), true)).isTrue();
when(primary.isDestroyed()).thenReturn(false);
when(pool.getPoolOrCacheCancelInProgress()).thenReturn(null);
Set<ServerLocation> excludedServers = new HashSet<>();
queueManager.recoverPrimary(excludedServers);
verify(pool, times(2)).getPoolOrCacheCancelInProgress();
}

@Test
public void whenPrimaryIsNullThenPrimaryRecoveryIsNeeded() {
assertThat(QueueManagerImpl.isPrimaryRecoveryNeeded(null)).isTrue();
}

@Test
public void whenConnectionListIsNullThenPrimaryRecoveryIsNeeded() {
when(queueConnections.getPrimary()).thenReturn(null);
assertThat(QueueManagerImpl.isPrimaryRecoveryNeeded(queueConnections)).isTrue();
}

@Test
public void whenPrimaryIsDestroyedThenPrimaryRecoveryIsNeeded() {
when(queueConnections.getPrimary()).thenReturn(primary);
when(primary.isDestroyed()).thenReturn(true);
assertThat(QueueManagerImpl.isPrimaryRecoveryNeeded(queueConnections)).isTrue();
}

@Test
public void addNoClientUpdaterConnectionToConnectionListReturnsFalse() {
when(primary.getUpdater()).thenReturn(null);
Expand Down