You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2019/05/30 20:23:57 UTC
[geode] branch develop updated: GEODE-4240: Use
ASSIGN_BUCKETS_PROPERTY in DeprecatedCacheServerLauncherIntegrationTest
(#3648)
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 b501843 GEODE-4240: Use ASSIGN_BUCKETS_PROPERTY in DeprecatedCacheServerLauncherIntegrationTest (#3648)
b501843 is described below
commit b50184366260d32008bff8fdaa58dc6e1a0e8470
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Thu May 30 13:23:33 2019 -0700
GEODE-4240: Use ASSIGN_BUCKETS_PROPERTY in DeprecatedCacheServerLauncherIntegrationTest (#3648)
Co-authored-by: Michael Oleske <mo...@pivotal.io>
---
.../cache/DeprecatedCacheServerLauncherIntegrationTest.java | 2 +-
.../java/org/apache/geode/internal/cache/CacheServerLauncher.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
index c40e330..d96dde1 100755
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/DeprecatedCacheServerLauncherIntegrationTest.java
@@ -226,7 +226,7 @@ public class DeprecatedCacheServerLauncherIntegrationTest {
execWithArgsAndValidate(Operation.START, "CacheServer pid: \\d+ status: running",
asList(
- "-J-D" + CacheServerLauncher.ASSIGN_BUCKETS + "=true",
+ "-J-D" + CacheServerLauncher.ASSIGN_BUCKETS_PROPERTY + "=true",
"cache-xml-file=" + cacheXmlFileName,
"log-file=" + logFileName,
"-classpath=" + getManifestJarFromClasspath(),
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
index 30dc640..38214e8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java
@@ -74,8 +74,10 @@ public class CacheServerLauncher {
public static boolean isDedicatedCacheServer =
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "isDedicatedServer");
- public static final boolean ASSIGN_BUCKETS = Boolean.getBoolean(
- DistributionConfig.GEMFIRE_PREFIX + "CacheServerLauncher.assignBucketsToPartitions");
+ public static final String ASSIGN_BUCKETS_PROPERTY =
+ DistributionConfig.GEMFIRE_PREFIX + "CacheServerLauncher.assignBucketsToPartitions";
+
+ public static final boolean ASSIGN_BUCKETS = Boolean.getBoolean(ASSIGN_BUCKETS_PROPERTY);
// default is to exit if property not defined
public static final boolean DONT_EXIT_AFTER_LAUNCH = Boolean