Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 30516200BD4 for ; Fri, 2 Dec 2016 00:31:04 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2EDE8160B10; Thu, 1 Dec 2016 23:31:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2DBBE160B0B for ; Fri, 2 Dec 2016 00:31:03 +0100 (CET) Received: (qmail 66321 invoked by uid 500); 1 Dec 2016 23:31:02 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 66312 invoked by uid 99); 1 Dec 2016 23:31:02 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2016 23:31:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id E74D61AA1D8 for ; Thu, 1 Dec 2016 23:31:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id ul_Z3Spg8sXk for ; Thu, 1 Dec 2016 23:30:59 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 814415F47D for ; Thu, 1 Dec 2016 23:30:58 +0000 (UTC) Received: (qmail 65860 invoked by uid 99); 1 Dec 2016 23:30:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2016 23:30:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9E78BE69B1; Thu, 1 Dec 2016 23:30:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbarnes@apache.org To: commits@geode.incubator.apache.org Message-Id: <9cb31113f0b24918967e5da744279af0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: GEODE-2129: Docs - clarify need for unique distributed-system-id Date: Thu, 1 Dec 2016 23:30:57 +0000 (UTC) archived-at: Thu, 01 Dec 2016 23:31:04 -0000 Repository: incubator-geode Updated Branches: refs/heads/develop 1477c74de -> fdd616688 GEODE-2129: Docs - clarify need for unique distributed-system-id Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fdd61668 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fdd61668 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fdd61668 Branch: refs/heads/develop Commit: fdd6166889af780435cbae0923655fdfdff5d628 Parents: 1477c74 Author: Dave Barnes Authored: Thu Dec 1 15:28:13 2016 -0800 Committer: Dave Barnes Committed: Thu Dec 1 15:29:38 2016 -0800 ---------------------------------------------------------------------- geode-docs/configuring/chapter_overview.html.md.erb | 5 +++-- .../configuring/cluster_config/export-import.html.md.erb | 2 +- .../cluster_config/gfsh_config_troubleshooting.html.md.erb | 2 +- .../running/deploy_config_files_intro.html.md.erb | 6 ++++-- geode-docs/reference/topics/gemfire_properties.html.md.erb | 8 +++++++- 5 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/chapter_overview.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/configuring/chapter_overview.html.md.erb b/geode-docs/configuring/chapter_overview.html.md.erb index 295444c..f4a48e8 100644 --- a/geode-docs/configuring/chapter_overview.html.md.erb +++ b/geode-docs/configuring/chapter_overview.html.md.erb @@ -19,9 +19,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -You use the `gfsh` command-line utility to configure your Apache Geode cluster (also called a "distributed system"). The cluster configuration service persists the cluster configurations and distributes the configurations to members of the cluster. There are also several additional ways to configure a cluster. +Use the `gfsh` command-line utility to configure your Apache Geode cluster (also called a "distributed system"). The cluster configuration service persists the cluster configurations and distributes the configurations to members of the cluster. There are also several additional ways to configure a cluster. -You use `gfsh` to configure regions, disk stores, members, and other Geode objects. You also use `gfsh` to start and stop locators, servers, and Geode monitoring tools. As you execute these commands, the cluster configuration service persists the configuration. When new members join the cluster, the service distributes the configuration to the new members. +Use `gfsh` to configure regions, disk stores, members, and other Geode objects. +You can also use `gfsh` to start and stop locators, servers, and Geode monitoring tools. As you execute these commands, the cluster configuration service persists the configuration. When new members join the cluster, the service distributes the configuration to the new members. `gfsh` is the recommended means of configuring and managing your Apache Geode cluster, however you can still configure many aspects of a cluster using the older methods of the cache.xml and gemfire.properties files. See [cache.xml](../reference/topics/chapter_overview_cache_xml.html#cache_xml) and the [Reference](../reference/book_intro.html#reference) for configuration parameters. You can also configure some aspects of a cluster using a Java API. See [Managing Apache Geode](../managing/book_intro.html#managing_gemfire_intro). http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/cluster_config/export-import.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/configuring/cluster_config/export-import.html.md.erb b/geode-docs/configuring/cluster_config/export-import.html.md.erb index 5a89f51..32dab1e 100644 --- a/geode-docs/configuring/cluster_config/export-import.html.md.erb +++ b/geode-docs/configuring/cluster_config/export-import.html.md.erb @@ -25,7 +25,7 @@ The cluster configuration service saves the cluster configuration as you create ## Exporting a Cluster Configuration -You issue the `gfsh` `export cluster-configuration` command to save the configuration data for you cluster in a zip file. This zip file contains subdirectories for cluster-level configurations and a directory for each group specified in the cluster. The contents of these directories are described in [Cluster Configuration Files and Troubleshooting](gfsh_config_troubleshooting.html#concept_ylt_2cb_y4). +Issue the `gfsh` `export cluster-configuration` command to save the configuration data for your cluster in a zip file. This zip file contains subdirectories for cluster-level configurations and a directory for each group specified in the cluster. The contents of these directories are described in [Cluster Configuration Files and Troubleshooting](gfsh_config_troubleshooting.html#concept_ylt_2cb_y4). To export a cluster configuration, run the `gfsh` `export cluster-configuration` command while connected to a Geode cluster. For example: http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb index 638ff1d..99a4932 100644 --- a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb +++ b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb @@ -24,7 +24,7 @@ When you use the cluster configuration service in Geode, you can examine the gen The following directories and configuration files are available on the locator running the cluster configuration service: **Cluster-level configuration** -For configurations that apply to all members of a cluster, the locator creates a `cluster` subdirectory within the `cluster_config` directory (or in the cluster configuration directory when starting up the locator with the `--cluster-config-dir=value` parameter) specified All servers receive this configuration when they are started using `gfsh`. This directory contains: +For configurations that apply to all members of a cluster, the locator creates a `cluster` subdirectory within the `cluster_config` directory (or in the cluster configuration directory when starting up the locator with the `--cluster-config-dir=value` parameter) specified. All servers receive this configuration when they are started using `gfsh`. This directory contains: - `cluster.xml` -- A Geode `cache.xml` file containing configuration common to all members - `cluster.properties` -- a Geode ` gemfire.properties` file containing properties common to all members http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb b/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb index 6d52529..f44d60e 100644 --- a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb +++ b/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb @@ -27,8 +27,10 @@ These are the basic steps for deploying configuration files, with related detail ## Geode Configuration Files -- `gemfire.properties`. Contains the settings required by members of a distributed system. These settings include licensing, system member discovery, communication parameters, logging, and statistics. See the [Reference](../../reference/book_intro.html#reference). -- **`gfsecurity.properties`**. An optional separate file that contains security-related (`security-*`) settings that are otherwise defined in `gemfire.properties`. Placing these member properties into a separate file allows you to restrict user access to those specific settings. See the [Reference](../../reference/book_intro.html#reference). +- `gemfire.properties`. Contains the settings required by members of a distributed system. These settings include licensing, system member discovery, communication parameters, logging, and statistics. +See the [Geode Properties Reference](../../reference/topics/gemfire_properties.html). +- **`gfsecurity.properties`**. An optional separate file that contains security-related (`security-*`) settings that are otherwise defined in `gemfire.properties`. Placing these member properties into a separate file allows you to restrict user access to those specific settings. +See the [Geode Properties Reference](../../reference/topics/gemfire_properties.html). - `cache.xml`. Declarative cache configuration file. This file contains XML declarations for cache, region, and region entry configuration. You also use it to configure disk stores, database login credentials, server and remote site location information, and socket information. See [cache.xml](../../reference/topics/chapter_overview_cache_xml.html#cache_xml). http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/reference/topics/gemfire_properties.html.md.erb ---------------------------------------------------------------------- diff --git a/geode-docs/reference/topics/gemfire_properties.html.md.erb b/geode-docs/reference/topics/gemfire_properties.html.md.erb index f9455dd..80b4ee8 100644 --- a/geode-docs/reference/topics/gemfire_properties.html.md.erb +++ b/geode-docs/reference/topics/gemfire_properties.html.md.erb @@ -145,7 +145,13 @@ See Handling Forced distributed-system-id -Identifier used to distinguish messages from different distributed systems. Set this to different values for different systems in a multi-site (WAN) configuration. This is required for Portable Data eXchange (PDX) data serialization. This setting must be the same for every member in the same distributed system and unique to the distributed system within the WAN installation. -1 means no setting. Valid values are integers in the range -1...255. +Identifier used to distinguish messages from different distributed systems. +This is required for Portable Data eXchange (PDX) data serialization. +Set distributed-system-id to different values for different systems in a multi-site (WAN) configuration, and to different values for production vs. development environments. +This setting must be the same for every member of a given distributed system and unique to each distributed system within a WAN installation. +
Valid values are integers in the range -1...255. +-1 means no setting. + -1