You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by db...@apache.org on 2016/12/01 01:07:49 UTC

[1/2] incubator-geode git commit: Docs: Remove / convert some mentions of GemFire - Cluster config tutorial and Managing a Remote Cluster

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 423e04f9d -> 592845991


Docs: Remove / convert some mentions of GemFire -  Cluster config tutorial and Managing a Remote Cluster


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4b0544c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4b0544c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4b0544c6

Branch: refs/heads/develop
Commit: 4b0544c61fe369c9c065cfe0a92d8908de274241
Parents: 890e6c7
Author: Dave Barnes <db...@pivotal.io>
Authored: Wed Nov 30 13:52:00 2016 -0800
Committer: Dave Barnes <db...@pivotal.io>
Committed: Wed Nov 30 16:42:41 2016 -0800

----------------------------------------------------------------------
 .../cluster_config/gfsh_remote.html.md.erb      |  10 +-
 .../persisting_configurations.html.md.erb       | 149 ++++++++++---------
 2 files changed, 81 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4b0544c6/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb b/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
index a1fab41..6adb6e7 100644
--- a/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
+++ b/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
@@ -21,10 +21,10 @@ limitations under the License.
 
 You can connect `gfsh` via HTTP or HTTPS to a remote cluster and manage the cluster using `gfsh` commands.
 
