You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/12/01 19:10:00 UTC
[1/2] incubator-geode git commit: GEODE-1931: Fixed serialization
issue with Lambda
Repository: incubator-geode
Updated Branches:
refs/heads/develop 70479204e -> a5941da73
GEODE-1931: Fixed serialization issue with Lambda
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/be964ef7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/be964ef7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/be964ef7
Branch: refs/heads/develop
Commit: be964ef702964c1279d5c9a8c2b9021c00738552
Parents: 6eb62eb
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Dec 1 11:09:30 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Dec 1 11:09:30 2016 -0800
----------------------------------------------------------------------
.../geode/distributed/LocatorDUnitTest.java | 65 +++++++++++---------
1 file changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be964ef7/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 9715b73..350f183 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -97,7 +97,6 @@ import java.util.concurrent.TimeUnit;
/**
* Tests the ability of the {@link Locator} API to start and stop locators running in remote VMs.
- *
* @since GemFire 4.0
*/
@Category({DistributedTest.class, MembershipTest.class})
@@ -407,7 +406,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
private void startVerifyAndStopLocator(VM loc1, VM loc2, int port1, int port2,
- Properties properties) {
+ Properties properties) {
try {
loc2.invoke("startLocator2", () -> startLocatorWithPortAndProperties(port2, properties));
loc1.invoke("startLocator1", () -> startLocatorWithPortAndProperties(port1, properties));
@@ -633,7 +632,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
try {
DistributedSystem sys = locator.getDistributedSystem();
- Object[] connectArgs = new Object[] {properties};
+ Object[] connectArgs = new Object[]{properties};
assertTrue(MembershipManagerHelper.getLeadMember(sys) == null);
@@ -683,7 +682,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
private void assertLeadMember(final DistributedMember member, final DistributedSystem sys,
- long timeout) {
+ long timeout) {
Awaitility.waitAtMost(timeout, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
.until(() -> {
DistributedMember lead = MembershipManagerHelper.getLeadMember(sys);
@@ -756,7 +755,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
});
- Object[] connectArgs = new Object[] {properties};
+ Object[] connectArgs = new Object[]{properties};
SerializableRunnable crashLocator = new SerializableRunnable("Crash locator") {
public void run() {
@@ -886,7 +885,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
});
- Object[] connectArgs = new Object[] {properties};
+ Object[] connectArgs = new Object[]{properties};
SerializableRunnable crashSystem = new SerializableRunnable("Crash system") {
public void run() {
@@ -1032,7 +1031,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
});
- Object[] connectArgs = new Object[] {properties};
+ Object[] connectArgs = new Object[]{properties};
SerializableRunnable crashSystem = new SerializableRunnable("Crash system") {
public void run() {
@@ -1168,7 +1167,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
DistributedSystem sys = locator.getDistributedSystem();
sys.getLogWriter().info(
"<ExpectedException action=add>org.apache.geode.ForcedDisconnectException</ExpectedException>");
- Object[] connectArgs = new Object[] {properties};
+ Object[] connectArgs = new Object[]{properties};
assertTrue(MembershipManagerHelper.getLeadMember(sys) == null);
@@ -1617,9 +1616,9 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
dsProps.setProperty(MCAST_PORT, "0");
addDSProps(dsProps);
- vm0.invoke(() -> startLocatorAsync(new Object[] {port1, dsProps}));
- vm1.invoke(() -> startLocatorAsync(new Object[] {port2, dsProps}));
- vm2.invoke(() -> startLocatorAsync(new Object[] {port3, dsProps}));
+ vm0.invoke(() -> startLocatorAsync(new Object[]{port1, dsProps}));
+ vm1.invoke(() -> startLocatorAsync(new Object[]{port2, dsProps}));
+ vm2.invoke(() -> startLocatorAsync(new Object[]{port3, dsProps}));
try {
try {
@@ -1671,11 +1670,11 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
DistributedMember vm3ID = vm3.invoke(() -> GMSJoinLeaveTestHelper
.getInternalDistributedSystem().getDM().getDistributionManagerId());
assertTrue("View is " + system.getDM().getMembershipManager().getView()
- + " and vm3's ID is " + vm3ID,
+ + " and vm3's ID is " + vm3ID,
vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
- vm1.invoke(() -> startLocatorAsync(new Object[] {port2, dsProps}));
- vm2.invoke(() -> startLocatorAsync(new Object[] {port3, dsProps}));
+ vm1.invoke(() -> startLocatorAsync(new Object[]{port2, dsProps}));
+ vm2.invoke(() -> startLocatorAsync(new Object[]{port3, dsProps}));
Awaitility.waitAtMost(30000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
.until(() -> {
@@ -1857,13 +1856,13 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
Awaitility.waitAtMost(WAIT2_MS, TimeUnit.MILLISECONDS)
.pollInterval(200, TimeUnit.MILLISECONDS).until(() -> {
- try {
- return system.getDM().getViewMembers().size() == 5;
- } catch (Exception e) {
- org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
- }
- return false; // NOTREACHED
- });
+ try {
+ return system.getDM().getViewMembers().size() == 5;
+ } catch (Exception e) {
+ org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
+ }
+ return false; // NOTREACHED
+ });
system.disconnect();
vm1.invoke(() -> disconnectDistributedSystem());
@@ -1953,7 +1952,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
/**
* Tests starting, stopping, and restarting a locator. See bug 32856.
- *
* @since GemFire 4.1
*/
@Test
@@ -1977,7 +1975,10 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
Locator locator = Locator.startLocatorAndDS(port1, logFile, p);
try {
- vm0.invoke(() -> DistributedSystem.connect(p));
+ vm0.invoke(() -> {
+ DistributedSystem.connect(p);
+ return null;
+ });
LogWriterUtils.getLogWriter().info("Stopping locator");
locator.stop();
@@ -1985,7 +1986,10 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
LogWriterUtils.getLogWriter().info("Starting locator");
locator = Locator.startLocatorAndDS(port1, logFile, p);
- vm0.invoke("disconnect", () -> DistributedSystem.connect(p).disconnect());
+ vm0.invoke("disconnect", () -> {
+ DistributedSystem.connect(p).disconnect();
+ return null;
+ });
} finally {
locator.stop();
@@ -2084,7 +2088,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
}
@Override
- public void afterMembershipFailure(String reason, Throwable cause) {}
+ public void afterMembershipFailure(String reason, Throwable cause) {
+ }
public void reset() {
unboundedWait = false;
@@ -2097,17 +2102,19 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
boolean quorumLostInvoked;
List<String> suspectReasons = new ArrayList<>(50);
- public void memberJoined(InternalDistributedMember id) {}
+ public void memberJoined(InternalDistributedMember id) {
+ }
- public void memberDeparted(InternalDistributedMember id, boolean crashed) {}
+ public void memberDeparted(InternalDistributedMember id, boolean crashed) {
+ }
public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected,
- String reason) {
+ String reason) {
suspectReasons.add(reason);
}
public void quorumLost(Set<InternalDistributedMember> failures,
- List<InternalDistributedMember> remaining) {
+ List<InternalDistributedMember> remaining) {
quorumLostInvoked = true;
org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
.info("quorumLost invoked in test code");
[2/2] incubator-geode git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-geode into develop
Posted by ud...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a5941da7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a5941da7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a5941da7
Branch: refs/heads/develop
Commit: a5941da7375fa183f858e15a6b513a502cb77342
Parents: be964ef 7047920
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Dec 1 11:09:48 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Dec 1 11:09:48 2016 -0800
----------------------------------------------------------------------
.../geode/DeltaSerializationException.java | 1 +
.../apache/geode/GemFireCheckedException.java | 1 +
.../org/apache/geode/InvalidDeltaException.java | 1 +
.../cache/GatewayConfigurationException.java | 1 +
.../apache/geode/cache/RegionRoleException.java | 1 +
.../apache/geode/cache/ResourceException.java | 2 +
...upportedOperationInTransactionException.java | 1 +
.../apache/geode/cache/VersionException.java | 1 +
.../query/QueryExecutionLowMemoryException.java | 1 +
.../query/QueryExecutionTimeoutException.java | 1 +
.../QueryExecutionCanceledException.java | 1 +
.../geode/internal/cache/AbstractRegionMap.java | 43 +-
.../internal/cache/BucketNotFoundException.java | 1 +
.../internal/cache/DataLocationException.java | 2 +
.../geode/internal/cache/LocalRegion.java | 2 +-
.../cache/PutAllPartialResultException.java | 3 +
.../apache/geode/internal/cache/RegionMap.java | 4 +
.../apache/geode/internal/cache/TXState.java | 79 +-
.../execute/InternalFunctionException.java | 1 +
...ternalFunctionInvocationTargetException.java | 1 +
.../RedundancyAlreadyMetException.java | 1 +
.../ConcurrentCacheModificationException.java | 2 +
.../internal/cache/versions/RVVException.java | 2 +
.../BucketRegionQueueUnavailableException.java | 1 +
.../internal/tcp/ReenteredConnectException.java | 1 +
.../internal/util/SunAPINotFoundException.java | 1 +
.../geode/lang/AttachAPINotFoundException.java | 1 +
.../cli/commands/AbstractCommandsSupport.java | 13 +-
.../internal/cli/commands/DeployCommands.java | 28 +-
.../cli/exceptions/CliCommandException.java | 1 +
.../exceptions/CliCommandInvalidException.java | 1 +
.../CliCommandMultiModeOptionException.java | 1 +
.../CliCommandNotAvailableException.java | 1 +
.../exceptions/CliCommandOptionException.java | 1 +
.../CliCommandOptionInvalidException.java | 1 +
.../CliCommandOptionMissingException.java | 1 +
.../CliCommandOptionNotApplicableException.java | 1 +
...liCommandOptionValueConversionException.java | 1 +
.../CliCommandOptionValueException.java | 1 +
.../CliCommandOptionValueMissingException.java | 1 +
.../internal/cli/exceptions/CliException.java | 1 +
.../cli/util/DiskStoreNotFoundException.java | 1 +
.../cli/util/JConsoleNotFoundException.java | 1 +
.../cli/util/MemberNotFoundException.java | 1 +
.../cli/util/VisualVmNotFoundException.java | 1 +
.../web/shell/MBeanAccessException.java | 1 +
.../RestApiCallForCommandNotFoundException.java | 1 +
.../internal/cache/ClearTXLockingDUnitTest.java | 437 +++++
.../security/DeployCommandsSecurityTest.java | 124 ++
.../security/SimpleSecurityManagerTest.java | 27 +-
.../security/SimpleTestSecurityManager.java | 12 +-
.../codeAnalysis/sanctionedSerializables.txt | 1686 +++++++++---------
52 files changed, 1579 insertions(+), 923 deletions(-)
----------------------------------------------------------------------