You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2018/04/11 20:03:45 UTC
[geode] branch develop updated: GEODE-3237: Loading cluster configuration from a dir that does not ha… (#1746)
This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda 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 8ca39e9 GEODE-3237: Loading cluster configuration from a dir that does not ha… (#1746)
8ca39e9 is described below
commit 8ca39e93f2d4ef6503e3b52a68fb193bc5c3e6ac
Author: Sai Boorlagadda <sa...@gmail.com>
AuthorDate: Wed Apr 11 13:03:41 2018 -0700
GEODE-3237: Loading cluster configuration from a dir that does not ha… (#1746)
command option --load-cluster-config-from-dir is deprecated and a warning
is added to the gfsh command output in case if its used.
---
.../geode/management/internal/cli/commands/StartLocatorCommand.java | 6 ++++++
.../org/apache/geode/management/internal/cli/i18n/CliStrings.java | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java
index 4d348bc..edbab1a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java
@@ -268,6 +268,12 @@ public class StartLocatorCommand extends InternalGfshCommand {
InfoResultData infoResultData = ResultBuilder.createInfoResultData();
+ if (loadSharedConfigurationFromDirectory) {
+ infoResultData.addLine("Warning: Option --load-cluster-config-from-dir is deprecated, use '"
+ + CliStrings.IMPORT_SHARED_CONFIG
+ + "' command instead to import any existing configuration.\n");
+ }
+
if (asyncStart) {
infoResultData.addLine(
String.format(CliStrings.ASYNC_PROCESS_LAUNCH_MESSAGE, CliStrings.LOCATOR_TERM_NAME));
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
index e7237d4..29195f5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
@@ -2410,7 +2410,8 @@ public class CliStrings {
public static final String START_LOCATOR__LOAD__SHARED_CONFIGURATION__FROM__FILESYSTEM =
"load-cluster-configuration-from-dir";
public static final String START_LOCATOR__LOAD__SHARED_CONFIGURATION__FROM__FILESYSTEM__HELP =
- "When \" " + START_LOCATOR__LOAD__SHARED_CONFIGURATION__FROM__FILESYSTEM
+ "Deprecated: Since Geode 1.6, use import cluster-configuration command instead. When \" "
+ + START_LOCATOR__LOAD__SHARED_CONFIGURATION__FROM__FILESYSTEM
+ " \" is set to true, the locator loads the cluster configuration from the \""
+ InternalClusterConfigurationService.CLUSTER_CONFIG_ARTIFACTS_DIR_NAME + "\" directory.";
public static final String START_LOCATOR__CLUSTER__CONFIG__DIR = "cluster-config-dir";
--
To stop receiving notification emails like this one, please contact
sai_boorlagadda@apache.org.