[geode] branch feature/GEODE-2113c updated (74365d6 -> 8f886f4)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-2113c in repository https://gitbox.apache.org/repos/asf/geode.git. from 74365d6 GEODE-2113 implement SSL over NIO add 8f886f4 Reduce test duration No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/ClusterSSLDUnitTest.java | 63 +- .../monitoring/executor/AbstractExecutor.java | 7 +-- .../apache/geode/internal/net/SocketCreator.java | 4 +- .../org/apache/geode/internal/tcp/Connection.java | 5 +- 4 files changed, 34 insertions(+), 45 deletions(-)
[geode-native] branch develop updated: GEODE-6218: Fixes UTF-8 string literal.
This is an automated email from the ASF dual-hosted git repository.
jbarrett 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 2f6bfe4 GEODE-6218: Fixes UTF-8 string literal.
2f6bfe4 is described below
commit 2f6bfe4eea70ce2d350ef44cdbee7e65f30102cb
Author: Jacob Barrett
AuthorDate: Thu Dec 20 15:10:21 2018 -0800
GEODE-6218: Fixes UTF-8 string literal.
---
cppcache/test/util/functionalTests.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cppcache/test/util/functionalTests.cpp
b/cppcache/test/util/functionalTests.cpp
index 9c18bae..1cd483c 100644
--- a/cppcache/test/util/functionalTests.cpp
+++ b/cppcache/test/util/functionalTests.cpp
@@ -33,11 +33,11 @@ TEST(string, geode_hash) {
EXPECT_EQ(57, hash("9"));
EXPECT_EQ(1077910243, hash("supercalifragilisticexpialidocious"));
- EXPECT_EQ(1544552287, hash("You had me at meat tornad\u00F6!\U000F"));
+ EXPECT_EQ(1544552287, hash(u8"You had me at meat tornad\u00F6!\U000F"));
auto str = std::string("You had me at");
str.push_back(0);
- str.append("meat tornad\u00F6!\U000F");
+ str.append(u8"meat tornad\u00F6!\U000F");
EXPECT_EQ(701776767, hash(str));
}
[geode-native] branch develop updated: GEODE-6229: Add ubuntu build image to Packer scripts (#425)
This is an automated email from the ASF dual-hosted git repository.
bbender 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 a1f10c1 GEODE-6229: Add ubuntu build image to Packer scripts (#425)
a1f10c1 is described below
commit a1f10c1b8d2445e8e044d45f5a2d4d771ccb60cf
Author: Blake Bender
AuthorDate: Thu Dec 20 14:50:52 2018 -0800
GEODE-6229: Add ubuntu build image to Packer scripts (#425)
* packer files for building base and build images
* Updated to use systemd
* Fix buffer overflow error.
* create home dir for build
* include Threads in target_link_libraries
* GEODE-6229: Fix Ubuntu build dependencies
Co-authored-by: Ivan Godwin
Co-authored-by: Matthew Reddington
Co-authored-by: Jacob Barrett
Co-authored-by: Michael Oleske
Co-authored-by: Ernest Burghardt
---
cppcache/src/TcpConn.cpp | 2 +-
dependencies/benchmark/CMakeLists.txt | 5 +-
packer/build-ubuntu.json | 88 ++
packer/ubuntu-16.04-base.json | 48
.../ubuntu/add-user-build.sh | 31 ++--
.../CMakeLists.txt => packer/ubuntu/cleanup.sh | 30 +---
packer/ubuntu/files/etc/init-user.sh | 51 +
.../files/etc/systemd/system/update-hosts.service | 11 +++
packer/ubuntu/files/usr/local/bin/update-hosts.sh | 6 ++
.../ubuntu/install-cmake.sh| 31 ++--
.../ubuntu/install-coverage-tools.sh | 37 +++--
.../ubuntu/install-gemfire.sh | 33 ++--
.../ubuntu/install-packages.sh | 35 ++---
.../CMakeLists.txt => packer/ubuntu/update.sh | 32 ++--
.../ubuntu/wait-for-cloud-init.sh | 35 +++--
sqliteimpl/CMakeLists.txt | 8 +-
16 files changed, 267 insertions(+), 216 deletions(-)
diff --git a/cppcache/src/TcpConn.cpp b/cppcache/src/TcpConn.cpp
index b7c08ca..ec88007 100644
--- a/cppcache/src/TcpConn.cpp
+++ b/cppcache/src/TcpConn.cpp
@@ -240,7 +240,7 @@ void TcpConn::connect() {
}
int rc = this->m_io->enable(ACE_NONBLOCK);
if (-1 == rc) {
-char msg[250];
+char msg[256];
int32_t lastError = ACE_OS::last_error();
std::snprintf(msg, 256, "TcpConn::NONBLOCK: %d: %s", lastError,
ACE_OS::strerror(lastError));
diff --git a/dependencies/benchmark/CMakeLists.txt
b/dependencies/benchmark/CMakeLists.txt
index 4bd80bb..9cffcae 100644
--- a/dependencies/benchmark/CMakeLists.txt
+++ b/dependencies/benchmark/CMakeLists.txt
@@ -35,7 +35,7 @@ ExternalProject_Add( ${${PROJECT_NAME}_EXTERN}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-DCMAKE_INSTALL_PREFIX=
- -DCMAKE_BUILD_TYPE=$
+-DCMAKE_BUILD_TYPE=$
-DGTEST_ROOT=$/..
-DBENCHMARK_ENABLE_TESTING=OFF
DEPENDS ${${PROJECT_NAME}_DEPENDS}
@@ -57,12 +57,15 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
)
endif()
+find_package(Threads REQUIRED)
+
add_library(${PROJECT_NAME} INTERFACE)
target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE
$
)
target_link_libraries(${PROJECT_NAME} INTERFACE
${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}benchmark${CMAKE_STATIC_LIBRARY_SUFFIX}
+ Threads::Threads
)
if (WIN32)
target_link_libraries(${PROJECT_NAME} INTERFACE
diff --git a/packer/build-ubuntu.json b/packer/build-ubuntu.json
new file mode 100644
index 000..35c48a1
--- /dev/null
+++ b/packer/build-ubuntu.json
@@ -0,0 +1,88 @@
+{
+ "variables":{
+"region":"us-west-2",
+"source_ami":"ami-08718fb38f5f50f34",
+"source_image_name":"X.vmx",
+"image_name":"build-ubuntu"
+ },
+ "builders":[
+{
+ "type":"amazon-ebs",
+ "instance_type":"t2.micro",
+ "ami_name":"native-{{user `version`}}-{{user `image_name`}}
{{timestamp}}",
+ "access_key":"{{user `aws_access_key`}}",
+ "secret_key":"{{user `aws_secret_key`}}",
+ "region":"{{user `region`}}",
+ "source_ami":"{{user `source_ami`}}",
+ "subnet_id":"{{user `subnet_id`}}",
+ "vpc_id":"{{user `vpc_id`}}",
+ "tags":{
+"team":"native",
+"version":"{{user `version`}}",
+"source_ami":"{{user `source_ami`}}"
+ },
+ "ssh_username":"ubuntu",
+ "ssh_pty":true
+}
+ ],
+ "provisioners":[
+{
+ "type":"shell",
+ "script":"ubuntu/wait-for-cloud-init.sh"
+},
+{
+ "type":"shell",
+ "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
+ "scripts":[
+"ubuntu/update.sh"
+ ]
+},
+{
+ "type":"file",
+ "source":"ubuntu/files",
+ "destination":"/tmp"
+},
+{
+ "type":"shell",
+ "execute_command":"{{.Vars}} sudo -E -S bash '{{.Path}}'",
+
[geode] branch develop updated: GEODE-6176: Make FunctionService testable with internal delegates
This is an automated email from the ASF dual-hosted git repository.
klund 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 afd082c GEODE-6176: Make FunctionService testable with internal
delegates
afd082c is described below
commit afd082c67895abf6e9467cc4fbf1bf7cc0c28995
Author: Kirk Lund
AuthorDate: Mon Dec 10 13:44:24 2018 -0800
GEODE-6176: Make FunctionService testable with internal delegates
Introduce new internal FunctionExecutionService API interfaces:
* FunctionExecutionService
* InternalFunctionExecutionService
Implement interfaces with:
* InternalFunctionExecutionServiceImpl
Collapse FunctionServiceManager into InternalFunctionExecutionServiceImpl
Change the two static API classes to delegate to an instance of
InternalFunctionExecutionServiceImpl:
* FunctionService (User API) -- only has private internal changes
* InternalFunctionService -- now extends FunctionService
Geode classes that use the static API classes directly can now be
changed to depend on one of the two interfaces using constructor
injection to facilitate unit testing without PowerMock.
---
.../geode/cache/execute/FunctionService.java | 57 +--
.../internal/InternalDistributedSystem.java| 4 +-
.../cache/execute/FunctionExecutionService.java} | 91 +
.../execute/InternalFunctionExecutionService.java | 154
.../InternalFunctionExecutionServiceImpl.java} | 403 +
.../cache/execute/InternalFunctionService.java | 72 ++--
.../apache/geode/internal/cache/properties.html| 2 +-
.../tier/sockets/command/ExecuteFunction70.java| 4 +-
8 files changed, 412 insertions(+), 375 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionService.java
b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionService.java
index 630bfeb..3566c38 100755
---
a/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionService.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/execute/FunctionService.java
@@ -23,11 +23,10 @@ import org.apache.geode.cache.RegionService;
import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.Pool;
-import org.apache.geode.cache.execute.internal.FunctionServiceManager;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.distributed.DistributedSystemDisconnectedException;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.cache.execute.FunctionExecutionService;
+import
org.apache.geode.internal.cache.execute.InternalFunctionExecutionServiceImpl;
/**
* Provides the entry point into execution of user defined {@linkplain
Function}s.
@@ -39,9 +38,18 @@ import
org.apache.geode.distributed.internal.InternalDistributedSystem;
* @since GemFire 6.0
*/
public class FunctionService {
- private static final FunctionServiceManager functionSvcMgr = new
FunctionServiceManager();
- FunctionService() {}
+ private static final FunctionService INSTANCE =
+ new FunctionService(new InternalFunctionExecutionServiceImpl());
+
+ private final FunctionExecutionService functionExecutionService;
+
+ /**
+ * Protected visibility to allow InternalFunctionService to extend
FunctionService.
+ */
+ protected FunctionService(FunctionExecutionService functionExecutionService)
{
+this.functionExecutionService = functionExecutionService;
+ }
/**
* Returns an {@link Execution} object that can be used to execute a data
dependent function on
@@ -63,7 +71,7 @@ public class FunctionService {
* @since GemFire 6.0
*/
public static Execution onRegion(Region region) {
-return functionSvcMgr.onRegion(region);
+return getFunctionExecutionService().onRegion(region);
}
/**
@@ -78,7 +86,7 @@ public class FunctionService {
* @since GemFire 6.0
*/
public static Execution onServer(Pool pool) {
-return functionSvcMgr.onServer(pool);
+return getFunctionExecutionService().onServer(pool);
}
/**
@@ -91,7 +99,7 @@ public class FunctionService {
* @since GemFire 6.0
*/
public static Execution onServers(Pool pool) {
-return functionSvcMgr.onServers(pool);
+return getFunctionExecutionService().onServers(pool);
}
/**
@@ -108,7 +116,7 @@ public class FunctionService {
* @since GemFire 6.5
*/
public static Execution onServer(RegionService regionService) {
-return functionSvcMgr.onServer(regionService);
+return getFunctionExecutionService().onServer(regionService);
}
/**
@@ -123,7 +131,7 @@ public class FunctionService {
* @since GemFire 6.5
*/
public
[geode] branch develop updated (511d299 -> ca886d9)
This is an automated email from the ASF dual-hosted git repository. prhomberg pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 511d299 Merge pull request #3028 from apache/feature/GEODE-6230 add ca886d9 GEODE-6231: Increase timeout for DistributedTest jobs. (#3029) No new revisions were added by this update. Summary of changes: ci/pipelines/shared/jinja.variables.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode-benchmarks] branch gcpscaletest updated: 256 threads with thread local true, 1M keys for all benchmarks
This is an automated email from the ASF dual-hosted git repository.
wirebaron pushed a commit to branch gcpscaletest
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/gcpscaletest by this push:
new d5a2dae 256 threads with thread local true, 1M keys for all benchmarks
d5a2dae is described below
commit d5a2dae6f8ab29dc5296353907a7db2ccf6a67af
Author: Brian Rowe
AuthorDate: Thu Dec 20 14:05:23 2018 -0800
256 threads with thread local true, 1M keys for all benchmarks
---
.../java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java | 2 +-
.../java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java | 2 +-
.../java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java
index cd9d9b8..f958f0f 100644
---
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java
+++
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedGetBenchmark.java
@@ -37,7 +37,7 @@ import org.apache.geode.perftest.TestRunners;
*/
public class PartitionedGetBenchmark implements PerformanceTest {
- private long keyRange = 1;
+ private long keyRange = 100;
@Test
public void run() throws Exception {
diff --git
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java
index e75b752..806c058 100644
---
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java
+++
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedGetBenchmark.java
@@ -37,7 +37,7 @@ import org.apache.geode.perftest.TestRunners;
*/
public class ReplicatedGetBenchmark implements PerformanceTest {
- private long keyRange = 1;
+ private long keyRange = 100;
@Test
public void run() throws Exception {
diff --git
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java
index cf6341a..40bc02f 100644
---
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java
+++
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/ReplicatedPutBenchmark.java
@@ -36,7 +36,7 @@ import org.apache.geode.perftest.TestRunners;
*/
public class ReplicatedPutBenchmark implements PerformanceTest {
- private long keyRange = 1;
+ private long keyRange = 100;
public ReplicatedPutBenchmark() {}
[geode-benchmarks] branch gcpscaletest updated: 256 threads with thread local true, 1M keys
This is an automated email from the ASF dual-hosted git repository.
wirebaron pushed a commit to branch gcpscaletest
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/gcpscaletest by this push:
new e737315 256 threads with thread local true, 1M keys
e737315 is described below
commit e7373151d38e384c0e5153872cc3c4f5802ba21f
Author: Brian Rowe
AuthorDate: Thu Dec 20 14:03:33 2018 -0800
256 threads with thread local true, 1M keys
---
.../java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
index 56fdd0e..3357a17 100644
---
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
+++
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tests/PartitionedPutBenchmark.java
@@ -36,7 +36,7 @@ import org.apache.geode.perftest.TestRunners;
*/
public class PartitionedPutBenchmark implements PerformanceTest {
- private long keyRange = 1;
+ private long keyRange = 100;
public PartitionedPutBenchmark() {}
[geode] branch feature/GEODE-6205 updated (5f3f91e -> bf0e1fd)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-6205 in repository https://gitbox.apache.org/repos/asf/geode.git. from 5f3f91e GEODE-6205: Set disk-dir in gfsh either absolute or relative based on input directory add bf0e1fd GEODE-6205: Force CI to re-run No new revisions were added by this update. Summary of changes:
[geode] branch feature/GEODE-6230 deleted (was 103c83e)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6230 in repository https://gitbox.apache.org/repos/asf/geode.git. was 103c83e GEODE-6230 Add test start/stop logging to tests using distributed test Rules The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (7ae273f -> 511d299)
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 7ae273f GEODE-6219: Add assertion to verify the OS commands really
ran (#3017)
add 103c83e GEODE-6230 Add test start/stop logging to tests using
distributed test Rules
new 511d299 Merge pull request #3028 from apache/feature/GEODE-6230
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../dunit/internal/JUnit4DistributedTestCase.java | 16 +
.../geode/test/dunit/internal/ProcessManager.java | 1 -
.../{BounceResult.java => TestHistoryLogger.java} | 26 ++
.../test/dunit/rules/AbstractDistributedRule.java | 20 -
4 files changed, 27 insertions(+), 36 deletions(-)
copy
geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/{BounceResult.java
=> TestHistoryLogger.java} (60%)
[geode] 01/01: Merge pull request #3028 from apache/feature/GEODE-6230
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git commit 511d29965b1c8c497c245a7cb367ad9741b94bf0 Merge: 7ae273f 103c83e Author: Bruce Schuchardt AuthorDate: Thu Dec 20 13:37:24 2018 -0800 Merge pull request #3028 from apache/feature/GEODE-6230 GEODE-6230 Add test start/stop logging to tests using distributed tes… .../dunit/internal/JUnit4DistributedTestCase.java | 16 +-- .../geode/test/dunit/internal/ProcessManager.java | 1 - .../test/dunit/internal/TestHistoryLogger.java | 32 ++ .../test/dunit/rules/AbstractDistributedRule.java | 20 ++ 4 files changed, 47 insertions(+), 22 deletions(-)
[geode-benchmarks] branch gcpscaletest updated: 256 threads with thread local true
This is an automated email from the ASF dual-hosted git repository.
wirebaron pushed a commit to branch gcpscaletest
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/gcpscaletest by this push:
new d0bb31c 256 threads with thread local true
d0bb31c is described below
commit d0bb31cd9c9cfeec93e05d7056fe6466083c34b1
Author: Brian Rowe
AuthorDate: Thu Dec 20 12:31:52 2018 -0800
256 threads with thread local true
---
harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
b/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
index ea066b7..c1b 100644
--- a/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
+++ b/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
@@ -32,7 +32,7 @@ import org.apache.geode.perftest.yardstick.YardstickTask;
public class WorkloadConfig implements Serializable {
long durationSeconds = 1;
long warmupSeconds = 0;
- int threads = 96;
+ int threads = 256;
public WorkloadConfig() {}
[geode-benchmarks] branch gcpscaletest updated: 96 threads with thread local true
This is an automated email from the ASF dual-hosted git repository.
wirebaron pushed a commit to branch gcpscaletest
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/gcpscaletest by this push:
new 6d094d2 96 threads with thread local true
6d094d2 is described below
commit 6d094d266bec98ea057ad11721f0c004935e757c
Author: Brian Rowe
AuthorDate: Thu Dec 20 12:07:49 2018 -0800
96 threads with thread local true
---
harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
b/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
index 568664d..ea066b7 100644
--- a/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
+++ b/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
@@ -32,7 +32,7 @@ import org.apache.geode.perftest.yardstick.YardstickTask;
public class WorkloadConfig implements Serializable {
long durationSeconds = 1;
long warmupSeconds = 0;
- int threads = 64;
+ int threads = 96;
public WorkloadConfig() {}
[geode-benchmarks] branch gcpscaletest updated: 64 threads with thread local true
This is an automated email from the ASF dual-hosted git repository.
wirebaron pushed a commit to branch gcpscaletest
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/gcpscaletest by this push:
new b333dc0 64 threads with thread local true
b333dc0 is described below
commit b333dc09d44a63cfe74d61eb6ee909194a3d5853
Author: Brian Rowe
AuthorDate: Thu Dec 20 11:41:50 2018 -0800
64 threads with thread local true
---
harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
b/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
index a474a29..568664d 100644
--- a/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
+++ b/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
@@ -32,7 +32,7 @@ import org.apache.geode.perftest.yardstick.YardstickTask;
public class WorkloadConfig implements Serializable {
long durationSeconds = 1;
long warmupSeconds = 0;
- int threads = 32;
+ int threads = 64;
public WorkloadConfig() {}
[geode-benchmarks] branch gcpscaletest updated: 32 threads with thread local true
This is an automated email from the ASF dual-hosted git repository.
wirebaron pushed a commit to branch gcpscaletest
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git
The following commit(s) were added to refs/heads/gcpscaletest by this push:
new 16611ba 32 threads with thread local true
16611ba is described below
commit 16611ba89d1863c64a5494762828dbb0b01d4c1b
Author: Brian Rowe
AuthorDate: Thu Dec 20 11:08:09 2018 -0800
32 threads with thread local true
---
.../src/main/java/org/apache/geode/benchmark/tasks/StartClient.java | 1 +
harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartClient.java
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartClient.java
index add2309..091a59c 100644
---
a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartClient.java
+++
b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartClient.java
@@ -48,6 +48,7 @@ public class StartClient implements Task {
ClientCache clientCache = new
ClientCacheFactory(GeodeProperties.clientProperties())
.setPdxSerializer(new
ReflectionBasedAutoSerializer("org.apache.benchmark.geode.data.*"))
.addPoolLocator(locator.getHostAddress(), locatorPort)
+.setPoolThreadLocalConnections(true)
.set(ConfigurationProperties.STATISTIC_ARCHIVE_FILE, statsFile)
.create();
diff --git
a/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
b/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
index c1b..a474a29 100644
--- a/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
+++ b/harness/src/main/java/org/apache/geode/perftest/WorkloadConfig.java
@@ -32,7 +32,7 @@ import org.apache.geode.perftest.yardstick.YardstickTask;
public class WorkloadConfig implements Serializable {
long durationSeconds = 1;
long warmupSeconds = 0;
- int threads = 256;
+ int threads = 32;
public WorkloadConfig() {}
[geode] branch feature/GEODE-6230 created (now 103c83e)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-6230 in repository https://gitbox.apache.org/repos/asf/geode.git. at 103c83e GEODE-6230 Add test start/stop logging to tests using distributed test Rules This branch includes the following new commits: new 103c83e GEODE-6230 Add test start/stop logging to tests using distributed test Rules The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: GEODE-6230 Add test start/stop logging to tests using distributed test Rules
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-6230
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 103c83e8d98e8af1565342377dc8b7b050e4a7dc
Author: Bruce Schuchardt
AuthorDate: Thu Dec 20 11:00:29 2018 -0800
GEODE-6230 Add test start/stop logging to tests using distributed test Rules
Added logging to AbstractDistributedRule and moved history logging out
of JUnit4DistributedTestCase and into another class so it can be used by
Rules w/o referring to a deprecated class.
---
.../dunit/internal/JUnit4DistributedTestCase.java | 16 +--
.../geode/test/dunit/internal/ProcessManager.java | 1 -
.../test/dunit/internal/TestHistoryLogger.java | 32 ++
.../test/dunit/rules/AbstractDistributedRule.java | 20 ++
4 files changed, 47 insertions(+), 22 deletions(-)
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
index 8c64555..1da7094 100644
---
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -29,10 +29,8 @@ import static org.junit.Assert.assertNotNull;
import java.io.File;
import java.io.Serializable;
import java.util.Arrays;
-import java.util.LinkedHashSet;
import java.util.Map.Entry;
import java.util.Properties;
-import java.util.Set;
import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.Logger;
@@ -67,8 +65,6 @@ import
org.apache.geode.test.junit.rules.serializable.SerializableTestName;
public abstract class JUnit4DistributedTestCase implements
DistributedTestFixture, Serializable {
private static final Logger logger = LogService.getLogger();
- private static final Set testHistory = new LinkedHashSet<>();
-
/** This VM's connection to the distributed system */
protected static InternalDistributedSystem system;
private static Class lastSystemCreatedInTest;
@@ -381,7 +377,7 @@ public abstract class JUnit4DistributedTestCase implements
DistributedTestFixtur
final String className = getTestClass().getCanonicalName();
final String methodName = getName();
-logTestHistory();
+TestHistoryLogger.logTestHistory(getTestClass().getSimpleName(),
methodName);
setUpVM(methodName, getDefaultDiskStoreName(0, -1, className, methodName));
@@ -470,16 +466,6 @@ public abstract class JUnit4DistributedTestCase implements
DistributedTestFixtur
}
/**
- * Write a message to the log about what tests have ran previously. This
makes it easier to figure
- * out if a previous test may have caused problems
- */
- private final void logTestHistory() {
-String name = getTestClass().getSimpleName() + "." + getTestMethodName();
-testHistory.add(name);
-System.out.println("Previously run tests: " + testHistory);
- }
-
- /**
* Tears down the DistributedTestCase.
*
*
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java
index 6b864e4..c4fa0b2 100755
---
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/ProcessManager.java
@@ -155,7 +155,6 @@ public class ProcessManager {
private void linkStreams(final String version, final int vmNum, final
ProcessHolder holder,
final InputStream in, final PrintStream out) {
final String vmName = "[" + VM.getVMName(version, vmNum) + "] ";
-System.out.println("linking IO streams for " + vmName);
Thread ioTransport = new Thread() {
public void run() {
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
diff --git
a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/TestHistoryLogger.java
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/TestHistoryLogger.java
new file mode 100644
index 000..d8beddb
--- /dev/null
+++
b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/TestHistoryLogger.java
@@ -0,0 +1,32 @@
+/*
+ * 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
[geode] branch develop updated: GEODE-6219: Add assertion to verify the OS commands really ran (#3017)
This is an automated email from the ASF dual-hosted git repository.
khowe 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 7ae273f GEODE-6219: Add assertion to verify the OS commands really
ran (#3017)
7ae273f is described below
commit 7ae273f6de9e4104bddec4872e771ed1292e450e
Author: Kenneth Howe
AuthorDate: Thu Dec 20 11:00:41 2018 -0800
GEODE-6219: Add assertion to verify the OS commands really ran (#3017)
GEODE-6219: Verify netstat and lsof commands run; prevent
OutOfMemoryException failures
- Failure of netstat command on the test instance was not being detected.
Added assertions to verify the OS commands (netstat and lsof) really ran.
- Disable the test with lsof to the console. Creation of large String
objects containing the enitre output from "lsof" was caused OOME on small JVMs
on CI tests workers.
- Updated bug numbers on @Ignore'd tests
---
.../management/internal/cli/NetstatDUnitTest.java | 35 ++
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
index 3cdaf38..c0e1f99 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/NetstatDUnitTest.java
@@ -76,6 +76,9 @@ public class NetstatDUnitTest {
CommandResult result = gfsh.executeCommand("netstat");
assertThat(result.getStatus()).isEqualTo(Result.Status.OK);
+// verify that the OS commands executed
+assertThat(result.toString()).doesNotContain("Could not execute");
+
String rawOutput = result.getMessageFromContent();
String[] lines = rawOutput.split("\n");
@@ -89,6 +92,9 @@ public class NetstatDUnitTest {
CommandResult result = gfsh.executeCommand("netstat --member=server-1");
assertThat(result.getStatus()).isEqualTo(Result.Status.OK);
+// verify that the OS commands executed
+assertThat(result.toString()).doesNotContain("Could not execute");
+
String rawOutput = result.getMessageFromContent();
String[] lines = rawOutput.split("\n");
@@ -96,11 +102,15 @@ public class NetstatDUnitTest {
assertThat(lines[4].trim().split("[,\\s]+")).containsExactlyInAnyOrder("server-1");
}
+ @Ignore("GEODE-6228")
@Test
public void testOutputToConsoleWithLsofForOneMember() throws Exception {
CommandResult result = gfsh.executeCommand("netstat --member=server-1
--with-lsof");
assertThat(result.getStatus()).isEqualTo(Result.Status.OK);
+// verify that the OS commands executed
+assertThat(result.toString()).doesNotContain("Could not execute");
+
String rawOutput = result.getMessageFromContent();
String[] lines = rawOutput.split("\n");
@@ -122,6 +132,9 @@ public class NetstatDUnitTest {
lines.add(scanner.nextLine());
}
+// verify that the OS commands executed
+assertThat(lines.toString()).doesNotContain("Could not execute");
+
assertThat(lines.size()).isGreaterThan(5);
assertThat(lines.get(4).trim().split("[,\\s]+")).containsExactlyInAnyOrder("locator-0",
"server-1", "server-2");
@@ -141,6 +154,9 @@ public class NetstatDUnitTest {
lines.add(scanner.nextLine());
}
+// verify that the OS commands executed
+assertThat(lines.toString()).doesNotContain("Could not execute");
+
assertThat(lines.size()).isGreaterThan(5);
assertThat(lines.get(4).trim().split("[,\\s]+")).containsExactly("server-1");
}
@@ -159,30 +175,37 @@ public class NetstatDUnitTest {
lines.add(scanner.nextLine());
}
+// verify that the OS commands executed
+assertThat(lines.toString()).doesNotContain("Could not execute");
+
assertThat(lines.size()).isGreaterThan(5);
assertThat(lines.get(4).trim().split("[,\\s]+")).containsExactlyInAnyOrder("locator-0",
"server-1", "server-2");
assertThat(lines).filteredOn(e -> e.contains("## lsof output
##")).hasSize(1);
}
- @Ignore("GEODE-2488")
+ @Ignore("GEODE-6228")
@Test
public void testConnectToLocatorWithLargeCommandResponse() throws Exception {
gfsh.connect(server0.getEmbeddedLocatorPort(),
GfshCommandRule.PortType.locator);
-gfsh.executeAndAssertThat(netStatLsofCommand).statusIsSuccess();
+gfsh.executeAndAssertThat(netStatLsofCommand).statusIsSuccess()
+.doesNotContainOutput("Could not execute");
}
- @Ignore("GEODE-2488")
+ @Ignore("GEODE-6228")
@Test
public void testConnectToJmxManagerOneWithLargeCommandResponse() throws
Exception {
gfsh.connect(server0.getJmxPort(), GfshCommandRule.PortType.jmxManager);
-
[geode] 01/01: GEODE-6205: Set disk-dir in gfsh either absolute or relative based on input directory
This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-6205
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5f3f91e3cdad52e9674b6b7e92942afa2b4df08a
Author: Barry Oglesby
AuthorDate: Fri Dec 14 18:01:40 2018 -0800
GEODE-6205: Set disk-dir in gfsh either absolute or relative based on input
directory
---
.../cli/commands/DiskStoreCommandsDUnitTest.java | 79 +-
.../cli/commands/CreateDiskStoreCommand.java | 4 +-
2 files changed, 79 insertions(+), 4 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 7a2e855..69d1acf 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -15,9 +15,12 @@
package org.apache.geode.management.internal.cli.commands;
+import static org.apache.geode.internal.lang.SystemUtils.CURRENT_DIRECTORY;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -37,8 +40,11 @@ import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.DiskStore;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.DiskDirType;
+import org.apache.geode.cache.configuration.DiskDirsType;
import org.apache.geode.cache.configuration.DiskStoreType;
import org.apache.geode.distributed.Locator;
import
org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
@@ -56,7 +62,7 @@ import org.apache.geode.test.junit.rules.ServerStarterRule;
@Category(PersistenceTest.class)
@RunWith(JUnitParamsRunner.class)
-public class DiskStoreCommandsDUnitTest {
+public class DiskStoreCommandsDUnitTest implements Serializable {
private static final String GROUP = "GROUP1";
private static final String REGION_1 = "REGION1";
private static final String DISKSTORE = "DISKSTORE";
@@ -65,10 +71,10 @@ public class DiskStoreCommandsDUnitTest {
public ClusterStartupRule rule = new ClusterStartupRule();
@Rule
- public GfshCommandRule gfsh = new GfshCommandRule();
+ public transient GfshCommandRule gfsh = new GfshCommandRule();
@Rule
- public TemporaryFolder tempDir = new TemporaryFolder();
+ public transient TemporaryFolder tempDir = new TemporaryFolder();
private void createDiskStoreAndRegion(MemberVM jmxManager, int serverCount) {
gfsh.executeAndAssertThat(String.format(
@@ -461,4 +467,71 @@ public class DiskStoreCommandsDUnitTest {
.containsOutput("Could not find disk-dirs:");
assertThat(Files.exists(nonExistingDiskStorePath)).isFalse();
}
+
+ @Test
+ @Parameters(method = "getDiskDirNames")
+ public void validateDiskStoreDiskDirectoryPath(String diskDirectoryName)
+ throws Exception {
+// Start locator and server
+MemberVM locator = rule.startLocatorVM(0);
+MemberVM server = rule.startServerVM(1, locator.getPort());
+
+// Connect gfsh
+gfsh.connectAndVerify(locator);
+
+// Create a disk store with the input disk-dir name
+gfsh.executeAndAssertThat(
+String.format("create disk-store --name=%s --dir=%s", DISKSTORE,
diskDirectoryName))
+.statusIsSuccess();
+
+// Verify the server defines the disk store with the disk-dir path
+server.invoke(() -> {
+ verifyDiskStoreInServer(DISKSTORE, diskDirectoryName);
+});
+
+// Verify the cluster config stores the disk store with the input disk-dir
path
+locator.invoke(() -> {
+ verifyDiskStoreInClusterConfiguration(diskDirectoryName);
+});
+
+// Stop and start the server
+rule.stop(1);
+server = rule.startServerVM(2, locator.getPort());
+
+// Verify the server still defines the disk store with the disk-dir path
+server.invoke(() -> {
+ verifyDiskStoreInServer(DISKSTORE, diskDirectoryName);
+});
+ }
+
+ private String[] getDiskDirNames() throws IOException {
+tempDir.create();
+return new String[] {tempDir.newFolder(DISKSTORE).getAbsolutePath(),
DISKSTORE};
+ }
+
+ private void verifyDiskStoreInServer(String diskStoreName, String
diskDirectoryName) {
+DiskStore diskStore =
ClusterStartupRule.getCache().findDiskStore(diskStoreName);
+assertThat(diskStore).isNotNull();
+File[] diskDirs = diskStore.getDiskDirs();
+assertThat(diskDirs.length).isEqualTo(1);
+File diskDir = diskDirs[0];
+String
[geode] branch feature/GEODE-6205 created (now 5f3f91e)
This is an automated email from the ASF dual-hosted git repository. boglesby pushed a change to branch feature/GEODE-6205 in repository https://gitbox.apache.org/repos/asf/geode.git. at 5f3f91e GEODE-6205: Set disk-dir in gfsh either absolute or relative based on input directory This branch includes the following new commits: new 5f3f91e GEODE-6205: Set disk-dir in gfsh either absolute or relative based on input directory The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated (a8ef73c -> c588614)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from a8ef73c GEODE-6224: Do not use internal BOM to resolve versions. (#3022) add c12018f GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest add c588614 Merge pull request #3013 from apache/feature/GEODE-6143-9 No new revisions were added by this update. Summary of changes: .../cache/ha/HARegionQueueIntegrationTest.java | 88 +++--- .../internal/cache/ha/HARegionQueueJUnitTest.java | 2 +- .../cache/tier/sockets/CacheClientNotifier.java| 2 +- 3 files changed, 31 insertions(+), 61 deletions(-)
[geode] branch feature/GEODE-6143-9 deleted (was c12018f)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-6143-9 in repository https://gitbox.apache.org/repos/asf/geode.git. was c12018f GEODE-6143: remove PowerMock from HARegionQueueIntegrationTest GEODE-6143: remove PowerMock from HARegionQueueJUnitTest The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
