You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/10/21 19:31:25 UTC

[1/2] incubator-geode git commit: GEODE-77: moving jgroups configuration files to the messenger package

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-77 8ff8ede79 -> 0c1008e65


GEODE-77: moving jgroups configuration files to the messenger package

I've also added a comment to the health monitor playDead code that
was puzzling to a reviewer


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

Branch: refs/heads/feature/GEODE-77
Commit: 481574db871086c30d08a942bcc147b1e059412f
Parents: 8ff8ede
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Oct 21 10:28:45 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Oct 21 10:28:45 2015 -0700

----------------------------------------------------------------------
 .../membership/gms/fd/GMSHealthMonitor.java     |   3 +
 .../gms/messenger/JGroupsMessenger.java         |   4 +-
 .../distributed/internal/javagroups-config.txt  | 101 -------------------
 .../distributed/internal/javagroups-mcast.txt   |  97 ------------------
 .../distributed/internal/jgroups-config.xml     |  56 ----------
 .../distributed/internal/jgroups-mcast.xml      |  82 ---------------
 .../membership/gms/messenger/jgroups-config.xml |  56 ++++++++++
 .../membership/gms/messenger/jgroups-mcast.xml  |  82 +++++++++++++++
 8 files changed, 143 insertions(+), 338 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/481574db/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 6f7cb6b..ed9f214 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -285,6 +285,9 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
    */
   private boolean doCheckMember(InternalDistributedMember pingMember) {
     if (playingDead) {
+      // a member playingDead should not be sending messages to other
+      // members, so we avoid sending heartbeat requests or suspect
+      // messages by returning true.
       return true;
     }
     //TODO: need to some tcp check

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/481574db/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index 2afc1f8..14dfd28 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -91,12 +91,12 @@ public class JGroupsMessenger implements Messenger {
   /**
    * The location (in the product) of the locator Jgroups config file.
    */
-  private static final String DEFAULT_JGROUPS_TCP_CONFIG = "com/gemstone/gemfire/distributed/internal/jgroups-config.xml";
+  private static final String DEFAULT_JGROUPS_TCP_CONFIG = "com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-config.xml";
 
   /**
    * The location (in the product) of the mcast Jgroups config file.
    */
-  private static final String DEFAULT_JGROUPS_MCAST_CONFIG = "com/gemstone/gemfire/distributed/internal/jgroups-mcast.xml";
+  private static final String DEFAULT_JGROUPS_MCAST_CONFIG = "com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-mcast.xml";
 
   /** JG magic numbers for types added to the JG ClassConfigurator */
   public static final short JGROUPS_TYPE_JGADDRESS = 2000;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/481574db/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/javagroups-config.txt
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/javagroups-config.txt b/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/javagroups-config.txt
deleted file mode 100644
index 392efdd..0000000
--- a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/javagroups-config.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-com.gemstone.org.jgroups.protocols.UDP(
-  ip_mcast=false;
-  discard_incompatible_packets=true;
-  enable_diagnostics=false;
-  ucast_recv_buf_size=UDP_RECV_BUFFER_SIZE;
-  ucast_send_buf_size=UDP_SEND_BUFFER_SIZE;
-  loopback=LOOPBACK;
-  tos=16;
-  max_bundle_size=MAX_BUNDLE_SIZE;
-  max_bundle_timeout=BUNDLING_TIMEOUT;
-  use_incoming_packet_handler=INCOMING_PACKET_HANDLER;
-  use_outgoing_packet_handler=OUTGOING_PACKET_HANDLER;
-  up_thread=false;
-  down_thread=false;
-  enable_bundling=ENABLE_BUNDLING;
-  membership_port_range_start=MEMBERSHIP_PORT_RANGE_START;
-  membership_port_range_end=MEMBERSHIP_PORT_RANGE_END)?
-com.gemstone.org.jgroups.protocols.TCPGOSSIP(
-  num_ping_requests=NUM_PING_REQUESTS;
-  timeout=DISCOVERY_TIMEOUT;
-  split-brain-detection=PARTITION_DETECTION;
-  gossip_refresh_rate=GOSSIP_REFRESH_RATE;
-  initial_hosts=INITIAL_HOSTS;
-  num_initial_members=NUM_INITIAL_MEMBERS;
-  gossip_server_wait_time=GOSSIP_SERVER_WAIT_TIME;
-  up_thread=false;
-  down_thread=false)?
-com.gemstone.org.jgroups.protocols.FD(
-  timeout=MEMBER_TIMEOUT;
-  max_tries=MAX_TRIES;
-  up_thread=false;
-  down_thread=false;
-  shun=false)?
-com.gemstone.org.jgroups.protocols.FD_SOCK(
-  num_tries=MAX_TRIES;
-  connect_timeout=CONNECT_TIMEOUT;
-  start_port=MEMBERSHIP_PORT_RANGE_START;
-  end_port=MEMBERSHIP_PORT_RANGE_END;
-  up_thread=false;
-  down_thread=false)?
-com.gemstone.org.jgroups.protocols.VERIFY_SUSPECT(
-  timeout=MEMBER_TIMEOUT;
-  up_thread=false;
-  down_thread=false)?
-DISCARD
-com.gemstone.org.jgroups.protocols.pbcast.NAKACK(
-  max_xmit_size=UDP_FRAGMENT_SIZE;
-  max_xmit_burst=RETRANSMIT_BURST_LIMIT;
-  use_mcast_xmit=false; gc_lag=10;
-  retransmit_timeout=400,800,1200,2400,4800;
-  down_thread=false; up_thread=false;
-  discard_delivered_msgs=true)?
-com.gemstone.org.jgroups.protocols.UNICAST(
-  timeout=400,800,1200,2400,4800;
-  max_xmit_burst=RETRANSMIT_BURST_LIMIT;
-  up_thread=false;
-  down_thread=false)?
-com.gemstone.org.jgroups.protocols.pbcast.STABLE(
-  stability_delay=1000; desired_avg_gossip=20000;
-  down_thread=false; up_thread=false;
-  max_bytes=0)?
-com.gemstone.org.jgroups.protocols.FRAG3(
-  frag_size=UDP_FRAGMENT_SIZE;
-  down_thread=false;
-  up_thread=false)?
-com.gemstone.org.jgroups.protocols.GemFireTimeSync(
-  clock_sync_interval=100;
-  reply_wait_interval=15;
-  down_thread=false;
-  up_thread=false)?
-com.gemstone.org.jgroups.protocols.AUTH(
-  down_thread=false;
-  up_thread=false)?
-com.gemstone.org.jgroups.protocols.VIEW_SYNC(
-  avg_send_interval=VIEW_SYNC_INTERVAL;
-  split-brain-detection=PARTITION_DETECTION;
-  down_thread=false;
-  up_thread=false)?
-com.gemstone.org.jgroups.protocols.pbcast.GMS(
-  member-weight=MEMBER_WEIGHT;
-  disable_initial_coord=DISABLE_COORD;
-  print_local_addr=false;
-  join_timeout=JOIN_TIMEOUT;
-  join_retry_timeout=2000;
-  leave_timeout=LEAVE_TIMEOUT;
-  view_ack_collection_timeout=ACK_COLLECTION_TIMEOUT;
-  up_thread=false;
-  down_thread=false;
-  split-brain-detection=PARTITION_DETECTION;
-  partition-threshold=PARTITION_THRESHOLD;
-  shun=true)?
-com.gemstone.org.jgroups.protocols.FC(
-  max_credits=FC_MAX_CREDITS;
-  down_thread=false;
-  up_thread=false;
-  min_threshold=FC_THRESHOLD;
-  max_block_time=FC_MAX_BLOCK)?
-com.gemstone.org.jgroups.protocols.FRAG2(
-  frag_size=UDP_FRAGMENT_SIZE;
-  down_thread=false;
-  up_thread=false)?

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/481574db/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/javagroups-mcast.txt
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/javagroups-mcast.txt b/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/javagroups-mcast.txt
deleted file mode 100644
index c0320cd..0000000
--- a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/javagroups-mcast.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-com.gemstone.org.jgroups.protocols.UDP(
-  discard_incompatible_packets=true;
-  enable_diagnostics=false;
-  tos=16;
-  mcast_port=MULTICAST_PORT;
-  mcast_addr=MULTICAST_HOST;
-  ucast_recv_buf_size=UDP_RECV_BUFFER_SIZE;
-  ucast_send_buf_size=UDP_SEND_BUFFER_SIZE;
-  mcast_recv_buf_size=MULTICAST_RECV_BUFFER_SIZE; 
-  mcast_send_buf_size=MULTICAST_SEND_BUFFER_SIZE; 
-  loopback=LOOPBACK;
-  use_incoming_packet_handler=INCOMING_PACKET_HANDLER;
-  use_outgoing_packet_handler=OUTGOING_PACKET_HANDLER;
-  ip_ttl=MULTICAST_TTL; 
-  down_thread=false; up_thread=false;
-  enable_bundling=ENABLE_BUNDLING;
-  max_bundle_size=MAX_BUNDLE_SIZE;
-  max_bundle_timeout=BUNDLING_TIMEOUT;
-  membership_port_range_start=MEMBERSHIP_PORT_RANGE_START;
-  membership_port_range_end=MEMBERSHIP_PORT_RANGE_END)?
-OPTIONAL_PING_PROTOCOL
-OPTIONAL_GOSSIP_PROTOCOL
-com.gemstone.org.jgroups.protocols.FD(
-  timeout=MEMBER_TIMEOUT;
-  max_tries=MAX_TRIES;
-  up_thread=false;
-  down_thread=false;
-  shun=false)?
-com.gemstone.org.jgroups.protocols.FD_SOCK(
-  num_tries=MAX_TRIES;
-  connect_timeout=CONNECT_TIMEOUT;
-  start_port=MEMBERSHIP_PORT_RANGE_START;
-  end_port=MEMBERSHIP_PORT_RANGE_END;
-  up_thread=false;
-  down_thread=false)?
-com.gemstone.org.jgroups.protocols.VERIFY_SUSPECT(
-  timeout=MEMBER_TIMEOUT;
-  up_thread=false;
-  down_thread=false)?
-DISCARD
-com.gemstone.org.jgroups.protocols.pbcast.NAKACK(
-  max_xmit_size=RETRANSMIT_LIMIT;
-  max_xmit_burst=RETRANSMIT_BURST_LIMIT;
-  use_mcast_xmit=false;
-  gc_lag=10;
-  retransmit_timeout=400,800,1200,2400,4800;
-  down_thread=false;
-  up_thread=false;
-  max_sent_msgs_size=MAX_SENT_MSGS_SIZE;
-  discard_delivered_msgs=true)?
-com.gemstone.org.jgroups.protocols.UNICAST(
-  timeout=400,800,1200,2400,4800;
-  max_xmit_burst=RETRANSMIT_BURST_LIMIT;
-  down_thread=false; up_thread=false)?
-com.gemstone.org.jgroups.protocols.pbcast.STABLE(
-  stability_delay=50;
-  desired_avg_gossip=2000; 
-  down_thread=false;
-  up_thread=false;
-  max_bytes=400000)?
-com.gemstone.org.jgroups.protocols.FRAG3(
-  frag_size=UDP_FRAGMENT_SIZE;
-  down_thread=false;
-  up_thread=false)?
-com.gemstone.org.jgroups.protocols.GemFireTimeSync(
-  clock_sync_interval=100;
-  reply_wait_interval=15;
-  down_thread=false;
-  up_thread=false)?
-com.gemstone.org.jgroups.protocols.VIEW_SYNC(
-  avg_send_interval=VIEW_SYNC_INTERVAL;
-  split-brain-detection=PARTITION_DETECTION;
-  down_thread=false;
-  up_thread=false)?
-com.gemstone.org.jgroups.protocols.pbcast.GMS(
-  member-weight=MEMBER_WEIGHT;
-  disable_initial_coord=DISABLE_COORD;
-  print_local_addr=false;
-  join_timeout=JOIN_TIMEOUT;
-  join_retry_timeout=2000;
-  leave_timeout=LEAVE_TIMEOUT;
-  view_ack_collection_timeout=ACK_COLLECTION_TIMEOUT;
-  up_thread=false;
-  down_thread=false;
-  split-brain-detection=PARTITION_DETECTION;
-  partition-threshold=PARTITION_THRESHOLD;
-  shun=true)?
-com.gemstone.org.jgroups.protocols.FC(
-  max_credits=FC_MAX_CREDITS;
-  down_thread=false;
-  up_thread=false;
-  min_threshold=FC_THRESHOLD;
-  max_block_time=FC_MAX_BLOCK)?
-com.gemstone.org.jgroups.protocols.FRAG2(
-   frag_size=UDP_FRAGMENT_SIZE;
-   down_thread=false;
-   up_thread=false)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/481574db/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/jgroups-config.xml
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/jgroups-config.xml b/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/jgroups-config.xml
deleted file mode 100755
index 8393d31..0000000
--- a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/jgroups-config.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<config xmlns="urn:org:jgroups"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd">
-<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.Transport
-  BIND_ADDR_SETTING
-  bind_port="MEMBERSHIP_PORT_RANGE_START"
-  port_range="MEMBERSHIP_PORT_RANGE_END"
-  mcast_port="0"
-  tos="16"
-  ip_mcast="false"
-  ignore_dont_bundle="false"
-  ucast_recv_buf_size="UDP_RECV_BUFFER_SIZE"
-  ucast_send_buf_size="UDP_SEND_BUFFER_SIZE"
-  thread_naming_pattern="UDP Message Handler"
-  enable_batching="false"
-  enable_diagnostics="false"
-  disable_loopback="false"
-  
-  timer_type="new3"
-  timer.min_threads="1"
-  timer.max_threads="4"
-  timer.keep_alive_time="3000"
-  timer.queue_max_size="500"
-
-  thread_pool.enabled="true"
-  thread_pool.min_threads="1"
-  thread_pool.max_threads="4"
-  thread_pool.keep_alive_time="5000"
-  thread_pool.queue_enabled="true"
-  thread_pool.queue_max_size="10000"
-  thread_pool.rejection_policy="discard"
-
-  oob_thread_pool.enabled="true"
-  oob_thread_pool.min_threads="1"
-  oob_thread_pool.max_threads="4"
-  oob_thread_pool.keep_alive_time="5000"
-  oob_thread_pool.queue_enabled="false"
-  oob_thread_pool.queue_max_size="100"
-  oob_thread_pool.rejection_policy="discard"
-  />
-<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.AddressManager/>
-<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.StatRecorder/>
-<UNICAST3
-  xmit_interval="500"
-  xmit_table_num_rows="100"
-  xmit_table_msgs_per_row="2000"
-  xmit_table_max_compaction_time="60000"
-  conn_expiry_timeout="0"
-  max_msg_batch_size="500"/>
-<UFC
-  max_credits="FC_MAX_CREDITS"
-  min_threshold="FC_THRESHOLD"
-  max_block_time="FC_MAX_BLOCK"/>
-<FRAG2
-  frag_size="UDP_FRAGMENT_SIZE"/>
-</config>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/481574db/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/jgroups-mcast.xml
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/jgroups-mcast.xml b/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/jgroups-mcast.xml
deleted file mode 100755
index c16fad3..0000000
--- a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/jgroups-mcast.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<config xmlns="urn:org:jgroups"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd">
-<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.Transport
-  BIND_ADDR_SETTING
-  bind_port="MEMBERSHIP_PORT_RANGE_START"
-  port_range="MEMBERSHIP_PORT_RANGE_END"
-
-  mcast_addr="MCAST_ADDRESS"
-  mcast_port="MCAST_PORT"
-  tos="16"
-  ip_mcast="true"
-  ip_ttl="MCAST_TTL"
-  
-  ucast_recv_buf_size="UDP_RECV_BUFFER_SIZE"
-  ucast_send_buf_size="UDP_SEND_BUFFER_SIZE"
-  mcast_recv_buf_size="MCAST_RECV_BUFFER_SIZE"
-  mcast_send_buf_size="MCAST_SEND_BUFFER_SIZE"
-
-  enable_batching="false"
-  ignore_dont_bundle="false"
-  max_bundle_timeout="30"
-  
-  thread_naming_pattern="UDP Message Handler"
-  enable_diagnostics="false"
-  disable_loopback="false"
-  
-  timer_type="new3"
-  timer.min_threads="1"
-  timer.max_threads="4"
-  timer.keep_alive_time="3000"
-  timer.queue_max_size="500"
-
-  thread_pool.enabled="true"
-  thread_pool.min_threads="1"
-  thread_pool.max_threads="4"
-  thread_pool.keep_alive_time="5000"
-  thread_pool.queue_enabled="true"
-  thread_pool.queue_max_size="10000"
-  thread_pool.rejection_policy="discard"
-
-  oob_thread_pool.enabled="true"
-  oob_thread_pool.min_threads="1"
-  oob_thread_pool.max_threads="4"
-  oob_thread_pool.keep_alive_time="5000"
-  oob_thread_pool.queue_enabled="false"
-  oob_thread_pool.queue_max_size="100"
-  oob_thread_pool.rejection_policy="discard"/>
-
-<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.AddressManager/>
-<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.StatRecorder/>
-
-<pbcast.NAKACK2
-  xmit_interval="MCAST_RETRANSMIT_INTERVAL"
-  xmit_table_num_rows="100"
-  xmit_table_msgs_per_row="2000"
-  xmit_table_max_compaction_time="30000"
-  max_msg_batch_size="500"
-  use_mcast_xmit="false"
-  discard_delivered_msgs="true"/>
-<UNICAST3
-  xmit_interval="500"
-  xmit_table_num_rows="100"
-  xmit_table_msgs_per_row="2000"
-  xmit_table_max_compaction_time="60000"
-  conn_expiry_timeout="0"
-  max_msg_batch_size="500"/>
-<pbcast.STABLE
-  stability_delay="50"
-  desired_avg_gossip="2000"
-  max_bytes="400000"/>
-<UFC
-  max_credits="FC_MAX_CREDITS"
-  min_threshold="FC_THRESHOLD"
-  max_block_time="FC_MAX_BLOCK"/>
-<MFC
-  max_credits="FC_MAX_CREDITS"
-  min_threshold="FC_THRESHOLD"
-  max_block_time="FC_MAX_BLOCK"/>
-<FRAG2
-  frag_size="UDP_FRAGMENT_SIZE"/>
-</config>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/481574db/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-config.xml
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-config.xml b/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-config.xml
new file mode 100755
index 0000000..8393d31
--- /dev/null
+++ b/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-config.xml
@@ -0,0 +1,56 @@
+<config xmlns="urn:org:jgroups"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd">
+<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.Transport
+  BIND_ADDR_SETTING
+  bind_port="MEMBERSHIP_PORT_RANGE_START"
+  port_range="MEMBERSHIP_PORT_RANGE_END"
+  mcast_port="0"
+  tos="16"
+  ip_mcast="false"
+  ignore_dont_bundle="false"
+  ucast_recv_buf_size="UDP_RECV_BUFFER_SIZE"
+  ucast_send_buf_size="UDP_SEND_BUFFER_SIZE"
+  thread_naming_pattern="UDP Message Handler"
+  enable_batching="false"
+  enable_diagnostics="false"
+  disable_loopback="false"
+  
+  timer_type="new3"
+  timer.min_threads="1"
+  timer.max_threads="4"
+  timer.keep_alive_time="3000"
+  timer.queue_max_size="500"
+
+  thread_pool.enabled="true"
+  thread_pool.min_threads="1"
+  thread_pool.max_threads="4"
+  thread_pool.keep_alive_time="5000"
+  thread_pool.queue_enabled="true"
+  thread_pool.queue_max_size="10000"
+  thread_pool.rejection_policy="discard"
+
+  oob_thread_pool.enabled="true"
+  oob_thread_pool.min_threads="1"
+  oob_thread_pool.max_threads="4"
+  oob_thread_pool.keep_alive_time="5000"
+  oob_thread_pool.queue_enabled="false"
+  oob_thread_pool.queue_max_size="100"
+  oob_thread_pool.rejection_policy="discard"
+  />
+<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.AddressManager/>
+<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.StatRecorder/>
+<UNICAST3
+  xmit_interval="500"
+  xmit_table_num_rows="100"
+  xmit_table_msgs_per_row="2000"
+  xmit_table_max_compaction_time="60000"
+  conn_expiry_timeout="0"
+  max_msg_batch_size="500"/>
+<UFC
+  max_credits="FC_MAX_CREDITS"
+  min_threshold="FC_THRESHOLD"
+  max_block_time="FC_MAX_BLOCK"/>
+<FRAG2
+  frag_size="UDP_FRAGMENT_SIZE"/>
+</config>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/481574db/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-mcast.xml
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-mcast.xml b/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-mcast.xml
new file mode 100755
index 0000000..c16fad3
--- /dev/null
+++ b/gemfire-core/src/main/resources/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/jgroups-mcast.xml
@@ -0,0 +1,82 @@
+<config xmlns="urn:org:jgroups"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd">
+<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.Transport
+  BIND_ADDR_SETTING
+  bind_port="MEMBERSHIP_PORT_RANGE_START"
+  port_range="MEMBERSHIP_PORT_RANGE_END"
+
+  mcast_addr="MCAST_ADDRESS"
+  mcast_port="MCAST_PORT"
+  tos="16"
+  ip_mcast="true"
+  ip_ttl="MCAST_TTL"
+  
+  ucast_recv_buf_size="UDP_RECV_BUFFER_SIZE"
+  ucast_send_buf_size="UDP_SEND_BUFFER_SIZE"
+  mcast_recv_buf_size="MCAST_RECV_BUFFER_SIZE"
+  mcast_send_buf_size="MCAST_SEND_BUFFER_SIZE"
+
+  enable_batching="false"
+  ignore_dont_bundle="false"
+  max_bundle_timeout="30"
+  
+  thread_naming_pattern="UDP Message Handler"
+  enable_diagnostics="false"
+  disable_loopback="false"
+  
+  timer_type="new3"
+  timer.min_threads="1"
+  timer.max_threads="4"
+  timer.keep_alive_time="3000"
+  timer.queue_max_size="500"
+
+  thread_pool.enabled="true"
+  thread_pool.min_threads="1"
+  thread_pool.max_threads="4"
+  thread_pool.keep_alive_time="5000"
+  thread_pool.queue_enabled="true"
+  thread_pool.queue_max_size="10000"
+  thread_pool.rejection_policy="discard"
+
+  oob_thread_pool.enabled="true"
+  oob_thread_pool.min_threads="1"
+  oob_thread_pool.max_threads="4"
+  oob_thread_pool.keep_alive_time="5000"
+  oob_thread_pool.queue_enabled="false"
+  oob_thread_pool.queue_max_size="100"
+  oob_thread_pool.rejection_policy="discard"/>
+
+<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.AddressManager/>
+<com.gemstone.gemfire.distributed.internal.membership.gms.messenger.StatRecorder/>
+
+<pbcast.NAKACK2
+  xmit_interval="MCAST_RETRANSMIT_INTERVAL"
+  xmit_table_num_rows="100"
+  xmit_table_msgs_per_row="2000"
+  xmit_table_max_compaction_time="30000"
+  max_msg_batch_size="500"
+  use_mcast_xmit="false"
+  discard_delivered_msgs="true"/>
+<UNICAST3
+  xmit_interval="500"
+  xmit_table_num_rows="100"
+  xmit_table_msgs_per_row="2000"
+  xmit_table_max_compaction_time="60000"
+  conn_expiry_timeout="0"
+  max_msg_batch_size="500"/>
+<pbcast.STABLE
+  stability_delay="50"
+  desired_avg_gossip="2000"
+  max_bytes="400000"/>
+<UFC
+  max_credits="FC_MAX_CREDITS"
+  min_threshold="FC_THRESHOLD"
+  max_block_time="FC_MAX_BLOCK"/>
+<MFC
+  max_credits="FC_MAX_CREDITS"
+  min_threshold="FC_THRESHOLD"
+  max_block_time="FC_MAX_BLOCK"/>
+<FRAG2
+  frag_size="UDP_FRAGMENT_SIZE"/>
+</config>
\ No newline at end of file


[2/2] incubator-geode git commit: GEODE-77: installing initial view

Posted by bs...@apache.org.
GEODE-77: installing initial view

The membership manager was not installing the initial view into the
DistributionManager.  This was causing its waitForViewInstallation method
to hang if the view in question was the member's initial view


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

Branch: refs/heads/feature/GEODE-77
Commit: 0c1008e659700b2515994cfc91cae72ba1857f06
Parents: 481574d
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Oct 21 10:31:03 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Oct 21 10:31:03 2015 -0700

----------------------------------------------------------------------
 .../internal/membership/gms/mgr/GMSMembershipManager.java        | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0c1008e6/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index a102ac2..204cc0b 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -799,6 +799,10 @@ public class GMSMembershipManager implements MembershipManager, Manager
         logger.info(LogMarker.DISTRIBUTION, LocalizedMessage.create(
             LocalizedStrings.GroupMembershipService_CONNECTED_TO_JGROUPS_CHANNEL_TOOK__0__MS, delta));
 
+        NetView initialView = services.getJoinLeave().getView();
+        latestView = new NetView(initialView, initialView.getViewId());
+        listener.viewInstalled(latestView);
+        
       } catch (RuntimeException ex) {
         throw ex;
       }