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/01/06 18:36:07 UTC
[1/2] geode git commit: Fix javadoc warnings
Repository: geode
Updated Branches:
refs/heads/develop 5e83f2fb8 -> a6d6d08fc
Fix javadoc warnings
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/921e1bc4
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/921e1bc4
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/921e1bc4
Branch: refs/heads/develop
Commit: 921e1bc412cb970874f772f0aba0c2c3675e3da1
Parents: 5e83f2f
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Jan 6 09:45:41 2017 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Jan 6 10:35:53 2017 -0800
----------------------------------------------------------------------
.../apache/geode/distributed/internal/SharedConfiguration.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/921e1bc4/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java
index d6d2d35..ec22b02 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/SharedConfiguration.java
@@ -304,9 +304,6 @@ public class SharedConfiguration {
/**
* read the jar bytes in the file system
- *
- * @return
- * @throws Exception
*/
// used when creating cluster config response
// and used when uploading the jars to another locator
[2/2] geode git commit: GEODE-1165: move FlakyTest category to class
for all tests
Posted by kl...@apache.org.
GEODE-1165: move FlakyTest category to class for all tests
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a6d6d08f
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a6d6d08f
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a6d6d08f
Branch: refs/heads/develop
Commit: a6d6d08fc6841d86e2e0cbd45ed43dfeb5affdcf
Parents: 921e1bc
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Jan 6 10:34:54 2017 -0800
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Jan 6 10:36:00 2017 -0800
----------------------------------------------------------------------
.../SharedConfigurationUsingDirDUnitTest.java | 46 ++++++++++++--------
1 file changed, 27 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a6d6d08f/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
index 5d94869..a434f05 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
@@ -14,6 +14,22 @@
*/
package org.apache.geode.management.internal.configuration;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.stream.Collectors.joining;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOAD_CLUSTER_CONFIGURATION_FROM_DIR;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
+import static org.apache.geode.test.dunit.Host.getHost;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.InternalLocator;
@@ -34,17 +50,8 @@ import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.Arrays;
import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
-import static org.apache.geode.test.dunit.Host.getHost;
-import static com.jayway.awaitility.Awaitility.waitAtMost;
-import static java.util.stream.Collectors.joining;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, FlakyTest.class}) // GEODE-1165
public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
@Override
@@ -82,12 +89,11 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
restartCache(vm, i, ports);
vm.invoke("Checking for region presence", () -> {
- waitAtMost(15, TimeUnit.SECONDS).until(() -> getRootRegion("newReplicatedRegion") != null);
+ await().until(() -> getRootRegion("newReplicatedRegion") != null);
});
}
}
- @Category(FlakyTest.class) // GEODE-1979
@Test
public void basicClusterConfigDirWithTwoLocators() throws Exception {
final int[] ports = getRandomAvailableTCPPorts(2);
@@ -105,12 +111,11 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
restartCache(vm, i, ports);
vm.invoke("Checking for region presence", () -> {
- waitAtMost(15, TimeUnit.SECONDS).until(() -> getRootRegion("newReplicatedRegion") != null);
+ await().until(() -> getRootRegion("newReplicatedRegion") != null);
});
}
}
- @Category(FlakyTest.class) // GEODE-1165: random ports, BindException, time sensitive, awaitility
@Test
public void updateClusterConfigDirWithTwoLocatorsNoRollingServerRestart() throws Exception {
final int[] ports = getRandomAvailableTCPPorts(2);
@@ -158,12 +163,11 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
restartCache(vm, i, ports);
vm.invoke("Checking for region presence", () -> {
- waitAtMost(15, TimeUnit.SECONDS).until(() -> getRootRegion("newReplicatedRegion") != null);
+ await().until(() -> getRootRegion("newReplicatedRegion") != null);
});
}
}
- @Category(FlakyTest.class) // GEODE-1989: need to increase await timeouts in these tests
@Test
public void updateClusterConfigDirWithTwoLocatorsAndRollingServerRestart() throws Exception {
final int[] ports = getRandomAvailableTCPPorts(2);
@@ -206,7 +210,7 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
restartCache(vm, i, ports);
vm.invoke("Checking for region presence", () -> {
- waitAtMost(15, TimeUnit.SECONDS).until(() -> getRootRegion("newReplicatedRegion") != null);
+ await().until(() -> getRootRegion("newReplicatedRegion") != null);
});
}
}
@@ -249,7 +253,7 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
restartCache(vm, i, ports);
vm.invoke("Checking for region presence", () -> {
- waitAtMost(15, TimeUnit.SECONDS).until(() -> getRootRegion("newReplicatedRegion") != null);
+ await().until(() -> getRootRegion("newReplicatedRegion") != null);
});
}
}
@@ -288,7 +292,7 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
private void waitForSharedConfiguration(final VM vm) {
vm.invoke("Waiting for shared configuration", () -> {
final InternalLocator locator = InternalLocator.getLocator();
- waitAtMost(15, TimeUnit.SECONDS).until(() -> {
+ await().until(() -> {
return locator.isSharedConfigurationRunning();
});
});
@@ -323,4 +327,8 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
private String getLocatorStr(final int[] locatorPorts) {
return Arrays.stream(locatorPorts).mapToObj(p -> "localhost[" + p + "]").collect(joining(","));
}
+
+ private ConditionFactory await() {
+ return Awaitility.await().atMost(2, MINUTES);
+ }
}