-To connect `gfsh` using the HTTP protocol to a remote GemFire cluster:
+To connect `gfsh` using the HTTP protocol to a remote cluster:
 
 1.  Launch `gfsh`. See [Starting gfsh](../../tools_modules/gfsh/starting_gfsh.html#concept_DB959734350B488BBFF91A120890FE61).
-2.  When starting the remote cluster on the remote host, you can optionally specify `--http-bind-address` and `--http-service-port` as GemFire properties when starting up your JMX manager (server or locator). These properties can be then used in the URL used when connecting from your local system to the HTTP service in the remote cluster. For example:
+2.  When starting the remote cluster on the remote host, you can optionally specify `--http-bind-address` and `--http-service-port` as Geode properties when starting up your JMX manager (server or locator). These properties can be then used in the URL used when connecting from your local system to the HTTP service in the remote cluster. For example:
 
     ``` pre
     gfsh>start server --name=server1 --J=-Dgemfire.jmx-manager=true \
@@ -32,14 +32,14 @@ To connect `gfsh` using the HTTP protocol to a remote GemFire cluster:
     --http-service-bind-address=myremotecluster.example.com
     ```
 
-    This command must be executed directly on the host machine that will ultimately act as the remote GemFire server that hosts the HTTP service for remote administration. (You cannot launch a GemFire server remotely.)
+    This command must be executed directly on the host machine that will ultimately act as the remote server that hosts the HTTP service for remote administration. (You cannot launch a server remotely.)
 
 3.  On your local system, run the `gfsh connect` command to connect to the remote system. Include the `--use-http` and `--url` parameters. For example:
 
     ``` pre
-    gfsh>connect --use-http=true --url="http://myremotecluster.example.com:8080/gemfire/v1"
+    gfsh>connect --use-http=true --url="http://myremotecluster.example.com:8080/geode/v1"
 
-    Successfully connected to: GemFire Manager's HTTP service @ http://myremotecluster.example.com:8080/gemfire/v1
+    Successfully connected to: Geode Manager's HTTP service @ http://myremotecluster.example.com:8080/geode/v1
     ```
 
     See [connect](../../tools_modules/gfsh/command-pages/connect.html).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4b0544c6/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
index d6aadbc..372ea5b 100644
--- a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
+++ b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
@@ -25,7 +25,7 @@ The `gfsh` command-line tool allows you to configure and start a Geode cluster.
 
 This section provides a walk-through example of configuring a simple Apache Geode cluster and then re-using that configuration in a new context.
 
-1.  Create a working directory (For example:`/home/username/my_gemfire`) and switch to the new directory. This directory will contain the configurations for your cluster.
+1.  Create a working directory (For example:`/home/username/my_geode`) and switch to the new directory. This directory will contain the configurations for your cluster.
 
 2.  Start the `gfsh` command-line tool. For example:
 
@@ -51,20 +51,20 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     ``` pre
     gfsh>start locator --name=locator1
-    Starting a GemFire Locator in /Users/username/my_gemfire/locator1...
+    Starting a Geode Locator in /Users/username/my_geode/locator1...
     .............................
-    Locator in /Users/username/my_gemfire/locator1 on 192.0.2.0[10334] as locator1 is currently online.
+    Locator in /Users/username/my_geode/locator1 on 192.0.2.0[10334] as locator1 is currently online.
     Process ID: 5203
     Uptime: 15 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/my_gemfire/locator1/locator1.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/my_geode/locator1/locator1.log
     JVM Arguments: -Dgemfire.enable-cluster-configuration=true
     -Dgemfire.load-cluster-configuration-from-dir=false
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/locator-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/locator-dependencies.jar
 
     Successfully connected to: [host=192.0.2.0, port=1099]
 
@@ -77,52 +77,52 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     ``` pre
     gfsh>start server --name=server1 --group=group1
-    Starting a GemFire Server in /Users/username/my_gemfire/server1...
+    Starting a Geode Server in /Users/username/my_geode/server1...
     .....
-    Server in /Users/username/my_gemfire/server1 on 192.0.2.0[40404] as server1 is currently online.
+    Server in /Users/username/my_geode/server1 on 192.0.2.0[40404] as server1 is currently online.
     Process ID: 5627
     Uptime: 2 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/my_gemfire/server1/server1.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/my_geode/server1/server1.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
 
     gfsh>start server --name=server2 --group=group1 --server-port=40405
-    Starting a GemFire Server in /Users/username/my_gemfire/server2...
+    Starting a Geode Server in /Users/username/my_geode/server2...
     .....
-    Server in /Users/username/my_gemfire/server2 on 192.0.2.0[40405] as server2 is currently online.
+    Server in /Users/username/my_geode/server2 on 192.0.2.0[40405] as server2 is currently online.
     Process ID: 5634
     Uptime: 2 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/my_gemfire/server2/server2.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/my_geode/server2/server2.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
 
     gfsh>start server --name=server3 --server-port=40406
-    Starting a GemFire Server in /Users/username/my_gemfire/server3...
+    Starting a Geode Server in /Users/username/my_geode/server3...
     .....
-    Server in /Users/username/my_gemfire/server3 on 192.0.2.0[40406] as server3 is currently online.
+    Server in /Users/username/my_geode/server3 on 192.0.2.0[40406] as server3 is currently online.
     Process ID: 5637
     Uptime: 2 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/my_gemfire/server3/server3.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/my_geode/server3/server3.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
     ```
 
     Note that the `gfsh` commands you used to start `server1` and `server2` specify a group named `group1` while the command for `server3` did not specify a group name.
@@ -146,26 +146,26 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     Note that `region1` is created on all cache servers that specified the group named `group1` when starting the cache server (`server1` and `server2`, in this example). `region2` is created on all members because no group was specified.
 
-6.  Deploy jar files. Use the `gfsh deploy` command to deploy application jar files to all members or to a specified group of members. The following example deploys the `mail.jar` and `mx4j.jar` files from the distribution. (Note: This is only an example, you do not need to deploy these files to use the Cluster Configuration Service. Alternately, you can use any two jar files for this demonstration.)
+6.  Deploy jar files. Use the `gfsh deploy` command to deploy application jar files to all members or to a specified group of members. The following example deploys the `mx4j-3.0.1.jar` and `mx4j.jar` files from the distribution. (Note: This is only an example, you do not need to deploy these files to use the Cluster Configuration Service. Alternately, you can use any two jar files for this demonstration.)
 
     ``` pre
-    gfsh>deploy --group=group1 --jar=${SYS_GEMFIRE_DIR}/lib/mail.jar
-    Post substitution: deploy --group=group1 --jar=/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/mail.jar
+    gfsh>deploy --group=group1 --jar=/lib/mail.jar
+    Post substitution: deploy --group=group1 --jar=/Users/username/Apache_Geode_1.0.0_Linux/lib/mx4j-3.0.1.jar
+    Member  |    Deployed JAR    | Deployed JAR Location
+    ------- | ------------------ | -------------------------------------------------------
+    server1 | mx4j-3.0.1.jar     | /Users/username/my_geode/server1/vf.gf#mx4j-3.0.1.jar#1
+    server2 | mx4j-3.0.1.jar     | /Users/username/my_geode/server2/vf.gf#mx4j-3.0.1.jar#1
+
+    gfsh>deploy --jar=/lib/mx4j.jar
+    Post substitution: deploy --jar=/Users/username/Apache_Geode_1.0.0_Linux/lib/ra.jar
     Member  | Deployed JAR | Deployed JAR Location
-    ------- | ------------ | -------------------------------------------------
-    server1 | mail.jar     | /Users/username/my_gemfire/server1/vf.gf#mail.jar#1
-    server2 | mail.jar     | /Users/username/my_gemfire/server2/vf.gf#mail.jar#1
-
-    gfsh>deploy --jar=${SYS_GEMFIRE_DIR}/lib/mx4j.jar
-    Post substitution: deploy --jar=/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/mx4j.jar
-    Member  | Deployed JAR | Deployed JAR Location
-    ------- | ------------ | -------------------------------------------------
-    server1 | mx4j.jar     | /Users/username/my_gemfire/server1/vf.gf#mx4j.jar#1
-    server2 | mx4j.jar     | /Users/username/my_gemfire/server2/vf.gf#mx4j.jar#1
-    server3 | mx4j.jar     | /Users/username/my_gemfire/server3/vf.gf#mx4j.jar#1
+    ------- | ------------ | -----------------------------------------------
+    server1 | ra.jar       | /Users/username/my_geode/server1/vf.gf#ra.jar#1
+    server2 | ra.jar       | /Users/username/my_geode/server1/vf.gf#ra.jar#1
+    server3 | ra.jar       | /Users/username/my_geode/server1/vf.gf#ra.jar#1
     ```
 
-    Note that the `mail.jar` file was deployed only to the members of `group1` and the `mx4j.jar` was deployed to all members.
+    Note that the `mx4j-3.0.1.jar` file was deployed only to the members of `group1` and the `ra.jar` was deployed to all members.
 
 7.  Export the cluster configuration.
     You can use the `gfsh export cluster-configuration` command to create a zip file that contains the cluster's persisted configuration. The zip file contains a copy of the contents of the `cluster_config` directory. For example:
@@ -202,7 +202,7 @@ This section provides a walk-through example of configuring a simple Apache Geod
     Exiting...
     ```
 
-10. Create a new working directory (for example: `new_gemfire`) and switch to the new directory.
+10. Create a new working directory (for example: `new_geode`) and switch to the new directory.
 11. Start the `gfsh` command shell:
 
     ``` pre
@@ -213,20 +213,20 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     ``` pre
     gfsh>start locator --name=locator2 --port=10335
-    Starting a GemFire Locator in /Users/username/new_gemfire/locator2...
+    Starting a Geode Locator in /Users/username/new_geode/locator2...
     .............................
-    Locator in /Users/username/new_gemfire/locator2 on 192.0.2.0[10335] as locator2 is currently online.
+    Locator in /Users/username/new_geode/locator2 on 192.0.2.0[10335] as locator2 is currently online.
     Process ID: 5749
     Uptime: 15 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/new_gemfire/locator2/locator2.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/new_geode/locator2/locator2.log
     JVM Arguments: -Dgemfire.enable-cluster-configuration=true
     -Dgemfire.load-cluster-configuration-from-dir=false
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/locator-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/locator-dependencies.jar
 
     Successfully connected to: [host=192.0.2.0, port=1099]
 
@@ -246,40 +246,40 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     ``` pre
     gfsh>start server --name=server4 --server-port=40414
-    Starting a GemFire Server in /Users/username/new_gemfire/server4...
+    Starting a Geode Server in /Users/username/new_geode/server4...
     ........
-    Server in /Users/username/new_gemfire/server4 on 192.0.2.0[40414] as server4 is currently online.
+    Server in /Users/username/new_geode/server4 on 192.0.2.0[40414] as server4 is currently online.
     Process ID: 5813
     Uptime: 4 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/new_gemfire/server4/server4.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/new_geode/server4/server4.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335]
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
     ```
 
 15. Start another server that references `group1`:
 
     ``` pre
     gfsh>start server --name=server5 --group=group1 --server-port=40415
-    Starting a GemFire Server in /Users/username/new_gemfire/server5...
+    Starting a Geode Server in /Users/username/new_geode/server5...
     .....
-    Server in /Users/username/new_gemfire/server2 on 192.0.2.0[40415] as server5 is currently online.
+    Server in /Users/username/new_geode/server2 on 192.0.2.0[40415] as server5 is currently online.
     Process ID: 5954
     Uptime: 2 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/new_gemfire/server5/server5.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/new_geode/server5/server5.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335] -Dgemfire.groups=group1
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
     ```
 
 16. Use the `list regions` command to display the configured regions. Note that region1 and region2, which were configured in the original cluster level are available.
@@ -303,10 +303,11 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     Non-Default Attributes Shared By Hosting Members
 
-     Type  | Name | Value
-    ------ | ---- | -----
-    Region | size | 0
-
+     Type  |    Name     | Value
+    ------ | ----------- | ---------------
+    Region | data-policy | REPLICATE
+           | size        | 0
+           | scope       | distributed-ack
 
     gfsh>describe region --name=region2
     ..........................................................
@@ -317,9 +318,11 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     Non-Default Attributes Shared By Hosting Members
 
-     Type  | Name | Value
-    ------ | ---- | -----
-    Region | size | 0
+     Type  |    Name     | Value
+    ------ | ----------- | ---------------
+    Region | data-policy | REPLICATE
+           | size        | 0
+           | scope       | distributed-ack
     ```
 
     This new cluster uses the same configuration as the original system. You can start any number of servers using this cluster configuration. All servers will receive the cluster-level configuration. Servers that specify `group1` also receive the `group1` configuration.


[2/2] incubator-geode git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop

Posted by db...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop

* 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode:
  GEODE-2157: Fixing sanctionedSerializables for PutAllPartialResultEx


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/59284599
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/59284599
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/59284599

Branch: refs/heads/develop
Commit: 5928459918617613dfaf39a03512630ed66aea95
Parents: 4b0544c 423e04f
Author: Dave Barnes <db...@pivotal.io>
Authored: Wed Nov 30 16:54:09 2016 -0800
Committer: Dave Barnes <db...@pivotal.io>
Committed: Wed Nov 30 16:54:09 2016 -0800

----------------------------------------------------------------------
 .../org/apache/geode/codeAnalysis/sanctionedSerializables.txt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------