You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/10/31 17:19:00 UTC
[01/11] incubator-geode git commit: GEODE-1098: Fix gfsh.bat error
with default Java installation [Forced Update!]
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEM-983 eb6ab1aaf -> 2f251c47d (forced update)
GEODE-1098: Fix gfsh.bat error with default Java installation
Paths to JAR dependencies quoted to prevent spaces from causing error
This closes #227
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/dbcbd55f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dbcbd55f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dbcbd55f
Branch: refs/heads/feature/GEM-983
Commit: dbcbd55f9b2965afcf5dcc8453308c1c850d7a5c
Parents: 2ef50b2
Author: mmurdoch <ma...@gmail.com>
Authored: Fri Oct 28 19:19:59 2016 +0100
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 28 17:12:03 2016 -0700
----------------------------------------------------------------------
geode-assembly/src/main/dist/bin/gfsh.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dbcbd55f/geode-assembly/src/main/dist/bin/gfsh.bat
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat
index 8206b6e..a89845c 100755
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@ -82,5 +82,5 @@ REM Expect to find the tools.jar from the JDK
)
REM Call java with our classpath
-@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath %DEPENDENCIES% %JAVA_ARGS% %LAUNCHER% %*
+@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath "%DEPENDENCIES%" %JAVA_ARGS% %LAUNCHER% %*
:done
[06/11] incubator-geode git commit: Update README with links for Java
and Redis, break out external libraries
Posted by ds...@apache.org.
Update README with links for Java and Redis, break out external libraries
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1412ca0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1412ca0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1412ca0b
Branch: refs/heads/feature/GEM-983
Commit: 1412ca0bf424b4c4e6491f8f786751e197c0565c
Parents: 1f253c3
Author: Anthony Baker <ab...@apache.org>
Authored: Sat Oct 29 07:00:51 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Sat Oct 29 07:00:51 2016 -0700
----------------------------------------------------------------------
README.md | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1412ca0b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 4ca2416..a633f67 100644
--- a/README.md
+++ b/README.md
@@ -92,9 +92,14 @@ Compile and run `HelloWorld.java`. The classpath should include `geode-dependen
Apache Geode applications can be written in these client technologies:
-* Java using the Geode client API or embedded using the Geode peer API
-* [Spring Data GemFire](http://projects.spring.io/spring-data-gemfire/) or [Spring Cache](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/cache.html)
+* Java [client](http://geode.apache.org/docs/guide/topologies_and_comm/cs_configuration/chapter_overview.html) or [peer](http://geode.apache.org/docs/guide/topologies_and_comm/p2p_configuration/chapter_overview.html)
* [REST](http://geode.apache.org/docs/guide/rest_apps/chapter_overview.html)
-* [memcached](https://cwiki.apache.org/confluence/display/GEODE/Moving+from+memcached+to+gemcached)
+* [Memcached](https://cwiki.apache.org/confluence/display/GEODE/Moving+from+memcached+to+gemcached)
+* [Redis](https://cwiki.apache.org/confluence/display/GEODE/Geode+Redis+Adapter)
+
+The following libraries are available external to the Apache Geode project:
+
+* [Spring Data GemFire](http://projects.spring.io/spring-data-gemfire/)
+* [Spring Cache](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/cache.html)
* [Python](https://github.com/gemfire/py-gemfire-rest)
[07/11] incubator-geode git commit: Add link to release notes
Posted by ds...@apache.org.
Add link to release notes
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4a402b83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4a402b83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4a402b83
Branch: refs/heads/feature/GEM-983
Commit: 4a402b83fd9241fd956afd8cc436b1cd0c3ae837
Parents: 1412ca0
Author: Anthony Baker <ab...@apache.org>
Authored: Sat Oct 29 09:06:52 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Sat Oct 29 09:06:52 2016 -0700
----------------------------------------------------------------------
geode-site/website/content/releases/index.html | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a402b83/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index 7056640..d42e514 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -60,6 +60,12 @@ under the License. -->
</span>
</li>
</ul>
+
+ <!-- RELEASE NOTES -->
+ <ul>
+ <strong><a href="https://cwiki.apache.org/confluence/display/GEODE/Release+Notes#ReleaseNotes-1.0.0-incubating">Release Notes</a></strong>
+ </ul>
+
<!-- DEPENDENCY MANAGERS -->
<div class="container">
<h4><span class="icon-archive"> Dependency Managers</span></h4>
[03/11] incubator-geode git commit: Fixing build warning message.
Posted by ds...@apache.org.
Fixing build warning message.
CacheFactory.java:341: warning - @return tag has no arguments.
CacheFactory.java:357: warning - @return tag has no arguments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b3d00edb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b3d00edb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b3d00edb
Branch: refs/heads/feature/GEM-983
Commit: b3d00edb355a224279913f7e7c0214b57ba864f0
Parents: 29bb98a
Author: Anil <ag...@pivotal.io>
Authored: Fri Oct 28 17:24:20 2016 -0700
Committer: Anil <ag...@pivotal.io>
Committed: Fri Oct 28 17:25:23 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/geode/cache/CacheFactory.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b3d00edb/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index 15557bb..0772dcf 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -336,7 +336,7 @@ public class CacheFactory {
* method on this object
*
* @param securityManager
- * @return
+ * @return this CacheFactory
*/
public CacheFactory setSecurityManager(SecurityManager securityManager) {
this.cacheConfig.setSecurityManager(securityManager);
@@ -352,7 +352,7 @@ public class CacheFactory {
* method on this object
*
* @param postProcessor
- * @return
+ * @return this CacheFactory
*/
public CacheFactory setPostProcessor(PostProcessor postProcessor) {
this.cacheConfig.setPostProcessor(postProcessor);
[08/11] incubator-geode git commit: GEODE-2034: Clean up old releases
Posted by ds...@apache.org.
GEODE-2034: Clean up old releases
Remove links to 1.0.0-incubating.M* releases. Add link to archived
releases.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8a6ae9da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8a6ae9da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8a6ae9da
Branch: refs/heads/feature/GEM-983
Commit: 8a6ae9da0aff4d9d3dc023ce05048624a69fc212
Parents: 4a402b8
Author: Anthony Baker <ab...@apache.org>
Authored: Sat Oct 29 09:33:51 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Sat Oct 29 09:33:51 2016 -0700
----------------------------------------------------------------------
geode-site/website/content/releases/index.html | 152 +-------------------
1 file changed, 1 insertion(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a6ae9da/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index d42e514..0efb681 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -90,158 +90,8 @@ under the License. -->
</ul>
</div>
<!-- END OF 1.0 -->
-
- <!-- START OF M3 -->
- <h3><span class="icon-flag-checkered"> 1.0.0-incubating.M3</span></h3>
- <!-- BINARY -->
- <ul>
- <span class="icon-cloud-download"> <strong>Binaries </strong>
- [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip">ZIP</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip.sha256">SHA-256</a>,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip.asc">PGP</a> ] -
- [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz">TAR.GZ</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz.sha256">SHA-256</a>,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz.asc">PGP</a> ]
- </span>
-
- <blockquote>Binary downloads are provided for the convenience of our users and are not official Apache Geode releases. </blockquote>
- </li>
- </ul>
- <!-- SOURCE -->
- <ul>
- <span class="icon-cloud-download"> <strong>Source</strong>
- [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip">ZIP</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip.sha256">SHA-256</a>,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip.asc">PGP</a>
- ] -
- [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz">TAR.GZ</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz.sha256">SHA-256</a>,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz.asc">PGP</a>
- ]
- </span>
- </li>
- </ul>
- <!-- DEPENDENCY MANAGERS -->
- <div class="container">
- <h4><span class="icon-archive"> Dependency Managers</span></h4>
- <ul>
- <li> <strong>Gradle</strong>
- <pre class="prettyprint">
- dependencies {
- compile 'org.apache.geode:geode-core:1.0.0-incubating.M3'
- }</pre>
- <!-- ><script src="https://gist.github.com/markito/b7796cafef4bd273bd07.js"></script>-->
- </li>
- <li> <strong>Maven</strong>
- <pre class="prettyprint">
- <dependencies>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-core</artifactId>
- <version>1.0.0-incubating.M3</version>
- </dependency>
- </dependencies></pre>
- </li>
- </ul>
- </div>
- <!-- END OF M3 -->
- <!-- START OF M2 -->
- <h3><span class="icon-flag-checkered"> 1.0.0-incubating.M2</span></h3>
- <!-- BINARY -->
- <ul>
- <span class="icon-cloud-download"> <strong>Binaries </strong>
- [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip">ZIP</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.sha-256">SHA-256</a> ,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.asc">PGP</a> ] -
- [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz">TAR.GZ</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.sha-256">SHA-256</a> ,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.asc">PGP</a> ]
- </span>
-
- <blockquote>Binary downloads are provided for the convenience of our users and are not official Apache Geode releases. </blockquote>
- </li>
- </ul>
- <!-- SOURCE -->
- <ul>
- <span class="icon-cloud-download"> <strong>Source</strong>
- [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.zip">ZIP</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.zip.sha-256">SHA-256</a>,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.zip.asc">PGP</a>
- ] -
- [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.tar.gz">TAR.GZ</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.tar.gz.sha-256">SHA-256</a>,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-src-1.0.0-incubating.M2.tar.gz.asc">PGP</a>
- ]
- </span>
- </li>
- </ul>
- <!-- DEPENDENCY MANAGERS -->
- <div class="container">
- <h4><span class="icon-archive"> Dependency Managers</span></h4>
- <ul>
- <li> <strong>Gradle</strong>
- <pre class="prettyprint">
- dependencies {
- compile 'org.apache.geode:geode-core:1.0.0-incubating.M2'
- }</pre>
- <!-- ><script src="https://gist.github.com/markito/b7796cafef4bd273bd07.js"></script>-->
- </li>
- <li> <strong>Maven</strong>
- <pre class="prettyprint">
- <dependencies>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>geode-core</artifactId>
- <version>1.0.0-incubating.M2</version>
- </dependency>
- </dependencies></pre>
- </li>
- </ul>
- </div>
- <!-- END OF M2 -->
- <!-- START OF M1 -->
- <h3><span class="icon-flag-checkered"> 1.0.0-incubating.M1</span></h3>
- <!-- BINARY -->
- <ul>
- <span class="icon-cloud-download"> <strong>Binaries </strong>
- [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M1/apache-geode-1.0.0-incubating.M1.zip">ZIP</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/apache-geode-1.0.0-incubating.M1.zip.sha-256">SHA-256</a> ,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/apache-geode-1.0.0-incubating.M1.zip.asc">PGP</a> ] -
- [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M1/apache-geode-1.0.0-incubating.M1.tar.gz">TAR.GZ</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/apache-geode-1.0.0-incubating.M1.tar.gz.sha-256">SHA-256</a> ,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/apache-geode-1.0.0-incubating.M1.tar.gz.asc">PGP</a> ]
- </span>
-
- <blockquote>Binary downloads are provided for the convenience of our users and are not official Apache Geode releases. </blockquote>
- </li>
- </ul>
- <!-- SOURCE -->
- <ul>
- <span class="icon-cloud-download"> <strong>Source</strong>
- [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M1/apache-geode-src-1.0.0-incubating.M1.zip">ZIP</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/apache-geode-src-1.0.0-incubating.M1.zip.sha-256">SHA-256</a>,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/apache-geode-src-1.0.0-incubating.M1.zip.asc">PGP</a>
- ] -
- [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M1/apache-geode-src-1.0.0-incubating.M1.tar.gz">TAR.GZ</a> , <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/apache-geode-src-1.0.0-incubating.M1.tar.gz.sha-256">SHA-256</a>,
- <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/apache-geode-src-1.0.0-incubating.M1.tar.gz.asc">PGP</a>
- ]
- </span>
- </li>
- </ul>
- <!-- DEPENDENCY MANAGERS -->
- <div class="container">
- <h4><span class="icon-archive"> Dependency Managers</span></h4>
- <ul>
- <li> <strong>Gradle</strong>
- <pre class="prettyprint">
- dependencies {
- compile 'org.apache.geode:gemfire-core:1.0.0-incubating.M1'
- }</pre>
- <!-- ><script src="https://gist.github.com/markito/b7796cafef4bd273bd07.js"></script>-->
- </li>
- <li> <strong>Maven</strong>
- <pre class="prettyprint">
- <dependencies>
- <dependency>
- <groupId>org.apache.geode</groupId>
- <artifactId>gemfire-core</artifactId>
- <version>1.0.0-incubating.M1</version>
- </dependency>
- </dependencies></pre>
- </li>
- </ul>
- </div>
- <!-- END OF M1 -->
</div>
+ <p>If you need access to older releases they can be found in the <a href="https://archive.apache.org/dist/incubator/geode/">release archives</a>.</p>
<!-- END OF RELEASE -->
<hr/>
<p>
[11/11] incubator-geode git commit: formatting
Posted by ds...@apache.org.
formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2f251c47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2f251c47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2f251c47
Branch: refs/heads/feature/GEM-983
Commit: 2f251c47d2240329cd3b61a30c831fa9dd78e3db
Parents: fe4cf4e
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon Oct 31 10:17:50 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon Oct 31 10:17:50 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f251c47/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 3c4718c..7514605 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
@@ -1756,7 +1756,8 @@ public class GemFireCacheImpl
boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
if (testIGE) {
- InternalGemFireError assErr = new InternalGemFireError(LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
+ InternalGemFireError assErr = new InternalGemFireError(
+ LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
throw assErr;
}
if (isCacheAtShutdownAll()) {
[09/11] incubator-geode git commit: Update geode dependency for
examples to 1.0.0-incubating
Posted by ds...@apache.org.
Update geode dependency for examples to 1.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bb30357c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bb30357c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bb30357c
Branch: refs/heads/feature/GEM-983
Commit: bb30357c015a01fa674864eb3c2a680e0f052be4
Parents: 8a6ae9d
Author: Anthony Baker <ab...@apache.org>
Authored: Mon Oct 31 09:02:41 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Mon Oct 31 09:02:41 2016 -0700
----------------------------------------------------------------------
geode-examples/gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb30357c/geode-examples/gradle.properties
----------------------------------------------------------------------
diff --git a/geode-examples/gradle.properties b/geode-examples/gradle.properties
index 7aa1ef9..c1739af 100644
--- a/geode-examples/gradle.properties
+++ b/geode-examples/gradle.properties
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-geodeVersion = 1.0.0-incubating-SNAPSHOT
+geodeVersion = 1.0.0-incubating
junitVersion = 4.12
mockitocoreVersion = 1.10.19
commonsExecVersion = 1.3
[05/11] incubator-geode git commit: Only run the uiTest task for the
:geode-pulse subproject. Add uiTest to the combined test report. Refactored
helper methods out of test.gradle.
Posted by ds...@apache.org.
Only run the uiTest task for the :geode-pulse subproject. Add uiTest to the combined test report. Refactored helper methods out of test.gradle.
This closes #261
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1f253c33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1f253c33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1f253c33
Branch: refs/heads/feature/GEM-983
Commit: 1f253c33b14ea2f4c7f387723cb2e1d91b117df8
Parents: d956305
Author: Jared Stewart <js...@pivotal.io>
Authored: Fri Oct 14 15:46:00 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Oct 28 19:43:55 2016 -0700
----------------------------------------------------------------------
buildSrc/build.gradle | 25 +++++++++
.../geode/gradle/TestPropertiesWriter.groovy | 36 ++++++++++++
geode-pulse/build.gradle | 16 ++++++
gradle/test.gradle | 58 +++-----------------
4 files changed, 86 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/buildSrc/build.gradle
----------------------------------------------------------------------
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 0000000..d7ff581
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ compile group: 'org.apache.mina', name: 'mina-core', version: '2.0.14'
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
new file mode 100644
index 0000000..0f43d3c
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.geode.gradle;
+
+import org.apache.mina.util.AvailablePortFinder;
+
+public class TestPropertiesWriter {
+ public static void writeTestProperties(File parent, String name) {
+ Properties props = new Properties();
+ props.setProperty('mcast-port', Integer.toString(AvailablePortFinder.getNextAvailable()));
+ props.setProperty('log-level', 'config');
+ File propsFile = new File(testResultsDir(parent, name), 'gemfire.properties');
+ BufferedWriter writer = propsFile.newWriter();
+ props.store(writer, 'Autogenerated Gemfire properties');
+ }
+
+ public static File testResultsDir(File parent, String name) {
+ return new File(parent, name)
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/geode-pulse/build.gradle
----------------------------------------------------------------------
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 3d19dea..6692484 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -1,3 +1,5 @@
+import org.apache.geode.gradle.TestPropertiesWriter
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -126,4 +128,18 @@ war {
classpath project(':geode-core').webJar.archivePath
}
+task uiTest(type:Test) {
+ useJUnit {
+ includeCategories 'org.apache.geode.test.junit.categories.UITest'
+ excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
+ }
+
+ doFirst {
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
+ }
+}
+
uiTest.dependsOn war
+uiTest.finalizedBy rootProject.combineReports
+rootProject.combineReports.mustRunAfter uiTest
+
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 5b895ba..bb8ab39 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -1,3 +1,5 @@
+import org.apache.geode.gradle.TestPropertiesWriter
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -14,31 +16,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import org.apache.mina.util.AvailablePortFinder as MinaAvailablePortFinder
-
-buildscript {
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath group: 'org.apache.mina', name: 'mina-core', version: '2.0.14'
- }
-}
-
-def testResultsDir(def parent, def name) {
- new File(parent, name)
-}
-
-def writeTestProperties(def parent, def name) {
- def props = new Properties()
- props.setProperty('mcast-port', Integer.toString(MinaAvailablePortFinder.getNextAvailable()))
- props.setProperty('log-level', 'config')
- def propsFile = new File(testResultsDir(parent, name), 'gemfire.properties')
- def writer = propsFile.newWriter()
- props.store(writer, 'Autogenerated Gemfire properties')
-
-}
task combineReports(type: TestReport) {
description 'Combines the test reports.'
@@ -107,7 +84,7 @@ subprojects {
}
doFirst {
- writeTestProperties(buildDir, name)
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
}
}
@@ -119,18 +96,7 @@ subprojects {
forkEvery 1
doFirst {
- writeTestProperties(buildDir, name)
- }
- }
-
- task uiTest(type:Test) {
- useJUnit {
- includeCategories 'org.apache.geode.test.junit.categories.UITest'
- excludeCategories 'org.apache.geode.test.junit.categories.FlakyTest'
- }
-
- doFirst {
- writeTestProperties(buildDir, name)
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
}
}
@@ -149,7 +115,7 @@ subprojects {
forkEvery 1
doFirst {
- writeTestProperties(buildDir, name)
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
}
reports.junitXml.destination = file "$buildDir/test-reports-flaky"
@@ -162,7 +128,7 @@ subprojects {
forkEvery 1
doFirst {
- writeTestProperties(buildDir, name)
+ TestPropertiesWriter.writeTestProperties(buildDir, name)
}
reports.junitXml.destination = file "$buildDir/test-reports-security"
@@ -195,7 +161,7 @@ subprojects {
//saying the results are never up to date
outputs.upToDateWhen { false }
- def resultsDir = testResultsDir(buildDir, test.name)
+ def resultsDir = TestPropertiesWriter.testResultsDir(buildDir, test.name)
workingDir resultsDir.absolutePath
reports.html.destination = file "$buildDir/reports/$name"
@@ -244,13 +210,7 @@ subprojects {
}
check.dependsOn checkMissedTests
-
+
combineReports.mustRunAfter check, test, integrationTest, distributedTest, flakyTest, checkMissedTests
- build.finalizedBy combineReports
- check.finalizedBy combineReports
- test.finalizedBy combineReports
- integrationTest.finalizedBy combineReports
- distributedTest.finalizedBy combineReports
- flakyTest.finalizedBy combineReports
- checkMissedTests.finalizedBy combineReports
+ [build, check, test, integrationTest, distributedTest, flakyTest, checkMissedTests].each {it.finalizedBy combineReports}
}
[02/11] incubator-geode git commit: Fixing spotless formatting errors.
Posted by ds...@apache.org.
Fixing spotless formatting errors.
2ef50b24de1457ab91729f22a3c2ff4a8a07557b introduced spotless formatting
issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/29bb98a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/29bb98a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/29bb98a2
Branch: refs/heads/feature/GEM-983
Commit: 29bb98a23e720a84d7e0f22dcd0ae25b418eec27
Parents: dbcbd55
Author: Dan Smith <up...@apache.org>
Authored: Fri Oct 28 17:12:56 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 28 17:12:56 2016 -0700
----------------------------------------------------------------------
.../internal/cache/AbstractRegionEntry.java | 1 +
.../internal/cache/AbstractRegionEntryTest.java | 44 +++++++++-----------
2 files changed, 21 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29bb98a2/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
index 2138af9..41ca8d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
@@ -228,6 +228,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
}
}
}
+
private void basicMakeTombstone(LocalRegion r) throws RegionClearedException {
boolean setValueCompleted = false;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29bb98a2/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
index 36e3e30..2f372bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
@@ -1,18 +1,16 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
*/
package org.apache.geode.internal.cache;
@@ -31,9 +29,10 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class AbstractRegionEntryTest {
-
+
@Test
- public void whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone() throws RegionClearedException {
+ public void whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone()
+ throws RegionClearedException {
LocalRegion lr = mock(LocalRegion.class);
RegionVersionVector<?> rvv = mock(RegionVersionVector.class);
when(lr.getVersionVector()).thenReturn(rvv);
@@ -42,20 +41,19 @@ public class AbstractRegionEntryTest {
AbstractRegionEntry re = new TestableRegionEntry(lr, value);
assertEquals(value, re.getValueField());
Assertions.assertThatThrownBy(() -> re.makeTombstone(lr, vt))
- .isInstanceOf(RuntimeException.class)
- .hasMessage("throw exception on setValue(TOMBSTONE)");
+ .isInstanceOf(RuntimeException.class).hasMessage("throw exception on setValue(TOMBSTONE)");
assertEquals(Token.REMOVED_PHASE2, re.getValueField());
}
-
+
public static class TestableRegionEntry extends AbstractRegionEntry {
private Object value;
-
+
protected TestableRegionEntry(RegionEntryContext context, Object value) {
super(context, value);
}
-
+
@Override
protected Object getValueField() {
return this.value;
@@ -86,8 +84,7 @@ public class AbstractRegionEntryTest {
}
@Override
- public void setNextEntry(HashEntry<Object, Object> n) {
- }
+ public void setNextEntry(HashEntry<Object, Object> n) {}
@Override
public Object getKey() {
@@ -105,8 +102,7 @@ public class AbstractRegionEntryTest {
}
@Override
- protected void setEntryHash(int v) {
- }
-
+ protected void setEntryHash(int v) {}
+
}
}
[10/11] incubator-geode git commit: shutdownAll now syncs on class
before this
Posted by ds...@apache.org.
shutdownAll now syncs on class before this
changed to an AtomicBoolean, remove cache sync on addPartitionedRegion and requiresNotificationFromPR
fixed formatting. Removed class sync on rmqFactory
back to volatile boolean so that second SDA will wait for the first
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fe4cf4e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fe4cf4e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fe4cf4e4
Branch: refs/heads/feature/GEM-983
Commit: fe4cf4e4e972d6a29ae7508e2596f1de63b3e5e2
Parents: bb30357
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Oct 11 15:04:43 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon Oct 31 10:04:03 2016 -0700
----------------------------------------------------------------------
.../geode/internal/cache/GemFireCacheImpl.java | 157 +++++++++----------
1 file changed, 70 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe4cf4e4/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 ba4f1f4..3c4718c 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
@@ -664,7 +664,7 @@ public class GemFireCacheImpl
sb.append("GemFireCache[");
sb.append("id = " + System.identityHashCode(this));
sb.append("; isClosing = " + this.isClosing);
- sb.append("; isShutDownAll = " + this.isShutDownAll);
+ sb.append("; isShutDownAll = " + isCacheAtShutdownAll());
sb.append("; created = " + this.creationDate);
sb.append("; server = " + this.isServer);
sb.append("; copyOnRead = " + this.copyOnRead);
@@ -874,7 +874,7 @@ public class GemFireCacheImpl
this.cqService = CqServiceProvider.create(this);
- initReliableMessageQueueFactory();
+ this.rmqFactory = new ReliableMessageQueueFactoryImpl();
// Create the CacheStatistics
this.cachePerfStats = new CachePerfStats(system);
@@ -1751,58 +1751,59 @@ public class GemFireCacheImpl
}
}
- public synchronized void shutDownAll() {
- boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
+ public void shutDownAll() {
+ synchronized (GemFireCacheImpl.class) {
+ boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
- if (testIGE) {
- InternalGemFireError assErr = new InternalGemFireError(
- LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
- throw assErr;
- }
- if (isCacheAtShutdownAll()) {
- // it's already doing shutdown by another thread
- return;
- }
- if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
- try {
- CacheObserverHolder.getInstance().beforeShutdownAll();
- } finally {
- LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
- }
- }
- this.isShutDownAll = true;
-
- // bug 44031 requires multithread shutdownall should be grouped
- // by root region. However, shutDownAllDuringRecovery.conf test revealed that
- // we have to close colocated child regions first.
- // Now check all the PR, if anyone has colocate-with attribute, sort all the
- // PRs by colocation relationship and close them sequentially, otherwise still
- // group them by root region.
- TreeMap<String, Map<String, PartitionedRegion>> prTrees = getPRTrees();
- if (prTrees.size() > 1 && shutdownAllPoolSize != 1) {
- ExecutorService es = getShutdownAllExecutorService(prTrees.size());
- for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
- es.execute(new Runnable() {
- public void run() {
- ConnectionTable.threadWantsSharedResources();
- shutdownSubTreeGracefully(prSubMap);
- }
- });
- } // for each root
- es.shutdown();
- try {
- es.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- logger.debug("Shutdown all interrupted while waiting for PRs to be shutdown gracefully.");
+ if (testIGE) {
+ InternalGemFireError assErr = new InternalGemFireError(LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
+ throw assErr;
+ }
+ if (isCacheAtShutdownAll()) {
+ // it's already doing shutdown by another thread
+ return;
}
+ if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
+ try {
+ CacheObserverHolder.getInstance().beforeShutdownAll();
+ } finally {
+ LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
+ }
+ }
+ this.isShutDownAll = true;
+
+ // bug 44031 requires multithread shutdownall should be grouped
+ // by root region. However, shutDownAllDuringRecovery.conf test revealed that
+ // we have to close colocated child regions first.
+ // Now check all the PR, if anyone has colocate-with attribute, sort all the
+ // PRs by colocation relationship and close them sequentially, otherwise still
+ // group them by root region.
+ TreeMap<String, Map<String, PartitionedRegion>> prTrees = getPRTrees();
+ if (prTrees.size() > 1 && shutdownAllPoolSize != 1) {
+ ExecutorService es = getShutdownAllExecutorService(prTrees.size());
+ for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
+ es.execute(new Runnable() {
+ public void run() {
+ ConnectionTable.threadWantsSharedResources();
+ shutdownSubTreeGracefully(prSubMap);
+ }
+ });
+ } // for each root
+ es.shutdown();
+ try {
+ es.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ logger.debug("Shutdown all interrupted while waiting for PRs to be shutdown gracefully.");
+ }
- } else {
- for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
- shutdownSubTreeGracefully(prSubMap);
+ } else {
+ for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
+ shutdownSubTreeGracefully(prSubMap);
+ }
}
- }
- close("Shut down all members", null, false, true);
+ close("Shut down all members", null, false, true);
+ }
}
private ExecutorService getShutdownAllExecutorService(int size) {
@@ -4180,17 +4181,15 @@ public class GemFireCacheImpl
* regions when this cache requires, or does not require notification of all region/entry events.
*/
public void addPartitionedRegion(PartitionedRegion r) {
- synchronized (GemFireCacheImpl.class) {
- synchronized (this.partitionedRegions) {
- if (r.isDestroyed()) {
- if (logger.isDebugEnabled()) {
- logger.debug("GemFireCache#addPartitionedRegion did not add destroyed {}", r);
- }
- return;
- }
- if (this.partitionedRegions.add(r)) {
- getCachePerfStats().incPartitionedRegions(1);
+ synchronized (this.partitionedRegions) {
+ if (r.isDestroyed()) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("GemFireCache#addPartitionedRegion did not add destroyed {}", r);
}
+ return;
+ }
+ if (this.partitionedRegions.add(r)) {
+ getCachePerfStats().incPartitionedRegions(1);
}
}
}
@@ -4288,22 +4287,20 @@ public class GemFireCacheImpl
* @return true if the region should deliver all of its events to this cache
*/
protected boolean requiresNotificationFromPR(PartitionedRegion r) {
- synchronized (GemFireCacheImpl.class) {
- boolean hasSerialSenders = hasSerialSenders(r);
- boolean result = hasSerialSenders;
- if (!result) {
- Iterator allCacheServersIterator = allCacheServers.iterator();
- while (allCacheServersIterator.hasNext()) {
- CacheServerImpl server = (CacheServerImpl) allCacheServersIterator.next();
- if (!server.getNotifyBySubscription()) {
- result = true;
- break;
- }
+ boolean hasSerialSenders = hasSerialSenders(r);
+ boolean result = hasSerialSenders;
+ if (!result) {
+ Iterator allCacheServersIterator = allCacheServers.iterator();
+ while (allCacheServersIterator.hasNext()) {
+ CacheServerImpl server = (CacheServerImpl) allCacheServersIterator.next();
+ if (!server.getNotifyBySubscription()) {
+ result = true;
+ break;
}
-
}
- return result;
+
}
+ return result;
}
private boolean hasSerialSenders(PartitionedRegion r) {
@@ -4483,25 +4480,11 @@ public class GemFireCacheImpl
/**
* This cache's reliable message queue factory. Should always have an instance of it.
*/
- private ReliableMessageQueueFactory rmqFactory;
+ private final ReliableMessageQueueFactory rmqFactory;
private List<File> backupFiles = Collections.emptyList();
/**
- * Initializes the reliable message queue. Needs to be called at cache creation
- *
- * @throws IllegalStateException if the factory is in use
- */
- private void initReliableMessageQueueFactory() {
- synchronized (GemFireCacheImpl.class) {
- if (this.rmqFactory != null) {
- this.rmqFactory.close(false);
- }
- this.rmqFactory = new ReliableMessageQueueFactoryImpl();
- }
- }
-
- /**
* Returns this cache's ReliableMessageQueueFactory.
*
* @since GemFire 5.0
[04/11] incubator-geode git commit: Add a timeout to webdriver so
that UITest doesn't hang for hours if it can't load the page.
Posted by ds...@apache.org.
Add a timeout to webdriver so that UITest doesn't hang for hours if it can't load the page.
This closes #274
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d9563051
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d9563051
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d9563051
Branch: refs/heads/feature/GEM-983
Commit: d9563051ae5ff19123eed49334982c1a98ba08fd
Parents: b3d00ed
Author: Jared Stewart <js...@pivotal.io>
Authored: Thu Oct 27 14:36:51 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Fri Oct 28 19:21:41 2016 -0700
----------------------------------------------------------------------
.../org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9563051/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
index 6d78331..9116a80 100644
--- a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
+++ b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
@@ -219,6 +219,7 @@ public abstract class PulseAbstractTest extends PulseBaseTest {
driver = new PhantomJSDriver(capabilities);
driver.manage().window().maximize();
driver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS);
+ driver.manage().timeouts().pageLoadTimeout(60, TimeUnit.SECONDS);
}
@AfterClass