[geode] branch develop updated (d1ddd44 -> 7537e15)
This is an automated email from the ASF dual-hosted git repository. jinmeiliao pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from d1ddd44 GEODE-6734: Change packer image resources and scripts to Bionic add 7537e15 GEODE-6728: remove extra getResult() method (#3540) No new revisions were added by this update. Summary of changes: .../internal/rest/MemberManagementServiceDunitTest.java | 12 +++- .../management/internal/api/ClusterManagementResultTest.java | 3 ++- .../test/junit/assertions/ClusterManagementResultAssert.java | 2 +- .../apache/geode/management/api/ClusterManagementResult.java | 6 ++ .../cache/configuration/CacheElementJsonMappingTest.java | 8 +--- .../management/client/MemberManagementServiceDUnitTest.java | 5 +++-- .../rest/controllers/MemberManagementController.java | 3 ++- 7 files changed, 22 insertions(+), 17 deletions(-)
[geode-native] branch develop updated: GEODE-3415: Fix SSL certificate chain support (#480)
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new d53510a GEODE-3415: Fix SSL certificate chain support (#480)
d53510a is described below
commit d53510a4ade505f2632f62887f65eb0b6dae987f
Author: Michael Martell
AuthorDate: Thu May 2 15:02:07 2019 -0700
GEODE-3415: Fix SSL certificate chain support (#480)
* Fix SSL certificate chain support
* Add new SslException.
Co-authored-by: igod...@pivotal.io
Co-authored-by: jbarr...@pivotal.io
---
cppcache/include/geode/ExceptionTypes.hpp | 12
cppcache/include/geode/PoolFactory.hpp| 8
cryptoimpl/SSLImpl.cpp| 20 +---
3 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/cppcache/include/geode/ExceptionTypes.hpp
b/cppcache/include/geode/ExceptionTypes.hpp
index 9f5a48b..c3fb370 100644
--- a/cppcache/include/geode/ExceptionTypes.hpp
+++ b/cppcache/include/geode/ExceptionTypes.hpp
@@ -812,6 +812,18 @@ class APACHE_GEODE_EXPORT PutAllPartialResultException :
public Exception {
}
};
+/**
+ *@brief Thrown when an error is encountered during an SSL operation.
+ **/
+class APACHE_GEODE_EXPORT SslException : public Exception {
+ public:
+ using Exception::Exception;
+ ~SslException() noexcept override {}
+ std::string getName() const override {
+return "apache::geode::client::SslException";
+ }
+};
+
} // namespace client
} // namespace geode
} // namespace apache
diff --git a/cppcache/include/geode/PoolFactory.hpp
b/cppcache/include/geode/PoolFactory.hpp
index 4a7f416..195e28d 100644
--- a/cppcache/include/geode/PoolFactory.hpp
+++ b/cppcache/include/geode/PoolFactory.hpp
@@ -518,15 +518,15 @@ class APACHE_GEODE_EXPORT PoolFactory {
* cache operation.
* If setPRSingleHopEnabled is false the client can do an extra hop on
servers
* to go to the required partition for that cache operation.
- * The setPRSingleHopEnabled setting avoids extra hops only for the
following cache
- * operations:
+ * The setPRSingleHopEnabled setting avoids extra hops only for the following
+ * cache operations:
* 1. {@link Region#put(Object, Object)}
* 2. {@link Region#get(Object)}
* 3. {@link Region#destroy(Object)}
* If true, works best when {@link PoolFactory#setMaxConnections(int)} is set
* to -1.
- * @param enabled is a boolean indicating whether PR Single Hop optimization
should be enabled or
- * not.
+ * @param enabled is a boolean indicating whether PR Single Hop optimization
+ * should be enabled or not.
* @return a reference to this
*/
PoolFactory& setPRSingleHopEnabled(bool enabled);
diff --git a/cryptoimpl/SSLImpl.cpp b/cryptoimpl/SSLImpl.cpp
index 8616590..97d5b40 100644
--- a/cryptoimpl/SSLImpl.cpp
+++ b/cryptoimpl/SSLImpl.cpp
@@ -21,6 +21,10 @@
#include
+#include
+
+#include "../cppcache/src/util/exception.hpp"
+
namespace apache {
namespace geode {
namespace client {
@@ -56,7 +60,9 @@ SSLImpl::SSLImpl(ACE_HANDLE sock, const char *pubkeyfile,
SSL_CTX_set_cipher_list(sslctx->context(), "DEFAULT");
sslctx->set_mode(ACE_SSL_Context::SSLv23_client);
-sslctx->load_trusted_ca(pubkeyfile);
+if (sslctx->load_trusted_ca(pubkeyfile) != 0) {
+ throw SslException("Failed to read SSL trust store.");
+}
if (strlen(password) > 0) {
SSL_CTX_set_default_passwd_cb(sslctx->context(), pem_passwd_cb);
@@ -64,8 +70,16 @@ SSLImpl::SSLImpl(ACE_HANDLE sock, const char *pubkeyfile,
const_cast(password));
}
-sslctx->private_key(privkeyfile);
-sslctx->certificate(privkeyfile);
+if (sslctx->private_key(privkeyfile) != 0) {
+ throw SslException("Invalid SSL keystore password.");
+}
+if (sslctx->certificate(privkeyfile) != 0) {
+ throw SslException("Failed to read SSL certificate.");
+}
+if (::SSL_CTX_use_certificate_chain_file(sslctx->context(), privkeyfile) <=
+0) {
+ throw SslException("Failed to read SSL certificate chain.");
+}
SSLImpl::s_initialized = true;
}
m_io = new ACE_SSL_SOCK_Stream();
[geode] branch develop updated (0ebfb65 -> d1ddd44)
This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 0ebfb65 GEODE-6731: Use GeodeAwaitility timeout in ConcurrentSerialGatewaySenderOperationsDUnitTest (#3539) add d1ddd44 GEODE-6734: Change packer image resources and scripts to Bionic No new revisions were added by this update. Summary of changes: ci/images/google-geode-builder/packer.json | 2 +- ci/images/google-geode-builder/scripts/setup.sh | 13 + ci/pipelines/meta/deploy_meta.sh| 7 +++ .../org/apache/geode/internal/net/NioPlainEngineTest.java | 2 ++ 4 files changed, 11 insertions(+), 13 deletions(-)
[geode] branch feature/GEODE-6583 updated (77db462 -> e25ee55)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6583 in repository https://gitbox.apache.org/repos/asf/geode.git. discard 77db462 reinstated use of next-neighbors by default. added check for insufficient history to phi detectors & use timestamps if that's the case. discard 64387f8 reverting use of phi detectors for verification checks discard 74b0dc6 optimization discard 9e9fdd8 fix for failing unit test discard e8c258c spotless discard 5a73127 removed sync when creating detectors & cleaned up copyright notice discard 59e2b1a GEODE-6583 Integrate phi-accrual failure detection into Geode add 0860e38 GEODE-4958: Lowering the log level to warn. add 016cf13 GEODE-6634: Fix parallel option for repeatTest (#3443) add 8ff0939 GEODE-6557:Handling a possible null situation. add 62b8c22 GEODE-6638: do not fail with IllegalMonitorStateException during cache close (#3451) add 7fee5bf fix typo in JAVA_HOME command on OSX add 94ccba3 GEODE-6649: Static analyzer warning cleanup. add fc4e825 GEODE-6649: Add tests for effected methods. add 5d0fcf3 GEODE-6649: Remove lock contention in ClientHealthMonitor heartbeats. add 133d6af GEODE-5231: Fix PersistentReplicatedTestBase subclass flakiness add 99dae16 GEODE-5231: addIgnoredException to PersistentRVVRecoveryDUnitTest add ea0dc64 GEODE-5231: Fix timeout in PersistentRVVRecoveryDUnitTest add 2862bc7 GEODE-6639: Cleanup static analyzer warnings. add a75c5d0 GEODE-6639: Adds unit test for processing message time logic. add 55fd4a2 GEODE-6639: Use AtomicLong for processingMessageStartTime add ff703dd GEODE-6664 CI failure: org.apache.geode.ClusterCommunicationsDUnitTest.receiveBigResponse add 0e90b5a GEODE-6646 - CI failure in serverRestarsAfterLocatorReconnects add 447f508 GEODE-6611: geode-all-bom does not import java-library (#3474) add 064892c GEODE-6662 NioPlainEngine.ensureWrappedCapacity add 96bd60e GEODE-6640: add integration tests to do put, invalidate, then get from async JDBC mapping (#3468) add def65d4 GEODE-6579: optimize string deserialization (#3381) add 7a82437 GEODE-: Catch SocketTimeoutException (#3478) add cee84bb GEODE-6665: Avoid creating regions on Locator (#3480) add 104268a GEODE-5986 Inconsistent equals/hashCode add 6a177ec GEODE-6612: add entry count for list Region and rework filtering by groups (#3465) add f3428c6 GEODE-6611: Correct publication issues in all-bom. (#3483) add 49757e7 GEODE-6630: move allBucketsRecoveredFromDisk count down latch (#3477) add a0da3ce Fixes CI benchmark baseline selection. add 1355084 adding my PGP block as instructed in release steps add 5053c7f reduce verbosity of benchmark CI output and update version numbers due to new release add 0adb400 GEODE-6679: Use ephemeral ports in StandaloneClientManagementAPIAcceptanceTest (#3485) add c7e43c7 GEODE-5971: refactor remaining command's usage of Result (#3481) add ca36754 GEODE-6629: Add additional test assertions for disk store creation add fe0ddc5 GEODE-6656: Fix up PersistentPartitionHangsDuringRestartRegressionTest add afc311c GEODE-6607: Moving client registration queue to CacheClientNotifier add d746ec4 GEODE-6694: Use volatile access to read current state of BucketAdvisor add a6045e8 GEODE-6697: Make system property controlled variable static. add 6e17bdd GEODE-6620: Upgrading springframework library (#3472) add 88b3c51 GEODE-6693: run concurrency tests for longer (#3488) add 323cd0d GEODE-5971: Remove FileResult (#3487) add aae23e3 GEODE-6612: use java Objects for comparision instead of guava (#3493) add d3154bc GEODE-5971: have command pipeline send ResultModel json across the wire (#3495) add 96466c9 GEODE-5971: delete LegacyCommandResult and rename ModelResultModel to… (#3497) add 45c9538 Adding a couple of scripts to automate release candidates add 8181426 Updating the prepare_rc script to find the right version of openssl add 3511c67 add newly-released 1.9.0 to old versions add d684876 update the benchmarks baseline as 1.9.0 is released now add 9df7fc4 we have a deploy script; add a corresponding destroy script (#3504) add b19734d GEODE-6595: Deprecates and ignore thread local connection pool attribute. (#3394) add 8320fdc GEODE-6709: Locators should not start when ClusterConfigurationServic… (#3503) add 3282d5a GEODE-6667: Await 2 owners of bucket in testCrashWhileCreatingABucket add 0a9a097 GEODE-5971: remove unnecessary @VisibleToTest methods (#3505) add 39d8370 Fixing the minor version byte for Version.GEODE_1_10_0 add 3ea508d GEODE-6580: Cleanup static analyzer warnings. (#3432) add 59c76ee GEODE-6692: canonicalize
[geode] branch develop updated (f943418 -> 0ebfb65)
This is an automated email from the ASF dual-hosted git repository. klund pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from f943418 GEODE-6683: Set java SSL properties when Pulse runs in non-embedded mode (#3525) add 0ebfb65 GEODE-6731: Use GeodeAwaitility timeout in ConcurrentSerialGatewaySenderOperationsDUnitTest (#3539) No new revisions were added by this update. Summary of changes: .../geode/internal/cache/wan/WANTestBase.java | 24 +++- .../SerialGatewaySenderOperationsDUnitTest.java| 26 -- 2 files changed, 12 insertions(+), 38 deletions(-)
[geode] branch develop updated: GEODE-6690: use the caching addStringPart method
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 72eca0c GEODE-6690: use the caching addStringPart method
72eca0c is described below
commit 72eca0c33a942db731366cacf3603a806f893e7c
Author: Darrel Schneider
AuthorDate: Thu May 2 10:07:48 2019 -0700
GEODE-6690: use the caching addStringPart method
now uses the caching addStringPart for region name parts
---
.../main/java/org/apache/geode/cache/client/internal/ClearOp.java | 2 +-
.../java/org/apache/geode/cache/client/internal/ContainsKeyOp.java | 2 +-
.../main/java/org/apache/geode/cache/client/internal/DestroyOp.java | 4 ++--
.../org/apache/geode/cache/client/internal/DestroyRegionOp.java | 2 +-
.../geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java | 4 ++--
.../apache/geode/cache/client/internal/ExecuteRegionFunctionOp.java | 6 +++---
.../cache/client/internal/ExecuteRegionFunctionSingleHopOp.java | 4 ++--
.../main/java/org/apache/geode/cache/client/internal/GetAllOp.java | 2 +-
.../apache/geode/cache/client/internal/GetClientPRMetaDataOp.java | 2 +-
.../geode/cache/client/internal/GetClientPartitionAttributesOp.java | 2 +-
.../java/org/apache/geode/cache/client/internal/GetEntryOp.java | 2 +-
.../src/main/java/org/apache/geode/cache/client/internal/GetOp.java | 2 +-
.../java/org/apache/geode/cache/client/internal/InvalidateOp.java | 2 +-
.../main/java/org/apache/geode/cache/client/internal/KeySetOp.java | 2 +-
.../main/java/org/apache/geode/cache/client/internal/PutAllOp.java | 2 +-
.../src/main/java/org/apache/geode/cache/client/internal/PutOp.java | 2 +-
.../apache/geode/cache/client/internal/RegisterInterestListOp.java | 2 +-
.../org/apache/geode/cache/client/internal/RegisterInterestOp.java | 2 +-
.../java/org/apache/geode/cache/client/internal/RemoveAllOp.java| 2 +-
.../main/java/org/apache/geode/cache/client/internal/SizeOp.java| 2 +-
.../geode/cache/client/internal/UnregisterInterestListOp.java | 2 +-
.../apache/geode/cache/client/internal/UnregisterInterestOp.java| 2 +-
.../internal/cache/tier/sockets/ClientInterestMessageImpl.java | 2 +-
.../geode/internal/cache/tier/sockets/ClientTombstoneMessage.java | 2 +-
.../apache/geode/cache/client/internal/GatewaySenderBatchOp.java| 2 +-
25 files changed, 30 insertions(+), 30 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
index 0c1e059..0f9b940 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClearOp.java
@@ -65,7 +65,7 @@ public class ClearOp {
*/
public ClearOpImpl(String region, EventID eventId, Object callbackArg) {
super(MessageType.CLEAR_REGION, callbackArg != null ? 3 : 2);
- getMessage().addStringPart(region);
+ getMessage().addStringPart(region, true);
getMessage().addBytesPart(eventId.calcBytes());
if (callbackArg != null) {
getMessage().addObjPart(callbackArg);
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
index 8159bf9..e722932 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ContainsKeyOp.java
@@ -53,7 +53,7 @@ public class ContainsKeyOp {
*/
public ContainsKeyOpImpl(String region, Object key, MODE mode) {
super(MessageType.CONTAINS_KEY, 3);
- getMessage().addStringPart(region);
+ getMessage().addStringPart(region, true);
getMessage().addStringOrObjPart(key);
getMessage().addIntPart(mode.ordinal());
this.region = region;
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
index 6ac95c7..dfcb6b6 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/DestroyOp.java
@@ -138,7 +138,7 @@ public class DestroyOp {
this.prSingleHopEnabled = prSingleHopEnabled;
this.callbackArg = callbackArg;
this.event = event;
- getMessage().addStringPart(region.getFullPath());
+ getMessage().addStringPart(region.getFullPath(), true);
getMessage().addStringOrObjPart(key);
getMessage().addObjPart(expectedOldValue);
getMessage().addBytePart(operation.ordinal);
@@ -155,7 +155,7 @@ public class DestroyOp {
this.key = key;
[geode] branch develop updated (22659ee -> 79ca782)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 22659ee GEODE-6728: have getResult return specified type (#3532)
add 79ca782 GEODE-6174: RegionConfigRealizer should be idempotent for
create (#3515)
No new revisions were added by this update.
Summary of changes:
...t.java => RegionManagementOnMultipleGroup.java} | 43 ++
.../RegionConfigRealizerIntegrationTest.java | 23
.../realizers/RegionConfigRealizer.java| 7 +++-
.../assertions/ClusterManagementResultAssert.java | 6 +++
4 files changed, 54 insertions(+), 25 deletions(-)
copy
geode-assembly/src/distributedTest/java/org/apache/geode/management/internal/rest/{ServerRestartTest.java
=> RegionManagementOnMultipleGroup.java} (64%)
[geode] branch develop updated (3deb53a -> 22659ee)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 3deb53a GEODE-6472 Double increment gets for partitioned region
add 22659ee GEODE-6728: have getResult return specified type (#3532)
No new revisions were added by this update.
Summary of changes:
...tandaloneClientManagementAPIAcceptanceTest.java | 5 ++-
...gion.java => ManagementClientCreateRegion.java} | 0
.../rest/ListRegionManagementDunitTest.java| 45 +++---
.../mutators/ConfigurationManager.java | 2 +-
.../api/LocatorClusterManagementServiceTest.java | 4 +-
.../management/api/ClusterManagementResult.java| 5 +++
.../management/configuration/MemberConfig.java | 3 +-
.../client/MemberManagementServiceDUnitTest.java | 6 ++-
8 files changed, 40 insertions(+), 30 deletions(-)
rename
geode-assembly/src/acceptanceTest/resources/{ManagementClientTestCreateRegion.java
=> ManagementClientCreateRegion.java} (100%)
[geode] branch develop updated (7c71c22 -> 3deb53a)
This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 7c71c22 GEODE-6721: use ip for bind-address instead of the canonical name of … (#3521) add 3deb53a GEODE-6472 Double increment gets for partitioned region No new revisions were added by this update. Summary of changes: .../bean/stats/DistributedSystemStatsJUnitTest.java | 8 .../geode/internal/cache/PartitionedRegion.java | 21 +++-- 2 files changed, 15 insertions(+), 14 deletions(-)
