You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/04/18 23:28:37 UTC
[1/4] geode git commit: GEODE-2703: Improve exception message when
executing lucene within a transaction [Forced Update!]
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2632-1 2ef303ad2 -> ec15aed4e (forced update)
GEODE-2703: Improve exception message when executing lucene within a transaction
* Throw a LuceneQueryException instead of a TransactionException
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/10770973
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/10770973
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/10770973
Branch: refs/heads/feature/GEODE-2632-1
Commit: 10770973daa3ea2cd9dce2439a90f1242b6129b5
Parents: 1156011
Author: Jason Huynh <hu...@gmail.com>
Authored: Wed Apr 12 13:54:39 2017 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Tue Apr 18 14:39:10 2017 -0700
----------------------------------------------------------------------
.../cache/lucene/internal/LuceneQueryImpl.java | 11 +++++-
.../lucene/LuceneQueriesClientDUnitTest.java | 39 ++++++++++++++++++-
.../cache/lucene/LuceneQueriesDUnitTest.java | 40 ++++++++++++++++++++
3 files changed, 88 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/10770973/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
index 73d84d7..bfc561a 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneQueryImpl.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.TransactionException;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionException;
import org.apache.geode.cache.execute.FunctionService;
@@ -42,6 +43,8 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.logging.log4j.Logger;
public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> {
+ public static final String LUCENE_QUERY_CANNOT_BE_EXECUTED_WITHIN_A_TRANSACTION =
+ "Lucene Query cannot be executed within a transaction";
Logger logger = LogService.getLogger();
private int limit = LuceneQueryFactory.DEFAULT_LIMIT;
@@ -116,12 +119,18 @@ public class LuceneQueryImpl<K, V> implements LuceneQuery<K, V> {
} catch (FunctionException e) {
if (e.getCause() instanceof LuceneQueryException) {
throw new LuceneQueryException(e);
+ } else if (e.getCause() instanceof TransactionException) {
+ // When run from client with single hop disabled
+ throw new LuceneQueryException(LUCENE_QUERY_CANNOT_BE_EXECUTED_WITHIN_A_TRANSACTION);
} else if (e.getCause() instanceof RuntimeException) {
throw (RuntimeException) e.getCause();
}
throw e;
-
+ } catch (TransactionException e) {
+ // When function execution is run from server
+ throw new LuceneQueryException(LUCENE_QUERY_CANNOT_BE_EXECUTED_WITHIN_A_TRANSACTION);
}
+
return entries;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/10770973/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
index b0ae47e..e200a19 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
@@ -14,12 +14,15 @@
*/
package org.apache.geode.cache.lucene;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.REGION_NAME;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
@@ -30,6 +33,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
import org.junit.runner.RunWith;
import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
@Category(DistributedTest.class)
@RunWith(JUnitParamsRunner.class)
@@ -64,6 +68,39 @@ public class LuceneQueriesClientDUnitTest extends LuceneQueriesDUnitTest {
return new RegionTestableType[] {RegionTestableType.PARTITION_WITH_CLIENT};
}
+ // Due to singlehop transactions differences, the exception actually isn't thrown
+ // So the parent test behaves differently if singlehop is enabled or not for a client
+ @Test
+ @Parameters(method = "getListOfRegionTestTypes")
+ public void transactionWithLuceneQueriesShouldThrowException(RegionTestableType regionTestType) {
+ SerializableRunnableIF createIndex = () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndexFactory().addField("text").create(INDEX_NAME, REGION_NAME);
+ };
+ dataStore1.invoke(() -> initDataStore(createIndex, regionTestType));
+ dataStore2.invoke(() -> initDataStore(createIndex, regionTestType));
+ accessor.invoke(() -> initAccessor(createIndex, regionTestType));
+
+ putDataInRegion(accessor);
+ assertTrue(waitForFlushBeforeExecuteTextSearch(accessor, 60000));
+ assertTrue(waitForFlushBeforeExecuteTextSearch(dataStore1, 60000));
+
+ accessor.invoke(() -> {
+ Cache cache = getCache();
+ try {
+ LuceneService service = LuceneServiceProvider.get(cache);
+ LuceneQuery<Integer, TestObject> query;
+ query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world",
+ DEFAULT_FIELD);
+ cache.getCacheTransactionManager().begin();
+ PageableLuceneQueryResults<Integer, TestObject> results = query.findPages();
+ } finally {
+ cache.getCacheTransactionManager().rollback();
+ }
+ });
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/geode/blob/10770973/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
index d259205..c319a16 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesDUnitTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.*;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
+import org.apache.geode.cache.lucene.internal.LuceneQueryImpl;
import org.apache.geode.cache.lucene.test.LuceneTestUtilities;
import org.apache.geode.test.dunit.SerializableRunnableIF;
import org.apache.geode.test.dunit.VM;
@@ -30,6 +31,9 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
@@ -46,6 +50,42 @@ public class LuceneQueriesDUnitTest extends LuceneQueriesAccessorBase {
@Test
@Parameters(method = "getListOfRegionTestTypes")
+ public void transactionWithLuceneQueriesShouldThrowException(RegionTestableType regionTestType) {
+ SerializableRunnableIF createIndex = () -> {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ luceneService.createIndexFactory().addField("text").create(INDEX_NAME, REGION_NAME);
+ };
+ dataStore1.invoke(() -> initDataStore(createIndex, regionTestType));
+ dataStore2.invoke(() -> initDataStore(createIndex, regionTestType));
+ accessor.invoke(() -> initAccessor(createIndex, regionTestType));
+
+ putDataInRegion(accessor);
+ assertTrue(waitForFlushBeforeExecuteTextSearch(accessor, 60000));
+ assertTrue(waitForFlushBeforeExecuteTextSearch(dataStore1, 60000));
+
+ accessor.invoke(() -> {
+ Cache cache = getCache();
+ try {
+ LuceneService service = LuceneServiceProvider.get(cache);
+ LuceneQuery<Integer, TestObject> query;
+ query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world",
+ DEFAULT_FIELD);
+ cache.getCacheTransactionManager().begin();
+ PageableLuceneQueryResults<Integer, TestObject> results = query.findPages();
+ fail();
+ } catch (LuceneQueryException e) {
+ if (!e.getMessage()
+ .equals(LuceneQueryImpl.LUCENE_QUERY_CANNOT_BE_EXECUTED_WITHIN_A_TRANSACTION)) {
+ fail();
+ }
+ } finally {
+ cache.getCacheTransactionManager().rollback();
+ }
+ });
+ }
+
+ @Test
+ @Parameters(method = "getListOfRegionTestTypes")
public void returnCorrectResultsFromStringQueryWithDefaultAnalyzer(
RegionTestableType regionTestType) {
SerializableRunnableIF createIndex = () -> {
[2/4] geode git commit: GEODE-2653: Fix testRemoveMember and remove
FlakyTest. This closes #437
Posted by kl...@apache.org.
GEODE-2653: Fix testRemoveMember and remove FlakyTest. This closes #437
Test removed self instead of the other member, and used the `any`
matcher instead of `isA`.
Cleanup GMSJoinLeaveJUnitTest.
* Change Mockito's `any` to `isA`.
* Replace some `Thread.sleep()` calls with Awaitility calls.
* Remove our `MethodExecuted` class -- this can be done with Mockito's
`verify()`.
Remove a redundant assert.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c5ee7cd4
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c5ee7cd4
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c5ee7cd4
Branch: refs/heads/feature/GEODE-2632-1
Commit: c5ee7cd4338a91ab40ee355612057b05b299b6d6
Parents: 1077097
Author: Galen OSullivan <go...@pivotal.io>
Authored: Fri Mar 31 11:44:54 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Tue Apr 18 16:12:31 2017 -0700
----------------------------------------------------------------------
.../gms/membership/GMSJoinLeaveJUnitTest.java | 122 +++++++------------
1 file changed, 41 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/c5ee7cd4/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 05ab6f7..49b09ca 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -14,15 +14,16 @@
*/
package org.apache.geode.distributed.internal.membership.gms.membership;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.hamcrest.core.IsEqual.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -55,7 +56,6 @@ import org.apache.geode.distributed.internal.membership.gms.messages.RemoveMembe
import org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMessage;
import org.apache.geode.internal.Version;
import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
@@ -79,7 +79,6 @@ import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.Timer;
-import java.util.concurrent.TimeUnit;
@Category({IntegrationTest.class, MembershipTest.class})
public class GMSJoinLeaveJUnitTest {
@@ -221,7 +220,7 @@ public class GMSJoinLeaveJUnitTest {
gmsJoinLeave.processMessage(new JoinRequestMessage(mockOldMember, mockOldMember, null, -1, 0));
assertTrue("JoinRequest should not have been added to view request",
gmsJoinLeave.getViewRequests().size() == 0);
- verify(messenger).send(any(JoinResponseMessage.class));
+ verify(messenger).send(isA(JoinResponseMessage.class));
}
@Test
@@ -232,7 +231,7 @@ public class GMSJoinLeaveJUnitTest {
NetView v = new NetView(mockMembers[0], 2, members);
InstallViewMessage message = getInstallViewMessage(v, null, false);
gmsJoinLeave.processMessage(message);
- verify(manager).forceDisconnect(any(String.class));
+ verify(manager).forceDisconnect(isA(String.class));
}
@@ -248,7 +247,7 @@ public class GMSJoinLeaveJUnitTest {
.processMessage(new JoinRequestMessage(mockMembers[0], mockMembers[0], credentials, -1, 0));
assertTrue("JoinRequest should not have been added to view request",
gmsJoinLeave.getViewRequests().size() == 0);
- verify(messenger).send(any(JoinResponseMessage.class));
+ verify(messenger).send(isA(JoinResponseMessage.class));
}
@Test
@@ -263,7 +262,7 @@ public class GMSJoinLeaveJUnitTest {
.processMessage(new JoinRequestMessage(mockMembers[0], mockMembers[0], null, -1, 0));
assertTrue("JoinRequest should not have been added to view request",
gmsJoinLeave.getViewRequests().size() == 0);
- verify(messenger).send(any(JoinResponseMessage.class));
+ verify(messenger).send(isA(JoinResponseMessage.class));
}
// This test does not test the actual join process but rather that the join response gets logged�
@@ -310,7 +309,7 @@ public class GMSJoinLeaveJUnitTest {
NetView netView = new NetView(coordinator, viewId, members);
InstallViewMessage installViewMessage = getInstallViewMessage(netView, credentials, true);
gmsJoinLeave.processMessage(installViewMessage);
- verify(messenger).send(any(ViewAckMessage.class));
+ verify(messenger).send(isA(ViewAckMessage.class));
// install the view
installViewMessage = getInstallViewMessage(netView, credentials, false);
@@ -327,16 +326,12 @@ public class GMSJoinLeaveJUnitTest {
return memberList;
}
- @Category(FlakyTest.class) // GEODE-2653: flaky due to Thread.sleep
@Test
public void testRemoveMember() throws Exception {
initMocks();
prepareAndInstallView(mockMembers[0], createMemberList(mockMembers[0], gmsJoinLeaveMemberId));
- MethodExecuted removeMessageSent = new MethodExecuted();
- when(messenger.send(any(RemoveMemberMessage.class))).thenAnswer(removeMessageSent);
- gmsJoinLeave.remove(mockMembers[0], "removing for test");
- Thread.sleep(ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL * 2);
- assertTrue(removeMessageSent.methodExecuted);
+ gmsJoinLeave.remove(gmsJoinLeaveMemberId, "removing for test");
+ verify(messenger, timeout(2000).atLeastOnce()).send(isA(RemoveMemberMessage.class));
}
@Test
@@ -344,11 +339,10 @@ public class GMSJoinLeaveJUnitTest {
initMocks();
prepareAndInstallView(mockMembers[0],
createMemberList(mockMembers[0], mockMembers[1], gmsJoinLeaveMemberId));
- MethodExecuted removeMessageSent = new MethodExecuted();
- when(messenger.send(any(RemoveMemberMessage.class))).thenAnswer(removeMessageSent);
assertFalse(gmsJoinLeave.isMemberLeaving(mockMembers[0]));
assertFalse(gmsJoinLeave.isMemberLeaving(mockMembers[1]));
gmsJoinLeave.remove(mockMembers[0], "removing for test");
+ verify(messenger, timeout(2000).atLeastOnce()).send(isA(RemoveMemberMessage.class));
assertTrue(gmsJoinLeave.isMemberLeaving(mockMembers[0]));
LeaveRequestMessage msg =
new LeaveRequestMessage(gmsJoinLeave.getMemberID(), mockMembers[1], "leaving for test");
@@ -364,20 +358,17 @@ public class GMSJoinLeaveJUnitTest {
initMocks();
final int viewInstallationTime = 15000;
- when(healthMonitor.checkIfAvailable(any(InternalDistributedMember.class), any(String.class),
- any(Boolean.class))).thenReturn(true);
+ when(healthMonitor.checkIfAvailable(isA(InternalDistributedMember.class), isA(String.class),
+ isA(Boolean.class))).thenReturn(true);
gmsJoinLeave.delayViewCreationForTest(5000); // ensures multiple requests are queued for a view
// change
GMSJoinLeaveTestHelper.becomeCoordinatorForTest(gmsJoinLeave);
- NetView oldView = null;
- long giveup = System.currentTimeMillis() + viewInstallationTime;
- while (System.currentTimeMillis() < giveup && oldView == null) {
- Thread.sleep(500);
- oldView = gmsJoinLeave.getView();
- }
- assertTrue(oldView != null); // it should have become coordinator and installed a view
+ Awaitility.await().atMost(viewInstallationTime, MILLISECONDS)
+ .until(() -> gmsJoinLeave.getView() != null);
+
+ NetView oldView = gmsJoinLeave.getView();
NetView newView = new NetView(oldView, oldView.getViewId() + 1);
newView.add(mockMembers[1]);
@@ -387,12 +378,8 @@ public class GMSJoinLeaveJUnitTest {
gmsJoinLeave.memberShutdown(mockMembers[1], "shutting down for test");
gmsJoinLeave.remove(mockMembers[1], "removing for test");
- giveup = System.currentTimeMillis() + viewInstallationTime;
- while (System.currentTimeMillis() < giveup
- && gmsJoinLeave.getView().getViewId() == newView.getViewId()) {
- Thread.sleep(500);
- }
- assertTrue(gmsJoinLeave.getView().getViewId() > newView.getViewId());
+ Awaitility.await().atMost(viewInstallationTime, MILLISECONDS)
+ .until(() -> gmsJoinLeave.getView().getViewId() > newView.getViewId());
assertFalse(gmsJoinLeave.getView().getCrashedMembers().contains(mockMembers[1]));
}
@@ -432,19 +419,7 @@ public class GMSJoinLeaveJUnitTest {
gmsJoinLeave.processMessage(installViewMessage);
Assert.assertNotEquals(netView, gmsJoinLeave.getView());
- verify(mockManager).forceDisconnect(any(String.class));
- }
-
- @SuppressWarnings("rawtypes")
- private class MethodExecuted implements Answer {
- private boolean methodExecuted = false;
-
- @Override
- public Object answer(InvocationOnMock invocation) {
- // do we only expect a join response on a failure?
- methodExecuted = true;
- return null;
- }
+ verify(mockManager).forceDisconnect(isA(String.class));
}
@Test
@@ -517,8 +492,8 @@ public class GMSJoinLeaveJUnitTest {
@Test
public void testDuplicateJoinRequestDoesNotCauseNewView() throws Exception {
initMocks();
- when(healthMonitor.checkIfAvailable(any(InternalDistributedMember.class), any(String.class),
- any(Boolean.class))).thenReturn(true);
+ when(healthMonitor.checkIfAvailable(isA(InternalDistributedMember.class), isA(String.class),
+ isA(Boolean.class))).thenReturn(true);
gmsJoinLeave.unitTesting.add("noRandomViewChange");
prepareAndInstallView(gmsJoinLeaveMemberId,
createMemberList(gmsJoinLeaveMemberId, mockMembers[0]));
@@ -546,8 +521,8 @@ public class GMSJoinLeaveJUnitTest {
}
assertTrue("expected member to only be in the view once: " + mockMembers[2] + "; view: " + view,
occurrences == 1);
- verify(healthMonitor, times(5)).checkIfAvailable(any(InternalDistributedMember.class),
- any(String.class), any(Boolean.class));
+ verify(healthMonitor, times(5)).checkIfAvailable(isA(InternalDistributedMember.class),
+ isA(String.class), isA(Boolean.class));
}
@@ -610,11 +585,7 @@ public class GMSJoinLeaveJUnitTest {
public void testBecomeCoordinatorOnStartup() throws Exception {
initMocks();
GMSJoinLeaveTestHelper.becomeCoordinatorForTest(gmsJoinLeave);
- long giveup = System.currentTimeMillis() + 20000;
- while (System.currentTimeMillis() < giveup && !gmsJoinLeave.isCoordinator()) {
- Thread.sleep(1000);
- }
- assertTrue(gmsJoinLeave.isCoordinator());
+ Awaitility.await().atMost(20, SECONDS).until(() -> gmsJoinLeave.isCoordinator());
}
@Test
@@ -727,7 +698,7 @@ public class GMSJoinLeaveJUnitTest {
GMSJoinLeaveTestHelper.becomeCoordinatorForTest(gmsJoinLeave);
NetworkPartitionMessage message = new NetworkPartitionMessage();
gmsJoinLeave.processMessage(message);
- verify(manager).forceDisconnect(any(String.class));
+ verify(manager).forceDisconnect(isA(String.class));
}
@@ -765,7 +736,7 @@ public class GMSJoinLeaveJUnitTest {
installViewMessage = getInstallViewMessage(partitionView, credentials, false);
gmsJoinLeave.processMessage(installViewMessage);
- verify(manager, never()).forceDisconnect(any(String.class));
+ verify(manager, never()).forceDisconnect(isA(String.class));
verify(manager).quorumLost(crashes, newView);
}
@@ -789,8 +760,8 @@ public class GMSJoinLeaveJUnitTest {
@Test
public void testNoViewAckCausesRemovalMessage() throws Exception {
initMocks(true);
- when(healthMonitor.checkIfAvailable(any(InternalDistributedMember.class), any(String.class),
- any(Boolean.class))).thenReturn(false);
+ when(healthMonitor.checkIfAvailable(isA(InternalDistributedMember.class), isA(String.class),
+ isA(Boolean.class))).thenReturn(false);
prepareAndInstallView(mockMembers[0], createMemberList(mockMembers[0], gmsJoinLeaveMemberId));
NetView oldView = gmsJoinLeave.getView();
NetView newView = new NetView(oldView, oldView.getViewId() + 1);
@@ -804,15 +775,13 @@ public class GMSJoinLeaveJUnitTest {
InstallViewMessage installViewMessage = getInstallViewMessage(newView, credentials, false);
gmsJoinLeave.processMessage(installViewMessage);
- long giveup = System.currentTimeMillis() + (2000 * 3); // this test's member-timeout * 3
- while (System.currentTimeMillis() < giveup
- && gmsJoinLeave.getView().getViewId() == oldView.getViewId()) {
- Thread.sleep(1000);
- }
+ // this test's member-timeout * 3
+ Awaitility.await().atMost(6, SECONDS)
+ .until(() -> gmsJoinLeave.getView().getViewId() != oldView.getViewId());
assertTrue(gmsJoinLeave.isCoordinator());
// wait for suspect processing
- Thread.sleep(10000);
- verify(healthMonitor, atLeast(1)).checkIfAvailable(isA(DistributedMember.class),
+
+ verify(healthMonitor, timeout(10000).atLeast(1)).checkIfAvailable(isA(DistributedMember.class),
isA(String.class), isA(Boolean.class));
// verify(messenger, atLeast(1)).send(isA(RemoveMemberMessage.class));
}
@@ -920,7 +889,7 @@ public class GMSJoinLeaveJUnitTest {
NetView netView = new NetView(coordinator, viewId, members);
InstallViewMessage installViewMessage = getInstallViewMessage(netView, credentials, false);
gmsJoinLeave.processMessage(installViewMessage);
- // verify(messenger).send(any(ViewAckMessage.class));
+ // verify(messenger).send(isA(ViewAckMessage.class));
}
@Test
@@ -946,11 +915,9 @@ public class GMSJoinLeaveJUnitTest {
new JoinRequestMessage(mockMembers[0], mockMembers[0], credentials, -1, 0));
int viewRequests = gmsJoinLeave.getViewRequests().size();
- assertTrue("There should be 1 viewRequest but found " + viewRequests, viewRequests == 1);
- Thread.sleep(2 * ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL);
-
- viewRequests = gmsJoinLeave.getViewRequests().size();
- assertEquals("Found view requests: " + gmsJoinLeave.getViewRequests(), 0, viewRequests);
+ assertEquals("There should be 1 viewRequest", 1, viewRequests);
+ Awaitility.await().atMost(2 * ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL, MILLISECONDS)
+ .until(() -> gmsJoinLeave.getViewRequests().size(), equalTo(0));
} finally {
System.getProperties().remove(GMSJoinLeave.BYPASS_DISCOVERY_PROPERTY);
}
@@ -1105,7 +1072,7 @@ public class GMSJoinLeaveJUnitTest {
gmsJoinLeave.processMessage(msg);
}
- Awaitility.await("waiting for view creator to stop").atMost(5000, TimeUnit.MILLISECONDS)
+ Awaitility.await("waiting for view creator to stop").atMost(5000, MILLISECONDS)
.until(() -> !gmsJoinLeave.getViewCreator().isAlive());
assertEquals(1, gmsJoinLeave.getView().getViewId());
@@ -1148,14 +1115,7 @@ public class GMSJoinLeaveJUnitTest {
vack.setSender(gmsJoinLeaveMemberId);
gmsJoinLeave.processMessage(vack);
- int tries = 0;
- while (!vc.waiting) {
- if (tries > 30) {
- Assert.fail("view creator never finished");
- }
- tries++;
- Thread.sleep(1000);
- }
+ Awaitility.await("view creator finishes").atMost(30, SECONDS).until(() -> vc.waiting);
NetView newView = gmsJoinLeave.getView();
System.out.println("new view is " + newView);
assertTrue(newView.contains(mockMembers[1]));
[3/4] geode git commit: 2632: refactor code to use internal interfaces
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java
index 3ce1721..fd5d6a4 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ExportLogsFunction.java
@@ -13,7 +13,6 @@
* the License.
*
*/
-
package org.apache.geode.management.internal.cli.functions;
import org.apache.commons.lang.StringUtils;
@@ -56,17 +55,18 @@ import java.util.Arrays;
* The function only extracts .log and .gfs files under server's working directory
*/
public class ExportLogsFunction implements Function, InternalEntity {
+
public static final String EXPORT_LOGS_REGION = "__exportLogsRegion";
+
private static final Logger LOGGER = LogService.getLogger();
private static final long serialVersionUID = 1L;
private static final int BUFFER_SIZE = 1024;
-
@Override
public void execute(final FunctionContext context) {
try {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- DistributionConfig config = cache.getDistributedSystem().getConfig();
+ DistributionConfig config = cache.getInternalDistributedSystem().getConfig();
String memberId = cache.getDistributedSystem().getMemberId();
LOGGER.info("ExportLogsFunction started for member {}", memberId);
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
index 1718898..06af662 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction.java
@@ -44,7 +44,7 @@ public class SizeExportLogsFunction extends ExportLogsFunction implements Functi
public void execute(final FunctionContext context) {
try {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- DistributionConfig config = cache.getDistributedSystem().getConfig();
+ DistributionConfig config = cache.getInternalDistributedSystem().getConfig();
Args args = (Args) context.getArguments();
long diskAvailable = config.getLogFile().getUsableSpace();
long diskSize = config.getLogFile().getTotalSpace();
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java
index b98f759..5b82611 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/LonerTypeRegistration.java
@@ -108,7 +108,7 @@ public class LonerTypeRegistration implements TypeRegistration {
* @return true if this member is a loner and we can't determine what type of registry they want.
*/
public static boolean isIndeterminateLoner(GemFireCacheImpl cache) {
- boolean isLoner = cache.getDistributedSystem().isLoner();
+ boolean isLoner = cache.getInternalDistributedSystem().isLoner();
boolean pdxConfigured = cache.getPdxPersistent();
return isLoner && !pdxConfigured/* && !hasGateways */;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
index ed94c0c..b4fa33e 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java
@@ -116,7 +116,7 @@ public class PeerTypeRegistration implements TypeRegistration {
int distributedSystemId =
- cache.getDistributedSystem().getDistributionManager().getDistributedSystemId();
+ cache.getInternalDistributedSystem().getDistributionManager().getDistributedSystemId();
if (distributedSystemId == -1) {
distributedSystemId = 0;
}
@@ -226,9 +226,9 @@ public class PeerTypeRegistration implements TypeRegistration {
synchronized (this.dlsLock) {
if (this.dls == null) {
try {
- this.dls = DLockService.create(LOCK_SERVICE_NAME, this.cache.getDistributedSystem(),
- true /* distributed */, true /* destroyOnDisconnect */,
- true /* automateFreeResources */);
+ this.dls = DLockService.create(LOCK_SERVICE_NAME,
+ this.cache.getInternalDistributedSystem(), true /* distributed */,
+ true /* destroyOnDisconnect */, true /* automateFreeResources */);
} catch (IllegalArgumentException e) {
this.dls = DistributedLockService.getServiceNamed(LOCK_SERVICE_NAME);
if (this.dls == null) {
@@ -334,7 +334,7 @@ public class PeerTypeRegistration implements TypeRegistration {
*/
private boolean useUDPMessagingIfNecessary() {
boolean result = false;
- InternalDistributedSystem sys = cache.getDistributedSystem();
+ InternalDistributedSystem sys = cache.getInternalDistributedSystem();
if (sys != null && !sys.threadOwnsResources()) {
sys.getDistributionManager().forceUDPMessagingForCurrentThread();
result = true;
@@ -344,7 +344,7 @@ public class PeerTypeRegistration implements TypeRegistration {
private void releaseUDPMessaging(boolean release) {
if (release) {
- InternalDistributedSystem sys = cache.getDistributedSystem();
+ InternalDistributedSystem sys = cache.getInternalDistributedSystem();
if (sys != null) {
sys.getDistributionManager().releaseUDPMessagingForCurrentThread();
}
@@ -551,7 +551,7 @@ public class PeerTypeRegistration implements TypeRegistration {
"The PDX metadata must be persistent in a member that has persistent data. See CacheFactory.setPdxPersistent.");
}
int distributedSystemId =
- cache.getDistributedSystem().getDistributionManager().getDistributedSystemId();
+ cache.getInternalDistributedSystem().getDistributionManager().getDistributedSystemId();
if (hasGatewaySender && distributedSystemId == -1) {
throw new PdxInitializationException(
"When using PDX with a WAN gateway sender, you must set the distributed-system-id gemfire property for your distributed system. See the javadocs for DistributedSystem.");
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
index 6e9c2d3..1c203bb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.cache.asyncqueue.internal;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
@@ -29,12 +30,12 @@ import static org.junit.Assert.assertEquals;
@Category(IntegrationTest.class)
public class SerialAsyncEventQueueImplJUnitTest {
- private Cache cache;
+ private InternalCache cache;
@Before
public void setUp() {
CacheFactory cf = new CacheFactory().set(MCAST_PORT, "0");
- cache = cf.create();
+ cache = (InternalCache) cf.create();
}
@After
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
index 68ef7f0..b3f39ee 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectDUnitTest.java
@@ -1113,7 +1113,8 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase {
final GemFireCacheImpl cache = ReconnectDUnitTest.savedCache;
Wait.waitForCriterion(new WaitCriterion() {
public boolean done() {
- return cache.isReconnecting() || cache.getDistributedSystem().isReconnectCancelled();
+ return cache.isReconnecting()
+ || cache.getInternalDistributedSystem().isReconnectCancelled();
}
public String description() {
@@ -1125,7 +1126,7 @@ public class ReconnectDUnitTest extends JUnit4CacheTestCase {
} catch (InterruptedException e) {
fail("interrupted");
}
- assertTrue(cache.getDistributedSystem().isReconnectCancelled());
+ assertTrue(cache.getInternalDistributedSystem().isReconnectCancelled());
assertNull(cache.getReconnectedCache());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
index 2a2fe73..6ba098f 100755
--- a/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ReconnectedCacheServerDUnitTest.java
@@ -14,16 +14,10 @@
*/
package org.apache.geode.cache30;
-import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
import static org.junit.Assert.*;
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.server.CacheServer;
@@ -32,15 +26,15 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper;
import org.apache.geode.distributed.internal.membership.gms.mgr.GMSMembershipManager;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.ClientServerTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
@Category({DistributedTest.class, MembershipTest.class, ClientServerTest.class})
public class ReconnectedCacheServerDUnitTest extends JUnit4CacheTestCase {
- public ReconnectedCacheServerDUnitTest() {
- super();
- }
-
private static final long serialVersionUID = 1L;
private boolean addedCacheServer = false;
@@ -72,7 +66,7 @@ public class ReconnectedCacheServerDUnitTest extends JUnit4CacheTestCase {
assertFalse(
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "autoReconnect-useCacheXMLFile"));
- GemFireCacheImpl gc = (GemFireCacheImpl) this.cache;
+ InternalCache gc = (InternalCache) this.cache;
// fool the system into thinking cluster-config is being used
GMSMembershipManager mgr = (GMSMembershipManager) MembershipManagerHelper
@@ -104,7 +98,7 @@ public class ReconnectedCacheServerDUnitTest extends JUnit4CacheTestCase {
assertNotNull(gc.getCacheConfig().getCacheServerCreation());
- InternalDistributedSystem system = gc.getDistributedSystem();
+ InternalDistributedSystem system = gc.getInternalDistributedSystem();
system.createAndStartCacheServers(gc.getCacheConfig().getCacheServerCreation(), gc);
assertEquals("found these cache servers:" + gc.getCacheServers(), numServers,
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
index e268c22..c8a629c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TXDistributedDUnitTest.java
@@ -1387,7 +1387,7 @@ public class TXDistributedDUnitTest extends JUnit4CacheTestCase {
af.setDiskStoreName(diskStoreName);
gfc.createVMRegion(rgnName1, af.create(), ira);
gfc.createVMRegion(rgnName2, af.create(), ira);
- gfc.getDistributedSystem().addResourceListener(new ShutdownListener());
+ gfc.getInternalDistributedSystem().addResourceListener(new ShutdownListener());
} catch (IOException ioe) {
fail(ioe.toString());
} catch (TimeoutException e) {
@@ -1462,7 +1462,7 @@ public class TXDistributedDUnitTest extends JUnit4CacheTestCase {
public Object call() throws Exception {
GemFireCacheImpl cache = (GemFireCacheImpl) getCache();
List<ResourceEventsListener> listeners =
- cache.getDistributedSystem().getResourceListeners();
+ cache.getInternalDistributedSystem().getResourceListeners();
for (ResourceEventsListener l : listeners) {
if (l instanceof ShutdownListener) {
ShutdownListener shutListener = (ShutdownListener) l;
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
index 6d04773..5d81724 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
@@ -201,7 +201,8 @@ public class BackupJUnitTest {
assertNull(region.get(i));
}
- BackupManager backup = cache.startBackup(cache.getDistributedSystem().getDistributedMember());
+ BackupManager backup =
+ cache.startBackup(cache.getInternalDistributedSystem().getDistributedMember());
backup.prepareBackup();
backup.finishBackup(backupDir, null, false);
@@ -249,7 +250,8 @@ public class BackupJUnitTest {
public void testBackupEmptyDiskStore() throws IOException, InterruptedException {
DiskStoreImpl ds = createDiskStore();
- BackupManager backup = cache.startBackup(cache.getDistributedSystem().getDistributedMember());
+ BackupManager backup =
+ cache.startBackup(cache.getInternalDistributedSystem().getDistributedMember());
backup.prepareBackup();
backup.finishBackup(backupDir, null, false);
assertEquals("No backup files should have been created", Collections.emptyList(),
@@ -264,7 +266,8 @@ public class BackupJUnitTest {
// from a backup that doesn't contain this key
region.put("A", "A");
- BackupManager backup = cache.startBackup(cache.getDistributedSystem().getDistributedMember());
+ BackupManager backup =
+ cache.startBackup(cache.getInternalDistributedSystem().getDistributedMember());
backup.prepareBackup();
backup.finishBackup(backupDir, null, false);
@@ -303,7 +306,8 @@ public class BackupJUnitTest {
// from a backup that doesn't contain this key
region.put("A", "A");
- ds.finishBackup(new BackupManager(cache.getDistributedSystem().getDistributedMember(), cache));
+ ds.finishBackup(
+ new BackupManager(cache.getInternalDistributedSystem().getDistributedMember(), cache));
script.generate(backupDir);
cache.close();
@@ -322,7 +326,8 @@ public class BackupJUnitTest {
DiskStoreImpl ds = createDiskStore();
createRegion();
- BackupManager backup = cache.startBackup(cache.getDistributedSystem().getDistributedMember());
+ BackupManager backup =
+ cache.startBackup(cache.getInternalDistributedSystem().getDistributedMember());
backup.prepareBackup();
backup.finishBackup(backupDir, null, false);
Collection<File> fileCollection = FileUtils.listFiles(backupDir,
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
index 26412b2..f293c21 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/NetSearchMessagingDUnitTest.java
@@ -370,7 +370,7 @@ public class NetSearchMessagingDUnitTest extends JUnit4CacheTestCase {
public Object call() {
GemFireCacheImpl cache = (GemFireCacheImpl) getCache();
- return cache.getDistributedSystem().getDMStats().getReceivedMessages();
+ return cache.getInternalDistributedSystem().getDMStats().getReceivedMessages();
}
})).intValue();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
index 91ac16b..f38f2ad 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessorTest.java
@@ -104,6 +104,7 @@ public class SearchLoadAndWriteProcessorTest {
when(lr.getScope()).thenReturn(Scope.DISTRIBUTED_ACK);
when(lr.getCancelCriterion()).thenReturn(mock(CancelCriterion.class));
when(cache.getDistributedSystem()).thenReturn(ds);
+ when(cache.getInternalDistributedSystem()).thenReturn(ds);
when(cache.getSearchTimeout()).thenReturn(30);
when(attrs.getScope()).thenReturn(Scope.DISTRIBUTED_ACK);
when(attrs.getDataPolicy()).thenReturn(DataPolicy.EMPTY);
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
index 66b1994..7f207d0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/FetchEntriesMessageJUnitTest.java
@@ -72,7 +72,7 @@ public class FetchEntriesMessageJUnitTest {
public void testProcessChunk() throws Exception {
cache = Fakes.cache();
PartitionedRegion pr = mock(PartitionedRegion.class);
- InternalDistributedSystem system = cache.getDistributedSystem();
+ InternalDistributedSystem system = cache.getInternalDistributedSystem();
FetchEntriesResponse response = new FetchEntriesResponse(system, pr, null, 0);
HeapDataOutputStream chunkStream = createDummyChunk();
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
index 2ab64dd..6a1e26f 100644
--- a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
+++ b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
@@ -14,6 +14,12 @@
*/
package org.apache.geode.test.fake;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.geode.CancelCriterion;
import org.apache.geode.LogWriter;
import org.apache.geode.Statistics;
@@ -29,13 +35,6 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.GemFireCacheImpl;
-import java.io.File;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.mockito.Mockito.*;
-
/**
* Factory methods for fake objects for use in test.
*
@@ -74,6 +73,7 @@ public class Fakes {
when(config.getDeployWorkingDir()).thenReturn(new File("."));
when(cache.getDistributedSystem()).thenReturn(system);
+ when(cache.getInternalDistributedSystem()).thenReturn(system);
when(cache.getSystem()).thenReturn(system);
when(cache.getMyId()).thenReturn(member);
when(cache.getDistributionManager()).thenReturn(distributionManager);
@@ -102,7 +102,7 @@ public class Fakes {
* A fake distributed system, which contains a fake distribution manager.
*/
public static InternalDistributedSystem distributedSystem() {
- return cache().getDistributedSystem();
+ return cache().getInternalDistributedSystem();
}
/**
@@ -134,5 +134,4 @@ public class Fakes {
}
private Fakes() {}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index fe85efe..fea4845 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -15,9 +15,10 @@
package org.apache.geode.cache.lucene.internal;
+import java.util.Set;
+
import org.apache.geode.CancelException;
import org.apache.geode.cache.AttributesFactory;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.FixedPartitionResolver;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -25,11 +26,9 @@ import org.apache.geode.cache.PartitionResolver;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.lucene.internal.directory.DumpDirectoryFiles;
-import org.apache.geode.cache.lucene.internal.filesystem.File;
import org.apache.geode.cache.lucene.internal.filesystem.FileSystemStats;
import org.apache.geode.cache.lucene.internal.partition.BucketTargetingFixedResolver;
import org.apache.geode.cache.lucene.internal.partition.BucketTargetingResolver;
@@ -40,11 +39,9 @@ import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
-import java.util.Set;
-
/* wrapper of IndexWriter */
public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
protected Region fileAndChunkRegion;
@@ -52,7 +49,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
public static final String FILES_REGION_SUFFIX = ".files";
- public LuceneIndexForPartitionedRegion(String indexName, String regionPath, Cache cache) {
+ public LuceneIndexForPartitionedRegion(String indexName, String regionPath, InternalCache cache) {
super(indexName, regionPath, cache);
final String statsName = indexName + "-" + regionPath;
@@ -89,7 +86,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
HeterogeneousLuceneSerializer mapper = new HeterogeneousLuceneSerializer(getFieldNames());
PartitionedRepositoryManager partitionedRepositoryManager =
new PartitionedRepositoryManager(this, mapper);
- DM dm = ((GemFireCacheImpl) getCache()).getDistributedSystem().getDistributionManager();
+ DM dm = this.cache.getInternalDistributedSystem().getDistributionManager();
LuceneBucketListener lucenePrimaryBucketListener =
new LuceneBucketListener(partitionedRepositoryManager, dm);
@@ -169,10 +166,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
return createRegion(regionName, attributes);
}
- public void close() {
- // TODO Auto-generated method stub
-
- }
+ public void close() {}
@Override
public void dumpFiles(final String directory) {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
index d58f856..36f6720 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
@@ -12,13 +12,11 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.cache.lucene.internal;
import java.util.Collections;
import java.util.Map;
-import org.apache.geode.internal.cache.extension.Extension;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -33,10 +31,11 @@ import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl;
import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
import org.apache.geode.cache.lucene.internal.xml.LuceneIndexCreation;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.extension.Extension;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
@@ -45,7 +44,7 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
protected final String indexName;
protected final String regionPath;
- protected final Cache cache;
+ protected final InternalCache cache;
protected final LuceneIndexStats indexStats;
protected boolean hasInitialized = false;
@@ -55,7 +54,7 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
protected Analyzer analyzer;
protected LocalRegion dataRegion;
- protected LuceneIndexImpl(String indexName, String regionPath, Cache cache) {
+ protected LuceneIndexImpl(String indexName, String regionPath, InternalCache cache) {
this.indexName = indexName;
this.regionPath = regionPath;
this.cache = cache;
@@ -229,7 +228,7 @@ public abstract class LuceneIndexImpl implements InternalLuceneIndex {
// Create the region
try {
- return ((GemFireCacheImpl) this.cache).createVMRegion(regionName, attributes, ira);
+ return this.cache.createVMRegion(regionName, attributes, ira);
} catch (Exception e) {
InternalGemFireError ige = new InternalGemFireError(
LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java
index 5da2732..e99f3d9 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplFactory.java
@@ -14,12 +14,13 @@
*/
package org.apache.geode.cache.lucene.internal;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
public class LuceneIndexImplFactory {
+
public LuceneIndexImplFactory() {}
- public LuceneIndexImpl create(String indexName, String regionPath, GemFireCacheImpl cache) {
+ public LuceneIndexImpl create(String indexName, String regionPath, InternalCache cache) {
return new LuceneIndexForPartitionedRegion(indexName, regionPath, cache);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java
index f4518aa..75ab5ca 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndex.java
@@ -14,14 +14,13 @@
*/
package org.apache.geode.cache.lucene.internal;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
import org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
-import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.InternalCache;
public class LuceneRawIndex extends LuceneIndexImpl {
- protected LuceneRawIndex(String indexName, String regionPath, Cache cache) {
+ protected LuceneRawIndex(String indexName, String regionPath, InternalCache cache) {
super(indexName, regionPath, cache);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java
index cf445c0..d29f00a 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRawIndexFactory.java
@@ -14,10 +14,11 @@
*/
package org.apache.geode.cache.lucene.internal;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
public class LuceneRawIndexFactory extends LuceneIndexImplFactory {
- public LuceneIndexImpl create(String indexName, String regionPath, GemFireCacheImpl cache) {
+ @Override
+ public LuceneIndexImpl create(String indexName, String regionPath, InternalCache cache) {
return new LuceneRawIndex(indexName, regionPath, cache);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
index 326c85c..f4e2a79 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
@@ -14,23 +14,24 @@
*/
package org.apache.geode.cache.lucene.internal;
+import java.util.Map;
+
+import org.apache.lucene.analysis.Analyzer;
+
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.RegionListener;
-import org.apache.lucene.analysis.Analyzer;
-
-import java.util.Map;
public class LuceneRegionListener implements RegionListener {
private final LuceneServiceImpl service;
- private final GemFireCacheImpl cache;
+ private final InternalCache cache;
private final String indexName;
@@ -42,7 +43,7 @@ public class LuceneRegionListener implements RegionListener {
private final String[] fields;
- public LuceneRegionListener(LuceneServiceImpl service, GemFireCacheImpl cache, String indexName,
+ public LuceneRegionListener(LuceneServiceImpl service, InternalCache cache, String indexName,
String regionPath, String[] fields, Analyzer analyzer, Map<String, Analyzer> fieldAnalyzers) {
this.service = service;
this.cache = cache;
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index dbe24ff..30952bf 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -23,6 +23,7 @@ import org.apache.geode.cache.lucene.internal.management.LuceneServiceMBean;
import org.apache.geode.cache.lucene.internal.management.ManagementIndexListener;
import org.apache.geode.cache.lucene.internal.results.LuceneGetPageFunction;
import org.apache.geode.cache.lucene.internal.results.PageResults;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
@@ -55,7 +56,6 @@ import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.cache.extension.Extensible;
import org.apache.geode.internal.cache.CacheService;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.RegionListener;
import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
@@ -72,14 +72,12 @@ public class LuceneServiceImpl implements InternalLuceneService {
public static LuceneIndexImplFactory luceneIndexFactory = new LuceneIndexImplFactory();
private static final Logger logger = LogService.getLogger();
- private GemFireCacheImpl cache;
+ private InternalCache cache;
private final HashMap<String, LuceneIndex> indexMap = new HashMap<String, LuceneIndex>();
private final HashMap<String, LuceneIndexCreationProfile> definedIndexMap = new HashMap<>();
private IndexListener managementListener;
- public LuceneServiceImpl() {
-
- }
+ public LuceneServiceImpl() {}
@Override
public org.apache.geode.cache.lucene.LuceneIndexFactory createIndexFactory() {
@@ -95,10 +93,9 @@ public class LuceneServiceImpl implements InternalLuceneService {
if (cache == null) {
throw new IllegalStateException(LocalizedStrings.CqService_CACHE_IS_NULL.toLocalizedString());
}
- GemFireCacheImpl gfc = (GemFireCacheImpl) cache;
- gfc.getCancelCriterion().checkCancelInProgress(null);
+ cache.getCancelCriterion().checkCancelInProgress(null);
- this.cache = gfc;
+ this.cache = (InternalCache) cache;
FunctionService.registerFunction(new LuceneQueryFunction());
FunctionService.registerFunction(new LuceneGetPageFunction());
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
index 5a86ccb..261b742 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneIndexCreationIntegrationTest.java
@@ -16,6 +16,7 @@
package org.apache.geode.cache.lucene;
import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.*;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;
import java.io.IOException;
@@ -164,7 +165,7 @@ public class LuceneIndexCreationIntegrationTest extends LuceneIntegrationTest {
luceneService.createIndexFactory().setFields(analyzers).create(INDEX_NAME, REGION_NAME);
Region region = createRegion();
final LuceneIndex index = luceneService.getIndex(INDEX_NAME, REGION_NAME);
- assertTrue(index instanceof LuceneRawIndex);
+ assertThat(index).isInstanceOf(LuceneRawIndex.class);
region.put("key1", new TestObject());
verifyIndexFinishFlushing(cache, INDEX_NAME, REGION_NAME);
assertEquals(analyzers, index.getFieldAnalyzers());
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java
index b3db8ec..8b379a5 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactorySpy.java
@@ -15,16 +15,16 @@
package org.apache.geode.cache.lucene.internal;
import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.*;
+
+import java.util.function.Consumer;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
-import org.apache.geode.internal.cache.BucketNotFoundException;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
-import java.util.function.Consumer;
+import org.apache.geode.cache.lucene.internal.repository.RepositoryManager;
+import org.apache.geode.internal.cache.BucketNotFoundException;
+import org.apache.geode.internal.cache.InternalCache;
public class LuceneIndexFactorySpy extends LuceneIndexImplFactory {
@@ -38,12 +38,11 @@ public class LuceneIndexFactorySpy extends LuceneIndexImplFactory {
LuceneServiceImpl.luceneIndexFactory = new LuceneIndexImplFactory();
}
-
private Consumer<Object> getRepositoryConsumer = key -> {
};
@Override
- public LuceneIndexImpl create(String indexName, String regionPath, GemFireCacheImpl cache) {
+ public LuceneIndexImpl create(String indexName, String regionPath, InternalCache cache) {
LuceneIndexForPartitionedRegion index =
Mockito.spy(new ExtendedLuceneIndexForPartitionedRegion(indexName, regionPath, cache));
return index;
@@ -54,10 +53,9 @@ public class LuceneIndexFactorySpy extends LuceneIndexImplFactory {
this.getRepositoryConsumer = getRepositoryConsumer;
}
-
private class ExtendedLuceneIndexForPartitionedRegion extends LuceneIndexForPartitionedRegion {
public ExtendedLuceneIndexForPartitionedRegion(final String indexName, final String regionPath,
- final Cache cache) {
+ final InternalCache cache) {
super(indexName, regionPath, cache);
}
@@ -77,4 +75,3 @@ public class LuceneIndexFactorySpy extends LuceneIndexImplFactory {
}
}
}
-
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
index f2bfdd4..8e4c179 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
@@ -33,13 +33,13 @@ import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.Scope;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.lucene.internal.directory.DumpDirectoryFiles;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.test.fake.Fakes;
@@ -55,7 +55,7 @@ public class LuceneIndexForPartitionedRegionTest {
public void getIndexNameReturnsCorrectName() {
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
LuceneIndexForPartitionedRegion index =
new LuceneIndexForPartitionedRegion(name, regionPath, cache);
assertEquals(name, index.getName());
@@ -65,7 +65,7 @@ public class LuceneIndexForPartitionedRegionTest {
public void getRegionPathReturnsPath() {
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
LuceneIndexForPartitionedRegion index =
new LuceneIndexForPartitionedRegion(name, regionPath, cache);
assertEquals(regionPath, index.getRegionPath());
@@ -75,7 +75,7 @@ public class LuceneIndexForPartitionedRegionTest {
public void fileRegionExistsWhenFileRegionExistsShouldReturnTrue() {
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
PartitionedRegion region = mock(PartitionedRegion.class);
LuceneIndexForPartitionedRegion index =
new LuceneIndexForPartitionedRegion(name, regionPath, cache);
@@ -89,7 +89,7 @@ public class LuceneIndexForPartitionedRegionTest {
public void fileRegionExistsWhenFileRegionDoesNotExistShouldReturnFalse() {
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
LuceneIndexForPartitionedRegion index =
new LuceneIndexForPartitionedRegion(name, regionPath, cache);
String fileRegionName = index.createFileRegionName();
@@ -102,7 +102,7 @@ public class LuceneIndexForPartitionedRegionTest {
public void createAEQWithPersistenceCallsCreateOnAEQFactory() {
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
final Region region = Fakes.region(regionPath, cache);
RegionAttributes attributes = region.getAttributes();
when(attributes.getDataPolicy()).thenReturn(DataPolicy.PERSISTENT_PARTITION);
@@ -121,7 +121,7 @@ public class LuceneIndexForPartitionedRegionTest {
public void createAEQCallsCreateOnAEQFactory() {
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
final Region region = Fakes.region(regionPath, cache);
AsyncEventQueueFactoryImpl aeqFactory = mock(AsyncEventQueueFactoryImpl.class);
when(cache.createAsyncEventQueueFactory()).thenReturn(aeqFactory);
@@ -190,7 +190,7 @@ public class LuceneIndexForPartitionedRegionTest {
boolean withPersistence = false;
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
Region region = initializeScenario(withPersistence, regionPath, cache, 0);
LuceneIndexForPartitionedRegion index =
new LuceneIndexForPartitionedRegion(name, regionPath, cache);
@@ -203,7 +203,7 @@ public class LuceneIndexForPartitionedRegionTest {
boolean withPersistence = false;
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
Region region = initializeScenario(withPersistence, regionPath, cache);
LuceneIndexForPartitionedRegion index =
@@ -228,7 +228,7 @@ public class LuceneIndexForPartitionedRegionTest {
boolean withPersistence = false;
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
Region region = initializeScenario(withPersistence, regionPath, cache);
LuceneIndexForPartitionedRegion index =
@@ -264,7 +264,7 @@ public class LuceneIndexForPartitionedRegionTest {
boolean withPersistence = true;
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
initializeScenario(withPersistence, regionPath, cache);
LuceneIndexForPartitionedRegion index =
@@ -284,7 +284,7 @@ public class LuceneIndexForPartitionedRegionTest {
boolean withPersistence = true;
String name = "indexName";
String regionPath = "regionName";
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
initializeScenario(withPersistence, regionPath, cache);
LuceneIndexForPartitionedRegion index =
@@ -306,7 +306,7 @@ public class LuceneIndexForPartitionedRegionTest {
String name = "indexName";
String regionPath = "regionName";
String[] fields = new String[] {"field1", "field2"};
- Cache cache = Fakes.cache();
+ InternalCache cache = Fakes.cache();
initializeScenario(withPersistence, regionPath, cache);
AsyncEventQueue aeq = mock(AsyncEventQueue.class);
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java
index 1042661..250b933 100755
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java
@@ -19,18 +19,20 @@ import org.junit.Rule;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.lucene.LuceneIndex;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class LuceneIndexImplJUnitTest {
+
public static final String REGION = "region";
public static final String INDEX = "index";
public static final int MAX_WAIT = 30000;
- private Cache cache;
- LuceneIndex index;
+
+ private InternalCache cache;
+ private LuceneIndex index;
@Rule
public ExpectedException thrown = ExpectedException.none();
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
index 71d2051..ab8b5b0 100644
--- a/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
+++ b/geode-rebalancer/src/main/java/org/apache/geode/cache/util/AutoBalancer.java
@@ -40,6 +40,7 @@ import org.apache.geode.cache.partition.PartitionMemberInfo;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.partitioned.InternalPRInfo;
import org.apache.geode.internal.cache.partitioned.LoadProbe;
@@ -65,7 +66,6 @@ import org.apache.geode.internal.logging.LogService;
* <OL>
* <LI>{@link AutoBalancer#SCHEDULE}
* <LI>TBD THRESHOLDS
- *
*/
@Experimental("The autobalancer may be removed or the API may change in future releases")
public class AutoBalancer implements Declarable {
@@ -344,19 +344,19 @@ public class AutoBalancer implements Declarable {
static class GeodeCacheFacade implements CacheOperationFacade {
private final AtomicBoolean isLockAcquired = new AtomicBoolean(false);
- private GemFireCacheImpl cache;
+ private InternalCache cache;
public GeodeCacheFacade() {
this(null);
}
- public GeodeCacheFacade(GemFireCacheImpl cache) {
+ public GeodeCacheFacade(InternalCache cache) {
this.cache = cache;
}
@Override
public Map<PartitionedRegion, InternalPRInfo> getRegionMemberDetails() {
- GemFireCacheImpl cache = getCache();
+ InternalCache cache = getCache();
Map<PartitionedRegion, InternalPRInfo> detailsMap = new HashMap<>();
for (PartitionedRegion region : cache.getPartitionedRegions()) {
LoadProbe probe = cache.getInternalResourceManager().getLoadProbe();
@@ -411,7 +411,7 @@ public class AutoBalancer implements Declarable {
@Override
public void incrementAttemptCounter() {
- GemFireCacheImpl cache = getCache();
+ InternalCache cache = getCache();
try {
cache.getInternalResourceManager().getStats().incAutoRebalanceAttempts();
} catch (Exception e) {
@@ -442,7 +442,7 @@ public class AutoBalancer implements Declarable {
}
}
- GemFireCacheImpl getCache() {
+ InternalCache getCache() {
if (cache == null) {
synchronized (this) {
if (cache == null) {
@@ -486,15 +486,15 @@ public class AutoBalancer implements Declarable {
@Override
public DistributedLockService getDLS() {
- GemFireCacheImpl cache = getCache();
+ InternalCache cache = getCache();
DistributedLockService dls =
DistributedLockService.getServiceNamed(AUTO_BALANCER_LOCK_SERVICE_NAME);
if (dls == null) {
if (logger.isDebugEnabled()) {
logger.debug("Creating DistributeLockService");
}
- dls = DLockService.create(AUTO_BALANCER_LOCK_SERVICE_NAME, cache.getDistributedSystem(),
- true, true, true);
+ dls = DLockService.create(AUTO_BALANCER_LOCK_SERVICE_NAME,
+ cache.getInternalDistributedSystem(), true, true, true);
}
return dls;
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java
index a98510d..43d3871 100644
--- a/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/cache/client/internal/locator/wan/WANFactoryImpl.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.cache.client.internal.locator.wan;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.apache.geode.cache.wan.GatewaySenderFactory;
import org.apache.geode.distributed.internal.WanLocatorDiscoverer;
import org.apache.geode.internal.DSFIDFactory;
import org.apache.geode.internal.DataSerializableFixedID;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.GatewayReceiverFactoryImpl;
import org.apache.geode.internal.cache.wan.GatewaySenderFactoryImpl;
import org.apache.geode.internal.cache.wan.spi.WANFactory;
@@ -45,12 +45,12 @@ public class WANFactoryImpl implements WANFactory {
}
@Override
- public GatewaySenderFactory createGatewaySenderFactory(Cache cache) {
+ public GatewaySenderFactory createGatewaySenderFactory(InternalCache cache) {
return new GatewaySenderFactoryImpl(cache);
}
@Override
- public GatewayReceiverFactory createGatewayReceiverFactory(Cache cache) {
+ public GatewayReceiverFactory createGatewayReceiverFactory(InternalCache cache) {
return new GatewayReceiverFactoryImpl(cache);
}
@@ -63,6 +63,4 @@ public class WANFactoryImpl implements WANFactory {
public LocatorMembershipListener createLocatorMembershipListener() {
return new LocatorMembershipListenerImpl();
}
-
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java
index 68eb56c..dbc2cc6 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java
@@ -14,7 +14,13 @@
*/
package org.apache.geode.internal.cache.wan;
-import org.apache.geode.cache.Cache;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.cache.client.internal.PoolImpl;
import org.apache.geode.cache.client.internal.locator.wan.RemoteLocatorRequest;
@@ -23,32 +29,22 @@ import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.distributed.internal.WanLocatorDiscoverer;
import org.apache.geode.distributed.internal.tcpserver.TcpClient;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PoolFactoryImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.logging.log4j.Logger;
-
-import java.io.IOException;
-import java.net.ConnectException;
-import java.util.Iterator;
-import java.util.StringTokenizer;
public abstract class AbstractRemoteGatewaySender extends AbstractGatewaySender {
private static final Logger logger = LogService.getLogger();
- public AbstractRemoteGatewaySender() {
-
- }
+ /** used to reduce warning logs in case remote locator is down (#47634) */
+ protected int proxyFailureTries = 0;
- public AbstractRemoteGatewaySender(Cache cache, GatewaySenderAttributes attrs) {
+ public AbstractRemoteGatewaySender(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
}
- /** used to reduce warning logs in case remote locator is down (#47634) */
- protected int proxyFailureTries = 0;
-
public synchronized void initProxy() {
// return if it is being used for WBCL or proxy is already created
if (this.remoteDSId == DEFAULT_DISTRIBUTED_SYSTEM_ID
@@ -68,8 +64,7 @@ public abstract class AbstractRemoteGatewaySender extends AbstractGatewaySender
pf.setServerGroup(GatewayReceiver.RECEIVER_GROUP);
RemoteLocatorRequest request =
new RemoteLocatorRequest(this.remoteDSId, pf.getPoolAttributes().getServerGroup());
- String locators =
- ((GemFireCacheImpl) this.cache).getDistributedSystem().getConfig().getLocators();
+ String locators = this.cache.getInternalDistributedSystem().getConfig().getLocators();
if (logger.isDebugEnabled()) {
logger
.debug("Gateway Sender is attempting to configure pool with remote locator information");
@@ -96,7 +91,6 @@ public abstract class AbstractRemoteGatewaySender extends AbstractGatewaySender
logger.debug("Received the remote site {} location information:", this.remoteDSId,
response.getLocators());
}
- StringBuffer strBuffer = new StringBuffer();
Iterator<String> itr = response.getLocators().iterator();
while (itr.hasNext()) {
String remoteLocator = itr.next();
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
index 8544636..d953d7f 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
@@ -185,7 +185,7 @@ public class GatewayReceiverImpl implements GatewayReceiver {
logger
.info(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_STARTED_ON_PORT, this.port));
- InternalDistributedSystem system = this.cache.getDistributedSystem();
+ InternalDistributedSystem system = this.cache.getInternalDistributedSystem();
system.handleResourceEvent(ResourceEvent.GATEWAYRECEIVER_START, this);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
index 7398d29..2c7925b 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
@@ -29,6 +29,7 @@ import org.apache.geode.cache.wan.GatewaySenderFactory;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderImpl;
import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderImpl;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
@@ -39,9 +40,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- *
* @since GemFire 7.0
- *
*/
public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
@@ -53,12 +52,12 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
*/
private GatewaySenderAttributes attrs = new GatewaySenderAttributes();
- private Cache cache;
+ private InternalCache cache;
private static final AtomicBoolean GATEWAY_CONNECTION_READ_TIMEOUT_PROPERTY_CHECKED =
new AtomicBoolean(false);
- public GatewaySenderFactoryImpl(Cache cache) {
+ public GatewaySenderFactoryImpl(InternalCache cache) {
this.cache = cache;
}
@@ -250,13 +249,6 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
LocalizedStrings.SerialGatewaySenderImpl_GATEWAY_0_CANNOT_DEFINE_A_REMOTE_SITE_BECAUSE_AT_LEAST_ONE_LISTENER_IS_ALREADY_ADDED
.toLocalizedString(id));
}
- // if (this.attrs.getOrderPolicy() != null) {
- // if (this.attrs.getDispatcherThreads() == GatewaySender.DEFAULT_DISPATCHER_THREADS) {
- // throw new GatewaySenderException(
- // LocalizedStrings.SerialGatewaySender_INVALID_GATEWAY_SENDER_ORDER_POLICY_CONCURRENCY_0
- // .toLocalizedString(id));
- // }
- // }
if (this.attrs.getOrderPolicy() == null && this.attrs.getDispatcherThreads() > 1) {
this.attrs.policy = GatewaySender.DEFAULT_ORDER_POLICY;
}
@@ -304,13 +296,6 @@ public class GatewaySenderFactoryImpl implements InternalGatewaySenderFactory {
((CacheCreation) this.cache).addGatewaySender(sender);
}
} else {
- // if (this.attrs.getOrderPolicy() != null) {
- // if (this.attrs.getDispatcherThreads() == GatewaySender.DEFAULT_DISPATCHER_THREADS) {
- // throw new AsyncEventQueueConfigurationException(
- // LocalizedStrings.AsyncEventQueue_INVALID_ORDER_POLICY_CONCURRENCY_0
- // .toLocalizedString(id));
- // }
- // }
if (this.attrs.getOrderPolicy() == null && this.attrs.getDispatcherThreads() > 1) {
this.attrs.policy = GatewaySender.DEFAULT_ORDER_POLICY;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index 518966a..c2d4673 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -16,53 +16,36 @@ package org.apache.geode.internal.cache.wan.parallel;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
-import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueImpl;
-import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueStats;
-import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
-import org.apache.geode.distributed.internal.DistributionAdvisor;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
-import org.apache.geode.internal.cache.wan.AbstractRemoteGatewaySender;
import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
-import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor;
-import org.apache.geode.internal.cache.wan.GatewaySenderStats;
+import org.apache.geode.internal.cache.wan.AbstractRemoteGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor.GatewaySenderProfile;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
-import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* @since GemFire 7.0
- *
*/
public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
private static final Logger logger = LogService.getLogger();
- final ThreadGroup loggerGroup =
- LoggingThreadGroup.createThreadGroup("Remote Site Discovery Logger Group", logger);
-
- public ParallelGatewaySenderImpl() {
- super();
- this.isParallel = true;
- }
-
- public ParallelGatewaySenderImpl(Cache cache, GatewaySenderAttributes attrs) {
+ public ParallelGatewaySenderImpl(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
}
@@ -77,8 +60,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
}
if (this.remoteDSId != DEFAULT_DISTRIBUTED_SYSTEM_ID) {
- String locators =
- ((GemFireCacheImpl) this.cache).getDistributedSystem().getConfig().getLocators();
+ String locators = this.cache.getInternalDistributedSystem().getConfig().getLocators();
if (locators.length() == 0) {
throw new IllegalStateException(
LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
@@ -92,22 +74,16 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
* of Concurrent version of processor and queue.
*/
eventProcessor = new RemoteConcurrentParallelGatewaySenderEventProcessor(this);
- /*
- * if (getDispatcherThreads() > 1) { eventProcessor = new
- * ConcurrentParallelGatewaySenderEventProcessor(this); } else { eventProcessor = new
- * ParallelGatewaySenderEventProcessor(this); }
- */
-
eventProcessor.start();
waitForRunningStatus();
+
// Only notify the type registry if this is a WAN gateway queue
if (!isAsyncEventQueue()) {
((GemFireCacheImpl) getCache()).getPdxRegistry().gatewaySenderStarted(this);
}
new UpdateAttributesProcessor(this).distribute(false);
- InternalDistributedSystem system =
- (InternalDistributedSystem) this.cache.getDistributedSystem();
+ InternalDistributedSystem system = this.cache.getInternalDistributedSystem();
system.handleResourceEvent(ResourceEvent.GATEWAYSENDER_START, this);
logger.info(
@@ -119,15 +95,6 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
}
}
- // /**
- // * The sender is not started but only the message queue i.e. shadowPR is created on the node.
- // * @param targetPr
- // */
- // private void createMessageQueueOnAccessorNode(PartitionedRegion targetPr) {
- // eventProcessor = new ParallelGatewaySenderEventProcessor(this, targetPr);
- // }
-
-
@Override
public void stop() {
this.getLifeCycleLock().writeLock().lock();
@@ -137,7 +104,6 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
}
// Stop the dispatcher
AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
- // try {
if (ev != null && !ev.isStopped()) {
ev.stopProcessing();
}
@@ -162,9 +128,6 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
clearTempEventsAfterSenderStopped();
// Keep the eventProcessor around so we can ask it for the regionQueues later.
// Tests expect to be able to do this.
- // } finally {
- // this.eventProcessor = null;
- // }
} finally {
this.getLifeCycleLock().writeLock().unlock();
}
@@ -207,24 +170,11 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
pf.isDiskSynchronous = isDiskSynchronous();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.internal.cache.wan.AbstractGatewaySender#setModifiedEventId(org.apache.geode.
- * internal.cache.EntryEventImpl)
- */
@Override
protected void setModifiedEventId(EntryEventImpl clonedEvent) {
int bucketId = -1;
// merged from 42004
if (clonedEvent.getRegion() instanceof DistributedRegion) {
- // if (getOrderPolicy() == OrderPolicy.THREAD) {
- // bucketId = PartitionedRegionHelper.getHashKey(
- // ((EntryEventImpl)clonedEvent).getEventId().getThreadID(),
- // getMaxParallelismForReplicatedRegion());
- // }
- // else
bucketId = PartitionedRegionHelper.getHashKey(clonedEvent.getKey(),
getMaxParallelismForReplicatedRegion());
} else {
@@ -240,18 +190,6 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
// we don't need to generate different threadId for secondary buckets
// as they will be rejected if seen at PR level itself
- // boolean isPrimary = ((PartitionedRegion)getQueue().getRegion())
- // .getRegionAdvisor().getBucketAdvisor(bucketId).isPrimary();
- // if (isPrimary) {
- // newThreadId = ThreadIdentifier
- // .createFakeThreadIDForParallelGSPrimaryBucket(bucketId,
- // originatingThreadId);
- // } else {
- // newThreadId = ThreadIdentifier
- // .createFakeThreadIDForParallelGSSecondaryBucket(bucketId,
- // originatingThreadId);
- // }
-
EventID newEventId = new EventID(originalEventId.getMembershipID(), newThreadId,
originalEventId.getSequenceID(), bucketId);
if (logger.isDebugEnabled()) {
@@ -262,5 +200,4 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
}
clonedEvent.setEventId(newEventId);
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
index 3aa18ce..b300460 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
@@ -18,7 +18,6 @@ import java.util.Set;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.DistributedLockService;
@@ -28,6 +27,7 @@ import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
@@ -38,26 +38,16 @@ import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
import org.apache.geode.internal.cache.wan.GatewaySenderConfigurationException;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
* @since GemFire 7.0
- *
*/
public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
private static final Logger logger = LogService.getLogger();
- final ThreadGroup loggerGroup =
- LoggingThreadGroup.createThreadGroup("Remote Site Discovery Logger Group", logger);
-
- public SerialGatewaySenderImpl() {
- super();
- this.isParallel = false;
- }
-
- public SerialGatewaySenderImpl(Cache cache, GatewaySenderAttributes attrs) {
+ public SerialGatewaySenderImpl(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
}
@@ -75,8 +65,7 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
return;
}
if (this.remoteDSId != DEFAULT_DISTRIBUTED_SYSTEM_ID) {
- String locators =
- ((GemFireCacheImpl) this.cache).getDistributedSystem().getConfig().getLocators();
+ String locators = this.cache.getInternalDistributedSystem().getConfig().getLocators();
if (locators.length() == 0) {
throw new GatewaySenderConfigurationException(
LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
@@ -108,9 +97,7 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
}
new UpdateAttributesProcessor(this).distribute(false);
-
- InternalDistributedSystem system =
- (InternalDistributedSystem) this.cache.getDistributedSystem();
+ InternalDistributedSystem system = this.cache.getInternalDistributedSystem();
system.handleResourceEvent(ResourceEvent.GATEWAYSENDER_START, this);
logger
@@ -230,13 +217,6 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
pf.serverLocation = this.getServerLocation();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.internal.cache.wan.AbstractGatewaySender#setModifiedEventId(org.apache.geode.
- * internal.cache.EntryEventImpl)
- */
@Override
protected void setModifiedEventId(EntryEventImpl clonedEvent) {
EventID originalEventId = clonedEvent.getEventId();
@@ -257,5 +237,4 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
}
clonedEvent.setEventId(newEventId);
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
index 8aa887b..34f0a8b 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -493,7 +493,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
VM locatorAndMgr = getHost(0).getVM(3);
locatorAndMgr.invoke(() -> {
GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
- ShutdownAllRequest.send(cache.getDistributedSystem().getDistributionManager(), -1);
+ ShutdownAllRequest.send(cache.getInternalDistributedSystem().getDistributionManager(), -1);
return null;
});
[4/4] geode git commit: 2632: refactor code to use internal interfaces
Posted by kl...@apache.org.
2632: refactor code to use internal interfaces
* refactor code to use InternalCache instead of GemFireCacheImpl
* refactor code to use getInternalDistributedSystem
* delete dead code, unused code, unused imports, extra whitespace,
useless javadocs and comments, fix typos
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/ec15aed4
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/ec15aed4
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/ec15aed4
Branch: refs/heads/feature/GEODE-2632-1
Commit: ec15aed4e7bd98b791a819e7265b413f4987c7b4
Parents: c5ee7cd
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Apr 17 14:53:00 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Tue Apr 18 16:27:33 2017 -0700
----------------------------------------------------------------------
...erConfigurationServiceEndToEndDUnitTest.java | 2 +-
.../internal/AsyncEventQueueFactoryImpl.java | 13 ++--
.../internal/ParallelAsyncEventQueueImpl.java | 60 ++--------------
.../internal/SerialAsyncEventQueueImpl.java | 18 ++---
.../geode/internal/cache/AbstractRegion.java | 4 +-
.../geode/internal/cache/CacheServerImpl.java | 4 +-
.../internal/cache/DiskStoreFactoryImpl.java | 6 +-
.../geode/internal/cache/DiskStoreImpl.java | 4 +-
.../geode/internal/cache/DiskStoreMonitor.java | 2 +-
.../DistTXStateProxyImplOnCoordinator.java | 3 +-
.../geode/internal/cache/DistributedRegion.java | 3 +-
.../apache/geode/internal/cache/ExpiryTask.java | 2 +-
.../geode/internal/cache/GemFireCacheImpl.java | 17 +++--
.../geode/internal/cache/InternalCache.java | 13 ++++
.../geode/internal/cache/LocalRegion.java | 8 +--
.../geode/internal/cache/PartitionedRegion.java | 11 +--
.../internal/cache/PartitionedRegionHelper.java | 5 +-
.../geode/internal/cache/ProxyBucketRegion.java | 2 +-
.../cache/SearchLoadAndWriteProcessor.java | 3 +-
.../geode/internal/cache/ServerPingMessage.java | 2 +-
.../apache/geode/internal/cache/TXMessage.java | 2 +-
.../cache/control/HeapMemoryMonitor.java | 6 +-
.../geode/internal/cache/ha/HARegionQueue.java | 2 +-
.../cache/persistence/BackupManager.java | 7 +-
.../cache/tier/sockets/CacheClientProxy.java | 3 +-
.../internal/cache/tx/ClientTXStateStub.java | 2 +-
.../cache/wan/AbstractGatewaySender.java | 14 ++--
.../cache/wan/GatewaySenderAdvisor.java | 2 +-
.../internal/cache/wan/WANServiceProvider.java | 10 ++-
.../parallel/ParallelGatewaySenderQueue.java | 2 +-
.../wan/serial/SerialGatewaySenderQueue.java | 2 +-
.../internal/cache/wan/spi/WANFactory.java | 6 +-
.../internal/cache/xmlcache/CacheCreation.java | 34 ++++++---
.../ParallelAsyncEventQueueCreation.java | 48 +++----------
.../xmlcache/ParallelGatewaySenderCreation.java | 46 ++----------
.../xmlcache/SerialAsyncEventQueueCreation.java | 37 ++--------
.../xmlcache/SerialGatewaySenderCreation.java | 37 ++--------
.../geode/management/internal/LocalManager.java | 2 +-
.../management/internal/ManagementAgent.java | 4 +-
.../internal/beans/ManagementAdapter.java | 7 +-
.../internal/beans/MemberMBeanBridge.java | 6 +-
.../CreateAlterDestroyRegionCommands.java | 2 +-
.../internal/cli/functions/DeployFunction.java | 4 +-
.../cli/functions/ExportLogsFunction.java | 6 +-
.../cli/functions/SizeExportLogsFunction.java | 2 +-
.../pdx/internal/LonerTypeRegistration.java | 2 +-
.../pdx/internal/PeerTypeRegistration.java | 14 ++--
.../SerialAsyncEventQueueImplJUnitTest.java | 5 +-
.../geode/cache30/ReconnectDUnitTest.java | 5 +-
.../ReconnectedCacheServerDUnitTest.java | 24 +++----
.../geode/cache30/TXDistributedDUnitTest.java | 4 +-
.../geode/internal/cache/BackupJUnitTest.java | 15 ++--
.../cache/NetSearchMessagingDUnitTest.java | 2 +-
.../cache/SearchLoadAndWriteProcessorTest.java | 1 +
.../FetchEntriesMessageJUnitTest.java | 2 +-
.../java/org/apache/geode/test/fake/Fakes.java | 17 +++--
.../LuceneIndexForPartitionedRegion.java | 18 ++---
.../cache/lucene/internal/LuceneIndexImpl.java | 11 ++-
.../lucene/internal/LuceneIndexImplFactory.java | 5 +-
.../cache/lucene/internal/LuceneRawIndex.java | 5 +-
.../lucene/internal/LuceneRawIndexFactory.java | 5 +-
.../lucene/internal/LuceneRegionListener.java | 13 ++--
.../lucene/internal/LuceneServiceImpl.java | 13 ++--
.../LuceneIndexCreationIntegrationTest.java | 3 +-
.../lucene/internal/LuceneIndexFactorySpy.java | 19 +++--
.../LuceneIndexForPartitionedRegionTest.java | 26 +++----
.../internal/LuceneIndexImplJUnitTest.java | 8 ++-
.../apache/geode/cache/util/AutoBalancer.java | 18 ++---
.../internal/locator/wan/WANFactoryImpl.java | 8 +--
.../cache/wan/AbstractRemoteGatewaySender.java | 30 ++++----
.../internal/cache/wan/GatewayReceiverImpl.java | 2 +-
.../cache/wan/GatewaySenderFactoryImpl.java | 21 +-----
.../wan/parallel/ParallelGatewaySenderImpl.java | 75 ++------------------
.../wan/serial/SerialGatewaySenderImpl.java | 29 ++------
.../ClusterConfigurationDUnitTest.java | 2 +-
75 files changed, 313 insertions(+), 564 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
index 0103cf6..1a97cb6 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
@@ -416,7 +416,7 @@ public class ClusterConfigurationServiceEndToEndDUnitTest extends CliCommandTest
@Override
public Object call() throws Exception {
GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
- ShutdownAllRequest.send(cache.getDistributedSystem().getDistributionManager(), -1);
+ ShutdownAllRequest.send(cache.getInternalDistributedSystem().getDistributionManager(), -1);
return null;
}
});
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
index b288108..1a4052b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueFactoryImpl.java
@@ -14,11 +14,8 @@
*/
package org.apache.geode.cache.asyncqueue.internal;
-import org.apache.geode.internal.cache.wan.AsyncEventQueueConfigurationException;
-
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.asyncqueue.AsyncEventQueueFactory;
@@ -26,15 +23,14 @@ import org.apache.geode.cache.wan.GatewayEventFilter;
import org.apache.geode.cache.wan.GatewayEventSubstitutionFilter;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
-import org.apache.geode.cache.wan.GatewaySenderFactory;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.AsyncEventQueueConfigurationException;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
import org.apache.geode.internal.cache.xmlcache.AsyncEventQueueCreation;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.ParallelAsyncEventQueueCreation;
-import org.apache.geode.internal.cache.xmlcache.ParallelGatewaySenderCreation;
import org.apache.geode.internal.cache.xmlcache.SerialAsyncEventQueueCreation;
-import org.apache.geode.internal.cache.xmlcache.SerialGatewaySenderCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
@@ -48,15 +44,14 @@ public class AsyncEventQueueFactoryImpl implements AsyncEventQueueFactory {
*/
private GatewaySenderAttributes attrs = new GatewaySenderAttributes();
- private Cache cache;
+ private InternalCache cache;
/**
* The default batchTimeInterval for AsyncEventQueue in milliseconds.
*/
public static final int DEFAULT_BATCH_TIME_INTERVAL = 5;
-
- public AsyncEventQueueFactoryImpl(Cache cache) {
+ public AsyncEventQueueFactoryImpl(InternalCache cache) {
this.cache = cache;
this.attrs = new GatewaySenderAttributes();
// set a different default for batchTimeInterval for AsyncEventQueue
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
index 03f0799..e799880 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
@@ -16,7 +16,6 @@ package org.apache.geode.cache.asyncqueue.internal;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.EntryOperation;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.wan.GatewayTransportFilter;
@@ -27,6 +26,7 @@ import org.apache.geode.internal.cache.DistributedRegion;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
@@ -39,22 +39,13 @@ import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor.GatewaySenderPro
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
private static final Logger logger = LogService.getLogger();
- final ThreadGroup loggerGroup =
- LoggingThreadGroup.createThreadGroup("Remote Site Discovery Logger Group", logger);
-
- public ParallelAsyncEventQueueImpl() {
- super();
- this.isParallel = true;
- }
-
- public ParallelAsyncEventQueueImpl(Cache cache, GatewaySenderAttributes attrs) {
+ public ParallelAsyncEventQueueImpl(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
if (!(this.cache instanceof CacheCreation)) {
// this sender lies underneath the AsyncEventQueue. Need to have
@@ -76,8 +67,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
}
if (this.remoteDSId != DEFAULT_DISTRIBUTED_SYSTEM_ID) {
- String locators =
- ((GemFireCacheImpl) this.cache).getDistributedSystem().getConfig().getLocators();
+ String locators = this.cache.getInternalDistributedSystem().getConfig().getLocators();
if (locators.length() == 0) {
throw new IllegalStateException(
LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
@@ -91,14 +81,9 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
* of Concurrent version of processor and queue.
*/
eventProcessor = new ConcurrentParallelGatewaySenderEventProcessor(this);
- /*
- * if (getDispatcherThreads() > 1) { eventProcessor = new
- * ConcurrentParallelGatewaySenderEventProcessor(this); } else { eventProcessor = new
- * ParallelGatewaySenderEventProcessor(this); }
- */
-
eventProcessor.start();
waitForRunningStatus();
+
// Only notify the type registry if this is a WAN gateway queue
if (!isAsyncEventQueue()) {
((GemFireCacheImpl) getCache()).getPdxRegistry().gatewaySenderStarted(this);
@@ -118,15 +103,6 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
}
}
- // /**
- // * The sender is not started but only the message queue i.e. shadowPR is created on the node.
- // * @param targetPr
- // */
- // private void createMessageQueueOnAccessorNode(PartitionedRegion targetPr) {
- // eventProcessor = new ParallelGatewaySenderEventProcessor(this, targetPr);
- // }
-
-
@Override
public void stop() {
this.getLifeCycleLock().writeLock().lock();
@@ -200,24 +176,11 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
pf.isDiskSynchronous = isDiskSynchronous();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.internal.cache.wan.AbstractGatewaySender#setModifiedEventId(org.apache.geode.
- * internal.cache.EntryEventImpl)
- */
@Override
protected void setModifiedEventId(EntryEventImpl clonedEvent) {
int bucketId = -1;
// merged from 42004
if (clonedEvent.getRegion() instanceof DistributedRegion) {
- // if (getOrderPolicy() == OrderPolicy.THREAD) {
- // bucketId = PartitionedRegionHelper.getHashKey(
- // ((EntryEventImpl)clonedEvent).getEventId().getThreadID(),
- // getMaxParallelismForReplicatedRegion());
- // }
- // else
bucketId = PartitionedRegionHelper.getHashKey(clonedEvent.getKey(),
getMaxParallelismForReplicatedRegion());
} else {
@@ -230,21 +193,9 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
originatingThreadId, getEventIdIndex());
// In case of parallel as all events go through primary buckets
- // we don't neet to generate different threadId for secondary buckets
+ // we don't need to generate different threadId for secondary buckets
// as they will be rejected if seen at PR level itself
- // boolean isPrimary = ((PartitionedRegion)getQueue().getRegion())
- // .getRegionAdvisor().getBucketAdvisor(bucketId).isPrimary();
- // if (isPrimary) {
- // newThreadId = ThreadIdentifier
- // .createFakeThreadIDForParallelGSPrimaryBucket(bucketId,
- // originatingThreadId);
- // } else {
- // newThreadId = ThreadIdentifier
- // .createFakeThreadIDForParallelGSSecondaryBucket(bucketId,
- // originatingThreadId);
- // }
-
EventID newEventId = new EventID(originalEventId.getMembershipID(), newThreadId,
originalEventId.getSequenceID(), bucketId);
if (logger.isDebugEnabled()) {
@@ -255,5 +206,4 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
}
clonedEvent.setEventId(newEventId);
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
index 08a5b00..9252dc7 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
@@ -14,10 +14,9 @@
*/
package org.apache.geode.cache.asyncqueue.internal;
-import org.apache.geode.CancelException;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.Cache;
+import org.apache.geode.CancelException;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.DistributedLockService;
@@ -27,6 +26,7 @@ import org.apache.geode.distributed.internal.ResourceEvent;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
@@ -41,22 +41,13 @@ import org.apache.geode.internal.cache.wan.serial.SerialGatewaySenderQueue;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
private static final Logger logger = LogService.getLogger();
- final ThreadGroup loggerGroup =
- LoggingThreadGroup.createThreadGroup("Remote Site Discovery Logger Group", logger);
-
- public SerialAsyncEventQueueImpl() {
- super();
- this.isParallel = false;
- }
-
- public SerialAsyncEventQueueImpl(Cache cache, GatewaySenderAttributes attrs) {
+ public SerialAsyncEventQueueImpl(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
if (!(this.cache instanceof CacheCreation)) {
// this sender lies underneath the AsyncEventQueue. Need to have
@@ -80,8 +71,7 @@ public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
return;
}
if (this.remoteDSId != DEFAULT_DISTRIBUTED_SYSTEM_ID) {
- String locators =
- ((GemFireCacheImpl) this.cache).getDistributedSystem().getConfig().getLocators();
+ String locators = this.cache.getInternalDistributedSystem().getConfig().getLocators();
if (locators.length() == 0) {
throw new GatewaySenderConfigurationException(
LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
index e69f801..1f4e50c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java
@@ -1768,7 +1768,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib
}
public final long cacheTimeMillis() {
- return this.cache.getDistributedSystem().getClock().cacheTimeMillis();
+ return this.cache.getInternalDistributedSystem().getClock().cacheTimeMillis();
}
public final RegionService getRegionService() {
@@ -1780,7 +1780,7 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib
}
public InternalDistributedSystem getSystem() {
- return getCache().getDistributedSystem();
+ return getCache().getInternalDistributedSystem();
}
// DataSerializableFixedID support
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index a3c4a93..367b6f4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -355,7 +355,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
}
if (!isGatewayReceiver) {
- InternalDistributedSystem system = ((GemFireCacheImpl) this.cache).getDistributedSystem();
+ InternalDistributedSystem system = this.cache.getInternalDistributedSystem();
system.handleResourceEvent(ResourceEvent.CACHE_SERVER_START, this);
}
@@ -451,7 +451,7 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
txMgr.removeHostedTXStatesForClients();
if (!isGatewayReceiver) {
- InternalDistributedSystem system = ((GemFireCacheImpl) this.cache).getDistributedSystem();
+ InternalDistributedSystem system = this.cache.getInternalDistributedSystem();
system.handleResourceEvent(ResourceEvent.CACHE_SERVER_STOP, this);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java
index 71be7ec..000bf0d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreFactoryImpl.java
@@ -14,9 +14,7 @@
*/
package org.apache.geode.internal.cache;
-
import java.io.File;
-import java.io.IOException;
import java.util.Arrays;
import org.apache.geode.GemFireIOException;
@@ -24,7 +22,6 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.DiskStore;
import org.apache.geode.distributed.internal.ResourceEvent;
-import org.apache.geode.internal.cache.DiskStoreAttributes;
import org.apache.geode.internal.cache.persistence.BackupManager;
import org.apache.geode.internal.cache.xmlcache.CacheCreation;
import org.apache.geode.internal.cache.xmlcache.CacheXml;
@@ -145,7 +142,8 @@ public class DiskStoreFactoryImpl implements DiskStoreFactory {
DiskStoreImpl dsi = new DiskStoreImpl(gfc, this.attrs);
result = dsi;
/** Added for M&M **/
- gfc.getDistributedSystem().handleResourceEvent(ResourceEvent.DISKSTORE_CREATE, dsi);
+ gfc.getInternalDistributedSystem().handleResourceEvent(ResourceEvent.DISKSTORE_CREATE,
+ dsi);
dsi.doInitialRecovery();
gfc.addDiskStore(dsi);
if (registry != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index b97f428..d13b4a6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -3243,7 +3243,7 @@ public class DiskStoreImpl implements DiskStore {
public PersistentMemberID generatePersistentID(DiskRegionView dr) {
File firstDir = getInfoFileDir().getDir();
- InternalDistributedSystem ids = getCache().getDistributedSystem();
+ InternalDistributedSystem ids = getCache().getInternalDistributedSystem();
InternalDistributedMember memberId = ids.getDistributionManager().getDistributionManagerId();
// NOTE - do NOT use DM.cacheTimeMillis here. See bug #49920
@@ -3253,7 +3253,7 @@ public class DiskStoreImpl implements DiskStore {
}
public PersistentID getPersistentID() {
- InetAddress host = cache.getDistributedSystem().getDistributedMember().getInetAddress();
+ InetAddress host = cache.getInternalDistributedSystem().getDistributedMember().getInetAddress();
String dir = getDiskDirs()[0].getAbsolutePath();
return new PersistentMemberPattern(host, dir, this.diskStoreID.toUUID(), 0);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java
index 2bb5107..551f733 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreMonitor.java
@@ -211,7 +211,7 @@ public class DiskStoreMonitor {
File log = null;
GemFireCacheImpl gci = GemFireCacheImpl.getInstance();
if (gci != null) {
- InternalDistributedSystem ds = gci.getDistributedSystem();
+ InternalDistributedSystem ds = gci.getInternalDistributedSystem();
if (ds != null) {
DistributionConfig conf = ds.getConfig();
if (conf != null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
index 52d155f..68bde4e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateProxyImplOnCoordinator.java
@@ -134,7 +134,8 @@ public class DistTXStateProxyImplOnCoordinator extends DistTXStateProxyImpl {
private HashMap<DistributedMember, DistTXCoordinatorInterface> getSecondariesAndReplicasForTxOps() {
final GemFireCacheImpl cache =
GemFireCacheImpl.getExisting("getSecondariesAndReplicasForTxOps");
- InternalDistributedMember currentNode = cache.getDistributedSystem().getDistributedMember();
+ InternalDistributedMember currentNode =
+ cache.getInternalDistributedSystem().getDistributedMember();
HashMap<DistributedMember, DistTXCoordinatorInterface> secondaryTarget2realDeals =
new HashMap<>();
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 68fdbeb..0c967c9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -2504,7 +2504,8 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
}
// Fix for #48066 - make sure that region operations are completely
// distributed to peers before destroying the region.
- long timeout = 1000L * getCache().getDistributedSystem().getConfig().getAckWaitThreshold();
+ long timeout =
+ 1000L * getCache().getInternalDistributedSystem().getConfig().getAckWaitThreshold();
Boolean flushOnClose =
!Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "no-flush-on-close"); // test hook
if (!this.cache.forcedDisconnect() && flushOnClose
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index e12622d..d3f5987 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -467,7 +467,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
if (cache != null) {
// Use cache.cacheTimeMillis here. See bug 52267.
- InternalDistributedSystem ids = cache.getDistributedSystem();
+ InternalDistributedSystem ids = cache.getInternalDistributedSystem();
if (ids != null) {
return ids.getClock().cacheTimeMillis();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 8691814..56243e1 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -2019,8 +2019,8 @@ public class GemFireCacheImpl
try {
this.prLockService =
DLockService.create(PartitionedRegionHelper.PARTITION_LOCK_SERVICE_NAME,
- getDistributedSystem(), true /* distributed */, true /* destroyOnDisconnect */,
- true /* automateFreeResources */);
+ getInternalDistributedSystem(), true /* distributed */,
+ true /* destroyOnDisconnect */, true /* automateFreeResources */);
} catch (IllegalArgumentException e) {
this.prLockService = DistributedLockService
.getServiceNamed(PartitionedRegionHelper.PARTITION_LOCK_SERVICE_NAME);
@@ -2045,8 +2045,8 @@ public class GemFireCacheImpl
if (this.gatewayLockService == null) {
try {
this.gatewayLockService = DLockService.create(AbstractGatewaySender.LOCK_SERVICE_NAME,
- getDistributedSystem(), true /* distributed */, true /* destroyOnDisconnect */,
- true /* automateFreeResources */);
+ getInternalDistributedSystem(), true /* distributed */,
+ true /* destroyOnDisconnect */, true /* automateFreeResources */);
} catch (IllegalArgumentException e) {
this.gatewayLockService =
DistributedLockService.getServiceNamed(AbstractGatewaySender.LOCK_SERVICE_NAME);
@@ -2858,7 +2858,12 @@ public class GemFireCacheImpl
}
@Override
- public InternalDistributedSystem getDistributedSystem() {
+ public DistributedSystem getDistributedSystem() {
+ return this.system;
+ }
+
+ @Override
+ public InternalDistributedSystem getInternalDistributedSystem() {
return this.system;
}
@@ -4836,7 +4841,7 @@ public class GemFireCacheImpl
}
private void sendAddCacheServerProfileMessage() {
- DM dm = this.getDistributedSystem().getDistributionManager();
+ DM dm = getInternalDistributedSystem().getDistributionManager();
Set otherMembers = dm.getOtherDistributionManagerIds();
AddCacheServerProfileMessage msg = new AddCacheServerProfileMessage();
msg.operateOnLocalCache(this);
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
index ee80014..709308b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
@@ -38,6 +38,7 @@ import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.SystemTimer;
import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.control.ResourceAdvisor;
@@ -167,4 +168,16 @@ public interface InternalCache extends Cache, Extensible<Cache> {
LocalRegion getRegionByPath(String path);
boolean isClient();
+
+ InternalDistributedSystem getInternalDistributedSystem();
+
+ Set<PartitionedRegion> getPartitionedRegions();
+
+ void addRegionListener(RegionListener l);
+
+ void removeRegionListener(RegionListener l);
+
+ Set<RegionListener> getRegionListeners();
+
+ CacheConfig getCacheConfig();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 55ee6a8..5d5044b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -980,7 +980,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
// instead of destroyLock in LocalRegion? ManagementAdapter is one
// of the Resource Event listeners
- InternalDistributedSystem system = this.cache.getDistributedSystem();
+ InternalDistributedSystem system = this.cache.getInternalDistributedSystem();
system.handleResourceEvent(ResourceEvent.REGION_CREATE, newRegion);
}
}
@@ -2683,7 +2683,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
try {
rgn.recursiveDestroyRegion(eventSet, event, cacheWrite);
if (!rgn.isInternalRegion()) {
- InternalDistributedSystem system = rgn.cache.getDistributedSystem();
+ InternalDistributedSystem system = rgn.cache.getInternalDistributedSystem();
system.handleResourceEvent(ResourceEvent.REGION_REMOVE, rgn);
}
} catch (CancelException e) {
@@ -6507,7 +6507,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
* artifacts From Management Layer
**/
if (!isInternalRegion()) {
- InternalDistributedSystem system = this.cache.getDistributedSystem();
+ InternalDistributedSystem system = this.cache.getInternalDistributedSystem();
system.handleResourceEvent(ResourceEvent.REGION_REMOVE, this);
}
@@ -7577,7 +7577,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
.toLocalizedString(), e);
} catch (TimeoutException e) {
// not possible with local operation, no distributed locks possible
- InternalDistributedSystem ids = (this.getCache().getDistributedSystem());
+ InternalDistributedSystem ids = (this.getCache().getInternalDistributedSystem());
if (!ids.isDisconnecting()) {
throw new InternalGemFireError(
LocalizedStrings.LocalRegion_TIMEOUTEXCEPTION_SHOULD_NOT_BE_THROWN_HERE
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 8db8969..774ad0c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -625,7 +625,7 @@ public class PartitionedRegion extends LocalRegion
// up upon
// distributed system disconnect even this (or other) PRs are destroyed
// (which prevents pridmap cleanup).
- cache.getDistributedSystem().addDisconnectListener(dsPRIdCleanUpListener);
+ cache.getInternalDistributedSystem().addDisconnectListener(dsPRIdCleanUpListener);
// this.userScope = ra.getScope();
this.partitionAttributes = ra.getPartitionAttributes();
@@ -6892,7 +6892,7 @@ public class PartitionedRegion extends LocalRegion
ReplyProcessor21.forceSevereAlertProcessing();
}
try {
- DM dm = cache.getDistributedSystem().getDistributionManager();
+ DM dm = cache.getInternalDistributedSystem().getDistributionManager();
long ackWaitThreshold = 0;
long ackSAThreshold = dm.getConfig().getAckSevereAlertThreshold() * 1000;
@@ -6971,7 +6971,7 @@ public class PartitionedRegion extends LocalRegion
final Object key = this.lockName;
- final DM dm = cache.getDistributedSystem().getDistributionManager();
+ final DM dm = cache.getInternalDistributedSystem().getDistributionManager();
long start = System.currentTimeMillis();
long end;
@@ -6984,7 +6984,7 @@ public class PartitionedRegion extends LocalRegion
}
long ackSAThreshold =
- cache.getDistributedSystem().getConfig().getAckSevereAlertThreshold() * 1000;
+ cache.getInternalDistributedSystem().getConfig().getAckSevereAlertThreshold() * 1000;
boolean suspected = false;
boolean severeAlertIssued = false;
DistributedMember lockHolder = null;
@@ -6993,7 +6993,8 @@ public class PartitionedRegion extends LocalRegion
long ackWaitThreshold;
if (ackSAThreshold > 0) {
- ackWaitThreshold = cache.getDistributedSystem().getConfig().getAckWaitThreshold() * 1000;
+ ackWaitThreshold =
+ cache.getInternalDistributedSystem().getConfig().getAckWaitThreshold() * 1000;
waitInterval = ackWaitThreshold;
start = System.currentTimeMillis();
} else {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
index 99ab281..08dac6e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
@@ -331,7 +331,7 @@ public class PartitionedRegionHelper {
return;
}
- DM dm = cache.getDistributedSystem().getDistributionManager();
+ DM dm = cache.getInternalDistributedSystem().getDistributionManager();
if (logger.isDebugEnabled()) {
logger.debug("Cleaning PartitionedRegion meta data for memberId={}", failedMemId);
@@ -859,7 +859,8 @@ public class PartitionedRegionHelper {
* @return membership Set.
*/
public static Set getMembershipSet(GemFireCacheImpl cache) {
- return cache.getDistributedSystem().getDistributionManager().getDistributionManagerIds();
+ return cache.getInternalDistributedSystem().getDistributionManager()
+ .getDistributionManagerIds();
}
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
index 27f73c7..06378f2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java
@@ -194,7 +194,7 @@ public final class ProxyBucketRegion implements Bucket {
}
public InternalDistributedSystem getSystem() {
- return this.partitionedRegion.getCache().getDistributedSystem();
+ return this.partitionedRegion.getCache().getInternalDistributedSystem();
}
public String getName() {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
index 2a10792..65cda5d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
@@ -1184,7 +1184,8 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
private synchronized void waitForObject2(final int timeoutMs) throws TimeoutException {
if (this.requestInProgress) {
try {
- final DM dm = this.region.getCache().getDistributedSystem().getDistributionManager();
+ final DM dm =
+ this.region.getCache().getInternalDistributedSystem().getDistributionManager();
long waitTimeMs = timeoutMs;
final long endTime = System.currentTimeMillis() + waitTimeMs;
for (;;) {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
index 0e46891..aa37880 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ServerPingMessage.java
@@ -58,7 +58,7 @@ public class ServerPingMessage extends PooledDistributionMessage {
*/
public static boolean send(GemFireCacheImpl cache, Set<InternalDistributedMember> recipients) {
- InternalDistributedSystem ids = cache.getDistributedSystem();
+ InternalDistributedSystem ids = cache.getInternalDistributedSystem();
DM dm = ids.getDistributionManager();
Set<InternalDistributedMember> filteredRecipients = new HashSet<InternalDistributedMember>();
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
index 08ce99b..fd53fb1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXMessage.java
@@ -74,7 +74,7 @@ public abstract class TXMessage extends SerialDistributionMessage
logger.debug("processing {}", this);
}
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- if (checkCacheClosing(cache) || checkDSClosing(cache.getDistributedSystem())) {
+ if (checkCacheClosing(cache) || checkDSClosing(cache.getInternalDistributedSystem())) {
thr = new CacheClosedException(LocalizedStrings.PartitionMessage_REMOTE_CACHE_IS_CLOSED_0
.toLocalizedString(dm.getId()));
return;
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
index 0de41bf..7578f15 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java
@@ -279,7 +279,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
}
// Stop the stats listener
- final GemFireStatSampler sampler = this.cache.getDistributedSystem().getStatSampler();
+ final GemFireStatSampler sampler = this.cache.getInternalDistributedSystem().getStatSampler();
if (sampler != null) {
sampler.removeLocalStatListener(this.statListener);
}
@@ -294,7 +294,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
* @return True of the listener was correctly started, false otherwise.
*/
private boolean startCacheStatListener() {
- final GemFireStatSampler sampler = this.cache.getDistributedSystem().getStatSampler();
+ final GemFireStatSampler sampler = this.cache.getInternalDistributedSystem().getStatSampler();
if (sampler == null) {
return false;
}
@@ -302,7 +302,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor {
try {
sampler.waitForInitialization();
String tenuredPoolName = getTenuredMemoryPoolMXBean().getName();
- List list = this.cache.getDistributedSystem().getStatsList();
+ List list = this.cache.getInternalDistributedSystem().getStatsList();
for (Object o : list) {
if (o instanceof StatisticsImpl) {
StatisticsImpl si = (StatisticsImpl) o;
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
index 70224f2..7ee5a8d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
@@ -2783,7 +2783,7 @@ public class HARegionQueue implements RegionQueue {
*/
@Override
public void run() {
- InternalDistributedSystem ids = cache.getDistributedSystem();
+ InternalDistributedSystem ids = cache.getInternalDistributedSystem();
DM dm = ids.getDistributionManager();
try { // ensure exit message is printed
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
index deb53cb..d2672df 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
@@ -68,7 +68,7 @@ public class BackupManager implements MembershipListener {
}
public void start() {
- final DM distributionManager = cache.getDistributedSystem().getDistributionManager();
+ final DM distributionManager = cache.getInternalDistributedSystem().getDistributionManager();
// We need to watch for pure admin guys that depart. this allMembershipListener set
// looks like it should receive those events.
Set allIds = distributionManager.addAllMembershipListenerAndGetAllIds(this);
@@ -85,7 +85,7 @@ public class BackupManager implements MembershipListener {
for (DiskStoreImpl store : diskStores) {
store.releaseBackupLock();
}
- final DM distributionManager = cache.getDistributedSystem().getDistributionManager();
+ final DM distributionManager = cache.getInternalDistributedSystem().getDistributionManager();
distributionManager.removeAllMembershipListener(this);
cache.clearBackupManager();
}
@@ -326,7 +326,8 @@ public class BackupManager implements MembershipListener {
}
private File getBackupDir(File targetDir) throws IOException {
- InternalDistributedMember memberId = cache.getDistributedSystem().getDistributedMember();
+ InternalDistributedMember memberId =
+ cache.getInternalDistributedSystem().getDistributedMember();
String vmId = memberId.toString();
vmId = cleanSpecialCharacters(vmId);
File backupDir = new File(targetDir, vmId);
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 3b0c2ff..18f13f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -1320,7 +1320,8 @@ public class CacheClientProxy implements ClientSession {
if (r instanceof PartitionedRegion) {
// need to flush all buckets. SFO should be changed to target buckets
// belonging to a particular PR, but it doesn't have that option right now
- sfo = new StateFlushOperation(this._cache.getDistributedSystem().getDistributionManager());
+ sfo = new StateFlushOperation(
+ this._cache.getInternalDistributedSystem().getDistributionManager());
} else {
sfo = new StateFlushOperation((DistributedRegion) r);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
index ad3f103..8a1f8b1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/ClientTXStateStub.java
@@ -166,7 +166,7 @@ public class ClientTXStateStub extends TXStateStub {
return;
}
cache.getCancelCriterion().checkCancelInProgress(null);
- InternalDistributedSystem ds = cache.getDistributedSystem();
+ InternalDistributedSystem ds = cache.getInternalDistributedSystem();
DM dm = ds.getDistributionManager();
txcm.setDM(dm);
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 1c94f94..ab3b3cf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -12,7 +12,6 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.internal.cache.wan;
import java.io.IOException;
@@ -26,6 +25,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.geode.InternalGemFireError;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.BucketMovedException;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.wan.parallel.WaitUntilParallelGatewaySenderFlushedCoordinator;
@@ -82,16 +82,14 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
/**
* Abstract implementation of both Serial and Parallel GatewaySender. It handles common
* functionality like initializing proxy.
- *
- *
+ *
* @since GemFire 7.0
*/
-
public abstract class AbstractGatewaySender implements GatewaySender, DistributionAdvisee {
private static final Logger logger = LogService.getLogger();
- protected Cache cache;
+ protected InternalCache cache;
protected String id;
@@ -229,7 +227,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
protected AbstractGatewaySender() {}
- public AbstractGatewaySender(Cache cache, GatewaySenderAttributes attrs) {
+ public AbstractGatewaySender(InternalCache cache, GatewaySenderAttributes attrs) {
this.cache = cache;
this.id = attrs.getId();
this.socketBufferSize = attrs.getSocketBufferSize();
@@ -258,8 +256,8 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
// if dispatcherThreads is 1 then maxMemoryPerDispatcherQueue will be same as maximumQueueMemory
// of sender
this.maxMemoryPerDispatcherQueue = this.queueMemory / this.dispatcherThreads;
- this.myDSId = InternalDistributedSystem.getAnyInstance().getDistributionManager()
- .getDistributedSystemId();
+ this.myDSId =
+ this.cache.getInternalDistributedSystem().getDistributionManager().getDistributedSystemId();
this.serialNumber = DistributionAdvisor.createSerialNumber();
this.isMetaQueue = attrs.isMetaQueue();
if (!(this.cache instanceof CacheCreation)) {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
index baa9d9c..c831b26 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderAdvisor.java
@@ -300,7 +300,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
public void initDLockService() {
InternalDistributedSystem ds =
- ((GemFireCacheImpl) this.sender.getCache()).getDistributedSystem();
+ ((GemFireCacheImpl) this.sender.getCache()).getInternalDistributedSystem();
String dlsName = getDLockServiceName();
this.lockService = DistributedLockService.getServiceNamed(dlsName);
if (this.lockService == null) {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WANServiceProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WANServiceProvider.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WANServiceProvider.java
index 2aed0ee..229736a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WANServiceProvider.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/WANServiceProvider.java
@@ -17,11 +17,11 @@ package org.apache.geode.internal.cache.wan;
import java.util.Iterator;
import java.util.ServiceLoader;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener;
import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.apache.geode.cache.wan.GatewaySenderFactory;
import org.apache.geode.distributed.internal.WanLocatorDiscoverer;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.spi.WANFactory;
public class WANServiceProvider {
@@ -38,7 +38,7 @@ public class WANServiceProvider {
}
}
- public static GatewaySenderFactory createGatewaySenderFactory(Cache cache) {
+ public static GatewaySenderFactory createGatewaySenderFactory(InternalCache cache) {
if (factory == null) {
throw new IllegalStateException("WAN service is not available.");
}
@@ -46,7 +46,7 @@ public class WANServiceProvider {
}
- public static GatewayReceiverFactory createGatewayReceiverFactory(Cache cache) {
+ public static GatewayReceiverFactory createGatewayReceiverFactory(InternalCache cache) {
if (factory == null) {
throw new IllegalStateException("WAN service is not available.");
}
@@ -67,7 +67,5 @@ public class WANServiceProvider {
return factory.createLocatorMembershipListener();
}
- private WANServiceProvider() {
-
- }
+ private WANServiceProvider() {}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index adc967f..cf4c5a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -1664,7 +1664,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
@Override
public void run() {
try {
- InternalDistributedSystem ids = cache.getDistributedSystem();
+ InternalDistributedSystem ids = cache.getInternalDistributedSystem();
DM dm = ids.getDistributionManager();
for (;;) {
try { // be somewhat tolerant of failures
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index e6d54c5..02baf81 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -1089,7 +1089,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
@Override
public void run() {
- InternalDistributedSystem ids = cache.getDistributedSystem();
+ InternalDistributedSystem ids = cache.getInternalDistributedSystem();
try { // ensure exit message is printed
// Long waitTime = Long.getLong(QUEUE_REMOVAL_WAIT_TIME, 1000);
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/wan/spi/WANFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/spi/WANFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/spi/WANFactory.java
index 918c373..3af9bf8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/spi/WANFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/spi/WANFactory.java
@@ -14,17 +14,17 @@
*/
package org.apache.geode.internal.cache.wan.spi;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.client.internal.locator.wan.LocatorMembershipListener;
import org.apache.geode.cache.wan.GatewayReceiverFactory;
import org.apache.geode.cache.wan.GatewaySenderFactory;
import org.apache.geode.distributed.internal.WanLocatorDiscoverer;
+import org.apache.geode.internal.cache.InternalCache;
public interface WANFactory {
- GatewaySenderFactory createGatewaySenderFactory(Cache cache);
+ GatewaySenderFactory createGatewaySenderFactory(InternalCache cache);
- GatewayReceiverFactory createGatewayReceiverFactory(Cache cache);
+ GatewayReceiverFactory createGatewayReceiverFactory(InternalCache cache);
WanLocatorDiscoverer createLocatorDiscoverer();
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
index b0b7d1b..a5f0fc2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
@@ -29,7 +29,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.Executor;
@@ -115,6 +114,7 @@ import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PoolFactoryImpl;
import org.apache.geode.internal.cache.PoolManagerImpl;
+import org.apache.geode.internal.cache.RegionListener;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.TombstoneService;
import org.apache.geode.internal.cache.control.InternalResourceManager;
@@ -145,7 +145,6 @@ import org.apache.geode.pdx.internal.TypeRegistry;
* {@link Cache} interface so that this class must be updated when {@link Cache} is modified. This
* class is public for testing purposes.
*
- *
* @since GemFire 3.0
*/
public class CacheCreation implements InternalCache {
@@ -1066,12 +1065,6 @@ public class CacheCreation implements InternalCache {
return null;
}
- // public GatewayReceiver addGatewayReceiver(){
- // GatewayReceiverCreation receiver = new GatewayReceiverCreation();
- // this.gatewayReceivers.add(receiver);
- // return receiver;
- // }
- //
public Set<GatewayReceiver> getGatewayReceivers() {
return this.gatewayReceivers;
}
@@ -1296,6 +1289,31 @@ public class CacheCreation implements InternalCache {
return false;
}
+ @Override
+ public InternalDistributedSystem getInternalDistributedSystem() {
+ return InternalDistributedSystem.getAnyInstance();
+ }
+
+ @Override
+ public Set<PartitionedRegion> getPartitionedRegions() {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public void addRegionListener(final RegionListener l) {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public void removeRegionListener(final RegionListener l) {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public Set<RegionListener> getRegionListeners() {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
public GatewaySenderFactory createGatewaySenderFactory() {
return WANServiceProvider.createGatewaySenderFactory(this);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelAsyncEventQueueCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelAsyncEventQueueCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelAsyncEventQueueCreation.java
index 1e3429c..4d0aac9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelAsyncEventQueueCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelAsyncEventQueueCreation.java
@@ -17,107 +17,75 @@ package org.apache.geode.internal.cache.xmlcache;
import java.util.List;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionAdvisee;
import org.apache.geode.distributed.internal.DistributionAdvisor;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
public class ParallelAsyncEventQueueCreation extends AbstractGatewaySender
implements GatewaySender {
- public ParallelAsyncEventQueueCreation(Cache cache, GatewaySenderAttributes attrs) {
+ public ParallelAsyncEventQueueCreation(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
}
public void distribute(EnumListenerEvent operation, EntryEventImpl event,
- List<Integer> remoteDSIds) {
- // TODO Auto-generated method stub
-
- }
+ List<Integer> remoteDSIds) {}
@Override
- public void start() {
- // TODO Auto-generated method stub
+ public void start() {}
- }
-
- public void stop() {
- // TODO Auto-generated method stub
-
- }
+ public void stop() {}
public void rebalance() {
throw new UnsupportedOperationException();
}
- public void fillInProfile(Profile profile) {
- // TODO Auto-generated method stub
-
- }
+ public void fillInProfile(Profile profile) {}
public CancelCriterion getCancelCriterion() {
- // TODO Auto-generated method stub
return null;
}
public DistributionAdvisor getDistributionAdvisor() {
- // TODO Auto-generated method stub
return null;
}
public DM getDistributionManager() {
- // TODO Auto-generated method stub
return null;
}
public String getFullPath() {
- // TODO Auto-generated method stub
return null;
}
public String getName() {
- // TODO Auto-generated method stub
return null;
}
public DistributionAdvisee getParentAdvisee() {
- // TODO Auto-generated method stub
return null;
}
public Profile getProfile() {
- // TODO Auto-generated method stub
return null;
}
public int getSerialNumber() {
- // TODO Auto-generated method stub
return 0;
}
public InternalDistributedSystem getSystem() {
- // TODO Auto-generated method stub
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.internal.cache.wan.AbstractGatewaySender#setModifiedEventId(org.apache.geode.
- * internal.cache.EntryEventImpl)
- */
@Override
- protected void setModifiedEventId(EntryEventImpl clonedEvent) {
- // TODO Auto-generated method stub
-
- }
-
+ protected void setModifiedEventId(EntryEventImpl clonedEvent) {}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java
index 0dc6b82..3cd60c7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ParallelGatewaySenderCreation.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.xmlcache;
import java.util.List;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionAdvisee;
@@ -26,31 +25,23 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
public class ParallelGatewaySenderCreation extends AbstractGatewaySender implements GatewaySender {
- public ParallelGatewaySenderCreation(Cache cache, GatewaySenderAttributes attrs) {
+ public ParallelGatewaySenderCreation(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
}
public void distribute(EnumListenerEvent operation, EntryEventImpl event,
- List<Integer> remoteDSIds) {
- // TODO Auto-generated method stub
-
- }
+ List<Integer> remoteDSIds) {}
@Override
- public void start() {
- // TODO Auto-generated method stub
-
- }
-
- public void stop() {
- // TODO Auto-generated method stub
+ public void start() {}
- }
+ public void stop() {}
public void rebalance() {
throw new UnsupportedOperationException();
@@ -59,67 +50,44 @@ public class ParallelGatewaySenderCreation extends AbstractGatewaySender impleme
@Override
public void destroy() {}
- public void fillInProfile(Profile profile) {
- // TODO Auto-generated method stub
-
- }
+ public void fillInProfile(Profile profile) {}
public CancelCriterion getCancelCriterion() {
- // TODO Auto-generated method stub
return null;
}
public DistributionAdvisor getDistributionAdvisor() {
- // TODO Auto-generated method stub
return null;
}
public DM getDistributionManager() {
- // TODO Auto-generated method stub
return null;
}
public String getFullPath() {
- // TODO Auto-generated method stub
return null;
}
public String getName() {
- // TODO Auto-generated method stub
return null;
}
public DistributionAdvisee getParentAdvisee() {
- // TODO Auto-generated method stub
return null;
}
public Profile getProfile() {
- // TODO Auto-generated method stub
return null;
}
public int getSerialNumber() {
- // TODO Auto-generated method stub
return 0;
}
public InternalDistributedSystem getSystem() {
- // TODO Auto-generated method stub
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.internal.cache.wan.AbstractGatewaySender#setModifiedEventId(org.apache.geode.
- * internal.cache.EntryEventImpl)
- */
@Override
- protected void setModifiedEventId(EntryEventImpl clonedEvent) {
- // TODO Auto-generated method stub
-
- }
-
+ protected void setModifiedEventId(EntryEventImpl clonedEvent) {}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java
index 856ec3c..89f345b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialAsyncEventQueueCreation.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.xmlcache;
import java.util.List;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionAdvisee;
@@ -26,88 +25,66 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
-
public class SerialAsyncEventQueueCreation extends AbstractGatewaySender implements GatewaySender {
- public SerialAsyncEventQueueCreation(Cache cache, GatewaySenderAttributes attrs) {
+ public SerialAsyncEventQueueCreation(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
}
public void distribute(EnumListenerEvent operation, EntryEventImpl event,
- List<Integer> remoteDSIds) {
-
- }
+ List<Integer> remoteDSIds) {}
@Override
- public void start() {
-
- }
-
- public void stop() {
+ public void start() {}
- }
+ public void stop() {}
public void rebalance() {
throw new UnsupportedOperationException();
}
- public void fillInProfile(Profile profile) {
- // TODO Auto-generated method stub
-
- }
+ public void fillInProfile(Profile profile) {}
public CancelCriterion getCancelCriterion() {
- // TODO Auto-generated method stub
return null;
}
public DistributionAdvisor getDistributionAdvisor() {
- // TODO Auto-generated method stub
return null;
}
public DM getDistributionManager() {
- // TODO Auto-generated method stub
return null;
}
public String getFullPath() {
- // TODO Auto-generated method stub
return null;
}
public String getName() {
- // TODO Auto-generated method stub
return null;
}
public DistributionAdvisee getParentAdvisee() {
- // TODO Auto-generated method stub
return null;
}
public Profile getProfile() {
- // TODO Auto-generated method stub
return null;
}
public int getSerialNumber() {
- // TODO Auto-generated method stub
return 0;
}
public InternalDistributedSystem getSystem() {
- // TODO Auto-generated method stub
return null;
}
@Override
- protected void setModifiedEventId(EntryEventImpl clonedEvent) {
- // TODO Auto-generated method stub
-
- }
-
+ protected void setModifiedEventId(EntryEventImpl clonedEvent) {}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java
index 7764c58..9aff712 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerialGatewaySenderCreation.java
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.xmlcache;
import java.util.List;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.wan.GatewaySender;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionAdvisee;
@@ -26,88 +25,66 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EnumListenerEvent;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
-
public class SerialGatewaySenderCreation extends AbstractGatewaySender implements GatewaySender {
- public SerialGatewaySenderCreation(Cache cache, GatewaySenderAttributes attrs) {
+ public SerialGatewaySenderCreation(InternalCache cache, GatewaySenderAttributes attrs) {
super(cache, attrs);
}
public void distribute(EnumListenerEvent operation, EntryEventImpl event,
- List<Integer> remoteDSIds) {
-
- }
+ List<Integer> remoteDSIds) {}
@Override
- public void start() {
-
- }
-
- public void stop() {
+ public void start() {}
- }
+ public void stop() {}
public void rebalance() {
throw new UnsupportedOperationException();
}
- public void fillInProfile(Profile profile) {
- // TODO Auto-generated method stub
-
- }
+ public void fillInProfile(Profile profile) {}
public CancelCriterion getCancelCriterion() {
- // TODO Auto-generated method stub
return null;
}
public DistributionAdvisor getDistributionAdvisor() {
- // TODO Auto-generated method stub
return null;
}
public DM getDistributionManager() {
- // TODO Auto-generated method stub
return null;
}
public String getFullPath() {
- // TODO Auto-generated method stub
return null;
}
public String getName() {
- // TODO Auto-generated method stub
return null;
}
public DistributionAdvisee getParentAdvisee() {
- // TODO Auto-generated method stub
return null;
}
public Profile getProfile() {
- // TODO Auto-generated method stub
return null;
}
public int getSerialNumber() {
- // TODO Auto-generated method stub
return 0;
}
public InternalDistributedSystem getSystem() {
- // TODO Auto-generated method stub
return null;
}
@Override
- protected void setModifiedEventId(EntryEventImpl clonedEvent) {
- // TODO Auto-generated method stub
-
- }
-
+ protected void setModifiedEventId(EntryEventImpl clonedEvent) {}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
index 45916bc..3adbce0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
@@ -220,7 +220,7 @@ public class LocalManager extends Manager {
managementTask.run();
// All local resources are created for the ManagementTask
// Now Management tasks can proceed.
- int updateRate = cache.getDistributedSystem().getConfig().getJmxManagerUpdateRate();
+ int updateRate = cache.getInternalDistributedSystem().getConfig().getJmxManagerUpdateRate();
singleThreadFederationScheduler.scheduleAtFixedRate(managementTask, updateRate, updateRate,
TimeUnit.MILLISECONDS);
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
index 5cbb990..9394efb 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java
@@ -123,9 +123,9 @@ public class ManagementAgent {
}
private boolean isServerNode(GemFireCacheImpl cache) {
- return (cache.getDistributedSystem().getDistributedMember()
+ return (cache.getInternalDistributedSystem().getDistributedMember()
.getVmKind() != DistributionManager.LOCATOR_DM_TYPE
- && cache.getDistributedSystem().getDistributedMember()
+ && cache.getInternalDistributedSystem().getDistributedMember()
.getVmKind() != DistributionManager.ADMIN_ONLY_DM_TYPE
&& !cache.isClient());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
index 183a5a8..1dc90dc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java
@@ -185,9 +185,9 @@ public class ManagementAdapter {
}
- if (cache.getDistributedSystem().getConfig().getJmxManager()) {
+ if (cache.getInternalDistributedSystem().getConfig().getJmxManager()) {
this.service.createManager();
- if (cache.getDistributedSystem().getConfig().getJmxManagerStart()) {
+ if (cache.getInternalDistributedSystem().getConfig().getJmxManagerStart()) {
this.service.startManager();
}
}
@@ -1036,7 +1036,8 @@ public class ManagementAdapter {
return;
}
// Don't register the CacheServices in the Locator
- InternalDistributedMember member = cacheImpl.getDistributedSystem().getDistributedMember();
+ InternalDistributedMember member =
+ cacheImpl.getInternalDistributedSystem().getDistributedMember();
if (member.getVmKind() == DistributionManager.LOCATOR_DM_TYPE) {
return;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
index 1559aad..d6a1efa 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java
@@ -299,8 +299,8 @@ public class MemberMBeanBridge {
if (dm instanceof DistributionManager) {
DistributionManager distManager = (DistributionManager) system.getDistributionManager();
- this.redundancyZone =
- distManager.getRedundancyZone(cache.getDistributedSystem().getDistributedMember());
+ this.redundancyZone = distManager
+ .getRedundancyZone(cache.getInternalDistributedSystem().getDistributedMember());
}
@@ -1038,7 +1038,7 @@ public class MemberMBeanBridge {
try {
BackupManager manager =
- cache.startBackup(cache.getDistributedSystem().getDistributedMember());
+ cache.startBackup(cache.getInternalDistributedSystem().getDistributedMember());
boolean abort = true;
Set<PersistentID> existingDataStores;
Set<PersistentID> successfulDataStores;
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
index 6dd5615..28ce092 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
@@ -393,7 +393,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
public boolean verifyDistributedRegionMbean(Cache cache, String regionName) {
GemFireCacheImpl gemfireCache = (GemFireCacheImpl) cache;
int federationInterval =
- gemfireCache.getDistributedSystem().getConfig().getJmxManagerUpdateRate();
+ gemfireCache.getInternalDistributedSystem().getConfig().getJmxManagerUpdateRate();
long timeEnd = System.currentTimeMillis() + federationInterval + 50;
for (; System.currentTimeMillis() <= timeEnd;) {
http://git-wip-us.apache.org/repos/asf/geode/blob/ec15aed4/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
index 148aa5f..421f9d7 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DeployFunction.java
@@ -52,8 +52,8 @@ public class DeployFunction implements Function, InternalEntity {
final byte[][] jarBytes = (byte[][]) args[1];
Cache cache = CacheFactory.getAnyInstance();
- final JarDeployer jarDeployer = new JarDeployer(
- ((GemFireCacheImpl) cache).getDistributedSystem().getConfig().getDeployWorkingDir());
+ final JarDeployer jarDeployer = new JarDeployer(((GemFireCacheImpl) cache)
+ .getInternalDistributedSystem().getConfig().getDeployWorkingDir());
DistributedMember member = cache.getDistributedSystem().getDistributedMember();