You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/10/19 01:27:34 UTC
[1/3] [HELIX-270] Refactor website to have release-specific pages,
disable link to 0.6.1 page for now
Updated Branches:
refs/heads/master 427cc97f5 -> 80abba325
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_rebalance.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_rebalance.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_rebalance.md
new file mode 100644
index 0000000..1f5930d
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_rebalance.md
@@ -0,0 +1,168 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Rebalancing Algorithms
+
+The placement of partitions in a distributed system is essential for the reliability and scalability of the system. For example, when a node fails, it is important that the partitions hosted on that node are reallocated evenly among the remaining nodes. Consistent hashing is one such algorithm that can satisfy this guarantee. Helix provides a variant of consistent hashing based on the RUSH algorithm.
+
+This means given a number of partitions, replicas and number of nodes, Helix does the automatic assignment of partition to nodes such that:
+
+* Each node has the same number of partitions
+* Replicas of the same partition do not stay on the same node
+* When a node fails, the partitions will be equally distributed among the remaining nodes
+* When new nodes are added, the number of partitions moved will be minimized along with satisfying the above criteria
+
+Helix employs a rebalancing algorithm to compute the _ideal state_ of the system. When the _current state_ differs from the _ideal state_, Helix uses it as the target state of the system and computes the appropriate transitions needed to bring it to the _ideal state_.
+
+Helix makes it easy to perform this operation, while giving you control over the algorithm. In this section, we\'ll see how to implement the desired behavior.
+
+Helix has three options for rebalancing, in increasing order of customization by the system builder:
+
+* AUTO_REBALANCE
+* AUTO
+* CUSTOM
+
+```
+ |AUTO REBALANCE| AUTO | CUSTOM |
+ -----------------------------------------
+ LOCATION | HELIX | APP | APP |
+ -----------------------------------------
+ STATE | HELIX | HELIX | APP |
+ -----------------------------------------
+```
+
+
+### AUTO_REBALANCE
+
+When the idealstate mode is set to AUTO_REBALANCE, Helix controls both the location of the replica along with the state. This option is useful for applications where creation of a replica is not expensive.
+
+For example, consider this system that uses a MasterSlave state model, with 3 partitions and 2 replicas in the ideal state.
+
+```
+{
+ "id" : "MyResource",
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "AUTO_REBALANCE",
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ }
+ "listFields" : {
+ "MyResource_0" : [],
+ "MyResource_1" : [],
+ "MyResource_2" : []
+ },
+ "mapFields" : {
+ }
+}
+```
+
+If there are 3 nodes in the cluster, then Helix will balance the masters and slaves equally. The ideal state is therefore:
+
+```
+{
+ "id" : "MyResource",
+ "simpleFields" : {
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ },
+ "mapFields" : {
+ "MyResource_0" : {
+ "N1" : "MASTER",
+ "N2" : "SLAVE",
+ },
+ "MyResource_1" : {
+ "N2" : "MASTER",
+ "N3" : "SLAVE",
+ },
+ "MyResource_2" : {
+ "N3" : "MASTER",
+ "N1" : "SLAVE",
+ }
+ }
+}
+```
+
+Another typical example is evenly distributing a group of tasks among the currently healthy processes. For example, if there are 60 tasks and 4 nodes, Helix assigns 15 tasks to each node.
+When one node fails, Helix redistributes its 15 tasks to the remaining 3 nodes, resulting in a balanced 20 tasks per node. Similarly, if a node is added, Helix re-allocates 3 tasks from each of the 4 nodes to the 5th node, resulting in a balanced distribution of 12 tasks per node..
+
+#### AUTO
+
+When the application needs to control the placement of the replicas, use the AUTO idealstate mode.
+
+Example: In the ideal state below, the partition \'MyResource_0\' is constrained to be placed only on node1 or node2. The choice of _state_ is still controlled by Helix. That means MyResource_0.MASTER could be on node1 and MyResource_0.SLAVE on node2, or vice-versa but neither would be placed on node3.
+
+```
+{
+ "id" : "MyResource",
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "AUTO",
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ }
+ "listFields" : {
+ "MyResource_0" : [node1, node2],
+ "MyResource_1" : [node2, node3],
+ "MyResource_2" : [node3, node1]
+ },
+ "mapFields" : {
+ }
+}
+```
+
+The MasterSlave state model requires that a partition has exactly one MASTER at all times, and the other replicas should be SLAVEs. In this simple example with 2 replicas per partition, there would be one MASTER and one SLAVE. Upon failover, a SLAVE has to assume mastership, and a new SLAVE will be generated.
+
+In this mode when node1 fails, unlike in AUTO-REBALANCE mode the partition is _not_ moved from node1 to node3. Instead, Helix will decide to change the state of MyResource_0 on node2 from SLAVE to MASTER, based on the system constraints.
+
+#### CUSTOM
+
+Finally, Helix offers a third mode called CUSTOM, in which the application controls the placement _and_ state of each replica. The application needs to implement a callback interface that Helix invokes when the cluster state changes.
+Within this callback, the application can recompute the idealstate. Helix will then issue appropriate transitions such that _Idealstate_ and _Currentstate_ converges.
+
+Here\'s an example, again with 3 partitions, 2 replicas per partition, and the MasterSlave state model:
+
+```
+{
+ "id" : "MyResource",
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "CUSTOM",
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ },
+ "mapFields" : {
+ "MyResource_0" : {
+ "N1" : "MASTER",
+ "N2" : "SLAVE",
+ },
+ "MyResource_1" : {
+ "N2" : "MASTER",
+ "N3" : "SLAVE",
+ },
+ "MyResource_2" : {
+ "N3" : "MASTER",
+ "N1" : "SLAVE",
+ }
+ }
+}
+```
+
+Suppose the current state of the system is 'MyResource_0' -> {N1:MASTER, N2:SLAVE} and the application changes the ideal state to 'MyResource_0' -> {N1:SLAVE,N2:MASTER}. While the application decides which node is MASTER and which is SLAVE, Helix will not blindly issue MASTER-->SLAVE to N1 and SLAVE-->MASTER to N2 in parallel, since that might result in a transient state where both N1 and N2 are masters, which violates the MasterSlave constraint that there is exactly one MASTER at a time. Helix will first issue MASTER-->SLAVE to N1 and after it is completed, it will issue SLAVE-->MASTER to N2.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md
new file mode 100644
index 0000000..a5b9a0e
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_spectator.md
@@ -0,0 +1,72 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Spectator
+
+Next, we\'ll learn how to implement a SPECTATOR. Typically, a spectator needs to react to changes within the distributed system. Examples: a client that needs to know where to send a request, a topic consumer in a consumer group. The spectator is automatically informed of changes in the _external state_ of the cluster, but it does not have to add any code to keep track of other components in the system.
+
+### Start the Helix agent
+
+Same as for a PARTICIPANT, The Helix agent is the common component that connects each system component with the controller.
+
+It requires the following parameters:
+
+* clusterName: A logical name to represent the group of nodes
+* instanceName: A logical name of the process creating the manager instance. Generally this is host:port.
+* instanceType: Type of the process. This can be one of the following types, in this case, use SPECTATOR:
+ * CONTROLLER: Process that controls the cluster, any number of controllers can be started but only one will be active at any given time.
+ * PARTICIPANT: Process that performs the actual task in the distributed system.
+ * SPECTATOR: Process that observes the changes in the cluster.
+ * ADMIN: To carry out system admin actions.
+* zkConnectString: Connection string to Zookeeper. This is of the form host1:port1,host2:port2,host3:port3.
+
+After the Helix manager instance is created, only thing that needs to be registered is the listener. When the ExternalView changes, the listener is notified.
+
+### Spectator Code
+
+A spectator observes the cluster and is notified when the state of the system changes. Helix consolidates the state of entire cluster in one Znode called ExternalView.
+Helix provides a default implementation RoutingTableProvider that caches the cluster state and updates it when there is a change in the cluster.
+
+```
+manager = HelixManagerFactory.getZKHelixManager(clusterName,
+ instanceName,
+ InstanceType.PARTICIPANT,
+ zkConnectString);
+manager.connect();
+RoutingTableProvider routingTableProvider = new RoutingTableProvider();
+manager.addExternalViewChangeListener(routingTableProvider);
+```
+
+In the following code snippet, the application sends the request to a valid instance by interrogating the external view. Suppose the desired resource for this request is in the partition myDB_1.
+
+```
+## instances = routingTableProvider.getInstances(, "PARTITION_NAME", "PARTITION_STATE");
+instances = routingTableProvider.getInstances("myDB", "myDB_1", "ONLINE");
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+// Application-specific code to send a request to one of the instances //
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+theInstance = instances.get(0); // should choose an instance and throw an exception if none are available
+result = theInstance.sendRequest(yourApplicationRequest, responseObject);
+
+```
+
+When the external view changes, the application needs to react by sending requests to a different instance.
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md
new file mode 100644
index 0000000..cb51be9
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_state.md
@@ -0,0 +1,60 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: State Machine Configuration
+
+In this chapter, we\'ll learn about the state models provided by Helix, and how to create your own custom state model.
+
+## State Models
+
+Helix comes with 3 default state models that are commonly used. It is possible to have multiple state models in a cluster.
+Every resource that is added should be configured to use a state model that govern its _ideal state_.
+
+### MASTER-SLAVE
+
+* Has 3 states: OFFLINE, SLAVE, MASTER
+* Maximum # of masters: 1
+* Slaves are based on the replication factor. Replication factor can be specified while adding the resource
+
+
+### ONLINE-OFFLINE
+* Has 2 states: OFFLINE and ONLINE. This simple state model is a good starting point for most applications.
+
+### LEADER-STANDBY
+* 1 Leader and multiple stand-bys. The idea is that exactly one leader accomplishes a designated task, the stand-bys are ready to take over if the leader fails.
+
+## Constraints
+
+In addition to the state machine configuration, one can specify the constraints of states and transitions.
+
+For example, one can say:
+* MASTER:1
+ Maximum number of replicas in MASTER state at any time is 1
+
+* OFFLINE-SLAVE:5
+Maximum number of OFFLINE-SLAVE transitions that can happen concurrently in the system is 5 in this example.
+
+### State Priority
+
+Helix uses a greedy approach to satisfy the state constraints. For example, if the state machine configuration says it needs 1 MASTER and 2 SLAVES, but only 1 node is active, Helix must promote it to MASTER. This behavior is achieved by providing the state priority list as MASTER,SLAVE.
+
+### State Transition Priority
+
+Helix tries to fire as many transitions as possible in parallel to reach the stable state without violating constraints. By default, Helix simply sorts the transitions alphabetically and fires as many as it can without violating the constraints. You can control this by overriding the priority order.
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md
new file mode 100644
index 0000000..5002156
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_throttling.md
@@ -0,0 +1,34 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Throttling
+
+In this chapter, we\'ll learn how to control the parallel execution of cluster tasks. Only a centralized cluster manager with global knowledge is capable of coordinating this decision.
+
+### Throttling
+
+Since all state changes in the system are triggered through transitions, Helix can control the number of transitions that can happen in parallel. Some of the transitions may be light weight, but some might involve moving data, which is quite expensive from a network and iops perspective.
+
+Helix allows applications to set a threshold on transitions. The threshold can be set at multiple scopes:
+
+* MessageType e.g STATE_TRANSITION
+* TransitionType e.g SLAVE-MASTER
+* Resource e.g database
+* Node i.e per-node maximum transitions in parallel
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/.htaccess
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/.htaccess b/site-releases/0.6.1-incubating/src/site/resources/.htaccess
new file mode 100644
index 0000000..d5c7bf3
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/resources/.htaccess
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+Redirect /download.html /download.cgi
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/download.cgi
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/download.cgi b/site-releases/0.6.1-incubating/src/site/resources/download.cgi
new file mode 100644
index 0000000..f9a0e30
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/resources/download.cgi
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Just call the standard mirrors.cgi script. It will use download.html
+# as the input template.
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $*
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/HELIX-components.png
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/HELIX-components.png b/site-releases/0.6.1-incubating/src/site/resources/images/HELIX-components.png
new file mode 100644
index 0000000..c0c35ae
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/HELIX-components.png differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/PFS-Generic.png
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/PFS-Generic.png b/site-releases/0.6.1-incubating/src/site/resources/images/PFS-Generic.png
new file mode 100644
index 0000000..7eea3a0
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/PFS-Generic.png differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/RSYNC_BASED_PFS.png
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/RSYNC_BASED_PFS.png b/site-releases/0.6.1-incubating/src/site/resources/images/RSYNC_BASED_PFS.png
new file mode 100644
index 0000000..0cc55ae
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/RSYNC_BASED_PFS.png differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/bootstrap_statemodel.gif
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/bootstrap_statemodel.gif b/site-releases/0.6.1-incubating/src/site/resources/images/bootstrap_statemodel.gif
new file mode 100644
index 0000000..b8f8a42
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/bootstrap_statemodel.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/helix-architecture.png
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/helix-architecture.png b/site-releases/0.6.1-incubating/src/site/resources/images/helix-architecture.png
new file mode 100644
index 0000000..6f69a2d
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/helix-architecture.png differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/helix-logo.jpg
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/helix-logo.jpg b/site-releases/0.6.1-incubating/src/site/resources/images/helix-logo.jpg
new file mode 100644
index 0000000..d6428f6
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/helix-logo.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/helix-znode-layout.png
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/helix-znode-layout.png b/site-releases/0.6.1-incubating/src/site/resources/images/helix-znode-layout.png
new file mode 100644
index 0000000..5bafc45
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/helix-znode-layout.png differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/statemachine.png
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/statemachine.png b/site-releases/0.6.1-incubating/src/site/resources/images/statemachine.png
new file mode 100644
index 0000000..43d27ec
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/statemachine.png differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/resources/images/system.png
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/resources/images/system.png b/site-releases/0.6.1-incubating/src/site/resources/images/system.png
new file mode 100644
index 0000000..f8a05c8
Binary files /dev/null and b/site-releases/0.6.1-incubating/src/site/resources/images/system.png differ
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/site.xml
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/site.xml b/site-releases/0.6.1-incubating/src/site/site.xml
new file mode 100644
index 0000000..5ab7f87
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/site.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project name="Apache Helix 0.6.1-incubating">
+ <bannerLeft>
+ <src>images/helix-logo.jpg</src>
+ <href>http://helix.incubator.apache.org/site-releases/0.6.1-incubating-site</href>
+ </bannerLeft>
+ <bannerRight>
+ <src>http://incubator.apache.org/images/egg-logo.png</src>
+ <href>http://incubator.apache.org/</href>
+ </bannerRight>
+ <version position="none"/>
+
+ <publishDate position="right"/>
+
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.3.0</version>
+ </skin>
+
+ <body>
+
+ <head>
+ <script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-3211522-12']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+ </script>
+
+ </head>
+
+ <breadcrumbs position="left">
+ <item name="Apache Helix" href="http://helix.incubator.apache.org/"/>
+ <item name="Release 0.6.1-incubating" href="http://helix.incubator.apache.org/site-releases/0.6.1-incubating-site/"/>
+ </breadcrumbs>
+
+ <menu name="Helix 0.6.1-incubating">
+ <item name="Home" href="../../index.html"/>
+ <item name="Introduction" href="./index.html"/>
+ <item name="Core concepts" href="./Concepts.html"/>
+ <item name="Architecture" href="./Architecture.html"/>
+ <item name="Quick Start" href="./Quickstart.html"/>
+ <item name="Tutorial" href="./Tutorial.html"/>
+ <item name="Download" href="./download.html"/>
+ </menu>
+
+ <menu name="Recipes">
+ <item name="Distributed lock manager" href="./recipes/lock_manager.html"/>
+ <item name="Rabbit MQ consumer group" href="./recipes/rabbitmq_consumer_group.html"/>
+ <item name="Rsync replicated file store" href="./recipes/rsync_replicated_file_store.html"/>
+ <item name="Service Discovery" href="./recipes/service_discovery.html"/>
+ <item name="Distributed task DAG Execution" href="./recipes/task_dag_execution.html"/>
+ </menu>
+<!--
+ <menu ref="reports" inherit="bottom"/>
+ <menu ref="modules" inherit="bottom"/>
+
+
+ <menu name="ASF">
+ <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works.html"/>
+ <item name="Foundation" href="http://www.apache.org/foundation/"/>
+ <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship.html"/>
+ <item name="Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+ </menu>
+-->
+ <footer>
+ <div class="row span16"><div>Apache Helix, Apache, the Apache feather logo, and the Apache Helix project logos are trademarks of The Apache Software Foundation.
+ All other marks mentioned may be trademarks or registered trademarks of their respective owners.</div>
+ <a href="${project.url}/privacy-policy.html">Privacy Policy</a>
+ </div>
+ </footer>
+
+
+ </body>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>true</topBarEnabled>
+ <!-- twitter link work only with sidebar disabled -->
+ <sideBarEnabled>false</sideBarEnabled>
+ <googleSearch></googleSearch>
+ <twitter>
+ <user>ApacheHelix</user>
+ <showUser>true</showUser>
+ <showFollowers>false</showFollowers>
+ </twitter>
+ </fluidoSkin>
+ </custom>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm b/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm
new file mode 100644
index 0000000..dabe9ec
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/xdoc/download.xml.vm
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+
+-->
+#set( $releaseName = "0.6.1-incubating" )
+#set( $releaseDate = "05/29/2013" )
+<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+
+ <properties>
+ <title>Apache Incubator Helix Downloads</title>
+ <author email="dev@helix.incubator.apache.org">Apache Helix Documentation Team</author>
+ </properties>
+
+ <body>
+ <div class="toc_container">
+ <macro name="toc">
+ <param name="class" value="toc"/>
+ </macro>
+ </div>
+
+ <section name="Introduction">
+ <p>Apache Helix artifacts are distributed in source and binary form under the terms of the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+ See the included <tt>LICENSE</tt> and <tt>NOTICE</tt> files included in each artifact for additional license
+ information.
+ </p>
+ <p>Use the links below to download a source distribution of Apache Helix.
+ It is good practice to <a href="#Verifying_Releases">verify the integrity</a> of the distribution files.</p>
+ </section>
+
+ <section name="Release">
+ <p>Release date: ${releaseDate} </p>
+ <p><a href="releasenotes/release-${releaseName}.html">${releaseName} Release notes</a></p>
+ <a name="mirror"/>
+ <subsection name="Mirror">
+
+ <p>
+ [if-any logo]
+ <a href="[link]">
+ <img align="right" src="[logo]" border="0"
+ alt="logo"/>
+ </a>
+ [end]
+ The currently selected mirror is
+ <b>[preferred]</b>.
+ If you encounter a problem with this mirror,
+ please select another mirror.
+ If all mirrors are failing, there are
+ <i>backup</i>
+ mirrors
+ (at the end of the mirrors list) that should be available.
+ </p>
+
+ <form action="[location]" method="get" id="SelectMirror" class="form-inline">
+ Other mirrors:
+ <select name="Preferred" class="input-xlarge">
+ [if-any http]
+ [for http]
+ <option value="[http]">[http]</option>
+ [end]
+ [end]
+ [if-any ftp]
+ [for ftp]
+ <option value="[ftp]">[ftp]</option>
+ [end]
+ [end]
+ [if-any backup]
+ [for backup]
+ <option value="[backup]">[backup] (backup)</option>
+ [end]
+ [end]
+ </select>
+ <input type="submit" value="Change" class="btn"/>
+ </form>
+
+ <p>
+ You may also consult the
+ <a href="http://www.apache.org/mirrors/">complete list of mirrors.</a>
+ </p>
+
+ </subsection>
+ <subsection name="${releaseName} Sources">
+ <table>
+ <thead>
+ <tr>
+ <th>Artifact</th>
+ <th>Signatures</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <a href="[preferred]incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip">helix-${releaseName}-src.zip</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.asc">asc</a>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.md5">md5</a>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/src/helix-${releaseName}-src.zip.sha1">sha1</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </subsection>
+ <subsection name="${releaseName} Binaries">
+ <table>
+ <thead>
+ <tr>
+ <th>Artifact</th>
+ <th>Signatures</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <a href="[preferred]incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar">helix-core-${releaseName}-pkg.tar</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.asc">asc</a>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.md5">md5</a>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-core-${releaseName}-pkg.tar.sha1">sha1</a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <a href="[preferred]incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar">helix-admin-webapp-${releaseName}-pkg.tar</a>
+ </td>
+ <td>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.asc">asc</a>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.md5">md5</a>
+ <a href="http://www.apache.org/dist/incubator/helix/${releaseName}/binaries/helix-admin-webapp-${releaseName}-pkg.tar.sha1">sha1</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </subsection>
+ </section>
+
+<!-- <section name="Older Releases">
+ </section>-->
+
+ <section name="Verifying Releases">
+ <p>We strongly recommend you verify the integrity of the downloaded files with both PGP and MD5.</p>
+
+ <p>The PGP signatures can be verified using <a href="http://www.pgpi.org/">PGP</a> or
+ <a href="http://www.gnupg.org/">GPG</a>.
+ First download the <a href="http://www.apache.org/dist/incubator/helix/KEYS">KEYS</a> as well as the
+ <tt>*.asc</tt> signature file for the particular distribution. Make sure you get these files from the main
+ distribution directory, rather than from a mirror. Then verify the signatures using one of the following sets of
+ commands:
+
+ <source>$ pgp -ka KEYS
+$ pgp helix-*.zip.asc</source>
+
+ <source>$ gpg --import KEYS
+$ gpg --verify helix-*.zip.asc</source>
+ </p>
+ <p>Alternatively, you can verify the MD5 signature on the files. A Unix/Linux program called
+ <code>md5</code> or
+ <code>md5sum</code> is included in most distributions. It is also available as part of
+ <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>.
+ Windows users can get binary md5 programs from these (and likely other) places:
+ <ul>
+ <li>
+ <a href="http://www.md5summer.org/">http://www.md5summer.org/</a>
+ </li>
+ <li>
+ <a href="http://www.fourmilab.ch/md5/">http://www.fourmilab.ch/md5/</a>
+ </li>
+ <li>
+ <a href="http://www.pc-tools.net/win32/md5sums/">http://www.pc-tools.net/win32/md5sums/</a>
+ </li>
+ </ul>
+ </p>
+ </section>
+ </body>
+</document>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/pom.xml
----------------------------------------------------------------------
diff --git a/site-releases/pom.xml b/site-releases/pom.xml
new file mode 100644
index 0000000..13b86be
--- /dev/null
+++ b/site-releases/pom.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.helix</groupId>
+ <artifactId>helix</artifactId>
+ <version>0.6.2-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+
+ <artifactId>site-releases</artifactId>
+ <name>Apache Helix :: Site Releases</name>
+
+ <modules>
+ <module>0.6.1-incubating</module>
+ </modules>
+
+ <properties>
+ </properties>
+
+ <dependencies>
+ </dependencies>
+ <build>
+ <resources>
+ </resources>
+ <plugins>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/Architecture.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Architecture.md b/src/site/markdown/Architecture.md
index ac96443..933e917 100644
--- a/src/site/markdown/Architecture.md
+++ b/src/site/markdown/Architecture.md
@@ -17,7 +17,12 @@ specific language governing permissions and limitations
under the License.
-->
+<head>
+ <title>Architecture</title>
+</head>
+Architecture
+----------------------------
Helix aims to provide the following abilities to a distributed system:
* Automatic management of a cluster hosting partitioned, replicated resources.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/Concepts.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Concepts.md b/src/site/markdown/Concepts.md
index e6bcca0..fa5d0ba 100644
--- a/src/site/markdown/Concepts.md
+++ b/src/site/markdown/Concepts.md
@@ -17,6 +17,13 @@ specific language governing permissions and limitations
under the License.
-->
+<head>
+ <title>Concepts</title>
+</head>
+
+Concepts
+----------------------------
+
Helix is based on the idea that a given task has the following attributes associated with it:
* _Location of the task_. For example it runs on Node N1
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/Features.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Features.md b/src/site/markdown/Features.md
index 4f78812..ba9d0e7 100644
--- a/src/site/markdown/Features.md
+++ b/src/site/markdown/Features.md
@@ -17,6 +17,13 @@ specific language governing permissions and limitations
under the License.
-->
+<head>
+ <title>Features</title>
+</head>
+
+Features
+----------------------------
+
### CONFIGURING IDEALSTATE
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/IRC.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/IRC.md b/src/site/markdown/IRC.md
index b4dc83d..6dd450f 100644
--- a/src/site/markdown/IRC.md
+++ b/src/site/markdown/IRC.md
@@ -17,6 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
+<head>
+ <title>IRC</title>
+</head>
+
IRC
---
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/Quickstart.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Quickstart.md b/src/site/markdown/Quickstart.md
index 1cc61e3..4a5e83d 100644
--- a/src/site/markdown/Quickstart.md
+++ b/src/site/markdown/Quickstart.md
@@ -17,6 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
+<head>
+ <title>Quickstart</title>
+</head>
+
Get Helix
---------
@@ -33,7 +37,7 @@ First, let\'s get Helix, either build it, or download.
### Download
-Download the 0.6.1-incubating release package [here](https://dist.apache.org/repos/dist/dev/incubator/helix/0.6.1-incubating/binaries/helix-core-0.6.1-incubating-pkg.tar)
+Download the 0.6.1-incubating release package [here](./download.html)
Overview
--------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/Tutorial.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/Tutorial.md b/src/site/markdown/Tutorial.md
index 8e025b2..61221b7 100644
--- a/src/site/markdown/Tutorial.md
+++ b/src/site/markdown/Tutorial.md
@@ -17,6 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
+<head>
+ <title>Tutorial</title>
+</head>
+
# Helix Tutorial
In this tutorial, we will cover the roles of a Helix-managed cluster, and show the code you need to write to integrate with it. In many cases, there is a simple default behavior that is often appropriate, but you can also customize the behavior.
@@ -186,7 +190,7 @@ There are 3 assignment modes Helix can operate on
* SEMI_AUTO: Application decides the placement but Helix decides the state of a partition.
* CUSTOMIZED: Application controls the placement and state of a partition.
-For more info on the assignment modes, see [Rebalancing Algorithms](./tutorial_rebalance.html) of the tutorial.
+For more info on the assignment modes, see [Rebalancing Algorithms](./tutorial_rebalance.html) section of the tutorial.
```
String RESOURCE_NAME = "MyDB";
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/UseCases.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/UseCases.md b/src/site/markdown/UseCases.md
index d46b372..001b012 100644
--- a/src/site/markdown/UseCases.md
+++ b/src/site/markdown/UseCases.md
@@ -17,6 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
+<head>
+ <title>Use Cases</title>
+</head>
+
# Use cases at LinkedIn
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 70aba18..fd42592 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -17,6 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
+<head>
+ <title>Home</title>
+</head>
+
Navigating the Documentation
----------------------------
@@ -32,7 +36,7 @@ Navigating the Documentation
[Tutorial](./Tutorial.html)
-[Javadocs](http://helix.incubator.apache.org/apidocs/index.html)
+[Javadocs](./apidocs/index.html)
[IRC](./IRC.html)
@@ -50,6 +54,10 @@ Navigating the Documentation
[User-Defined Rebalancer Example](./recipes/user_def_rebalancer.html)
+### Download
+
+[Current Release](./download.html)
+
What Is Helix
--------------
@@ -102,6 +110,7 @@ Requirements: JDK 1.6+, Maven 2.0.8+
```
git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
cd incubator-helix
+ git checkout tags/helix-0.6.1-incubating
mvn install package -DskipTests
```
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_admin.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_admin.md b/src/site/markdown/tutorial_admin.md
index 72c1f13..11ab9df 100644
--- a/src/site/markdown/tutorial_admin.md
+++ b/src/site/markdown/tutorial_admin.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Admin Operations
+<head>
+ <title>Tutorial - Admin Operations</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Admin Operations
Helix provides a set of admin api for cluster management operations. They are supported via:
@@ -26,7 +30,7 @@ Helix provides a set of admin api for cluster management operations. They are su
* _REST interface via helix-admin-webapp_
### Java API
-See interface [_org.apache.helix.HelixAdmin_](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/HelixAdmin.html)
+See interface [_org.apache.helix.HelixAdmin_](./apidocs/reference/org/apache/helix/HelixAdmin.html)
### Command-line interface
The command-line tool comes with helix-core package:
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_controller.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_controller.md b/src/site/markdown/tutorial_controller.md
index e391673..8e7e7ad 100644
--- a/src/site/markdown/tutorial_controller.md
+++ b/src/site/markdown/tutorial_controller.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Controller
+<head>
+ <title>Tutorial - Controller</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Controller
Next, let\'s implement the controller. This is the brain of the cluster. Helix makes sure there is exactly one active controller running the cluster.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_health.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_health.md b/src/site/markdown/tutorial_health.md
index ae29436..e1a7f3c 100644
--- a/src/site/markdown/tutorial_health.md
+++ b/src/site/markdown/tutorial_health.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Customizing Health Checks
+<head>
+ <title>Tutorial - Customizing Heath Checks</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Customizing Health Checks
In this chapter, we\'ll learn how to customize the health check, based on metrics of your distributed system.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_messaging.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_messaging.md b/src/site/markdown/tutorial_messaging.md
index c6fd3b2..ff73ef0 100644
--- a/src/site/markdown/tutorial_messaging.md
+++ b/src/site/markdown/tutorial_messaging.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Messaging
+<head>
+ <title>Tutorial - Messaging</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Messaging
In this chapter, we\'ll learn about messaging, a convenient feature in Helix for sending messages between nodes of a cluster. This is an interesting feature which is quite useful in practice. It is common that nodes in a distributed system require a mechanism to interact with each other.
@@ -63,5 +67,5 @@ System Admins can also perform ad-hoc tasks, such as on-demand backups or a syst
requestBackupUriRequest, responseHandler, timeout);
```
-See HelixManager.DefaultMessagingService in [Javadocs](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more info.
+See HelixManager.DefaultMessagingService in [Javadocs](./apidocs/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more info.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_participant.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_participant.md b/src/site/markdown/tutorial_participant.md
index cd4bcd2..d2812da 100644
--- a/src/site/markdown/tutorial_participant.md
+++ b/src/site/markdown/tutorial_participant.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Participant
+<head>
+ <title>Tutorial - Participant</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Participant
In this chapter, we\'ll learn how to implement a Participant, which is a primary functional component of a distributed system.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_propstore.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_propstore.md b/src/site/markdown/tutorial_propstore.md
index 6af3c28..377967f 100644
--- a/src/site/markdown/tutorial_propstore.md
+++ b/src/site/markdown/tutorial_propstore.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Application Property Store
+<head>
+ <title>Tutorial - Application Property Store</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Application Property Store
In this chapter, we\'ll learn how to use the application property store.
@@ -27,4 +31,4 @@ It is common that an application needs support for distributed, shared data stru
While you could use Zookeeper directly, Helix supports caching the data and a write-through cache. This is far more efficient than reading from Zookeeper for every access.
-See [HelixManager.getHelixPropertyStore](http://helix.incubator.apache.org/apidocs/reference/org/apache/helix/store/package-summary.html) for details.
+See [HelixManager.getHelixPropertyStore](./apidocs/reference/org/apache/helix/store/package-summary.html) for details.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_rebalance.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_rebalance.md b/src/site/markdown/tutorial_rebalance.md
index f8f0511..8f42a5a 100644
--- a/src/site/markdown/tutorial_rebalance.md
+++ b/src/site/markdown/tutorial_rebalance.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Rebalancing Algorithms
+<head>
+ <title>Tutorial - Rebalancing Algorithms</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Rebalancing Algorithms
The placement of partitions in a distributed system is essential for the reliability and scalability of the system. For example, when a node fails, it is important that the partitions hosted on that node are reallocated evenly among the remaining nodes. Consistent hashing is one such algorithm that can satisfy this guarantee. Helix provides a variant of consistent hashing based on the RUSH algorithm, among others.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_spectator.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_spectator.md b/src/site/markdown/tutorial_spectator.md
index bdf50a7..24c1cf4 100644
--- a/src/site/markdown/tutorial_spectator.md
+++ b/src/site/markdown/tutorial_spectator.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Spectator
+<head>
+ <title>Tutorial - Spectator</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Spectator
Next, we\'ll learn how to implement a Spectator. Typically, a spectator needs to react to changes within the distributed system. Examples: a client that needs to know where to send a request, a topic consumer in a consumer group. The spectator is automatically informed of changes in the _external state_ of the cluster, but it does not have to add any code to keep track of other components in the system.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_state.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_state.md b/src/site/markdown/tutorial_state.md
index e9a79d3..4f7b1b5 100644
--- a/src/site/markdown/tutorial_state.md
+++ b/src/site/markdown/tutorial_state.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: State Machine Configuration
+<head>
+ <title>Tutorial - State Machine Configuration</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): State Machine Configuration
In this chapter, we\'ll learn about the state models provided by Helix, and how to create your own custom state model.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_throttling.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_throttling.md b/src/site/markdown/tutorial_throttling.md
index 5002156..2317cf1 100644
--- a/src/site/markdown/tutorial_throttling.md
+++ b/src/site/markdown/tutorial_throttling.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: Throttling
+<head>
+ <title>Tutorial - Throttling</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): Throttling
In this chapter, we\'ll learn how to control the parallel execution of cluster tasks. Only a centralized cluster manager with global knowledge is capable of coordinating this decision.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_user_def_rebalancer.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_user_def_rebalancer.md b/src/site/markdown/tutorial_user_def_rebalancer.md
index 6d07878..44b202a 100644
--- a/src/site/markdown/tutorial_user_def_rebalancer.md
+++ b/src/site/markdown/tutorial_user_def_rebalancer.md
@@ -16,7 +16,12 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-# Tutorial: User-Defined Rebalancing
+
+<head>
+ <title>Tutorial - User-Defined Rebalancing</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): User-Defined Rebalancing
Even though Helix can compute both the location and the state of replicas internally using a default fully-automatic rebalancer, specific applications may require rebalancing strategies that optimize for different requirements. Thus, Helix allows applications to plug in arbitrary rebalancer algorithms that implement a provided interface. One of the main design goals of Helix is to provide maximum flexibility to any distributed application. Thus, it allows applications to fully implement the rebalancer, which is the core constraint solver in the system, if the application developer so chooses.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/markdown/tutorial_yaml.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/tutorial_yaml.md b/src/site/markdown/tutorial_yaml.md
index 1524c9d..0f8e0cc 100644
--- a/src/site/markdown/tutorial_yaml.md
+++ b/src/site/markdown/tutorial_yaml.md
@@ -17,7 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
-# Helix Tutorial: YAML Cluster Setup
+<head>
+ <title>Tutorial - YAML Cluster Setup</title>
+</head>
+
+# [Helix Tutorial](./Tutorial.html): YAML Cluster Setup
As an alternative to using Helix Admin to set up the cluster, its resources, constraints, and the state model, Helix supports bootstrapping a cluster configuration based on a YAML file. Below is an annotated example of such a file for a simple distributed lock manager where a lock can only be LOCKED or RELEASED, and each lock only allows a single participant to hold it in the LOCKED state.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm
index d8f2c8e..decdbed 100644
--- a/src/site/xdoc/download.xml.vm
+++ b/src/site/xdoc/download.xml.vm
@@ -110,7 +110,7 @@ under the License.
<td>
<a href="http://www.apache.org/dist/incubator/helix/${currentRelease}/src/helix-${currentRelease}-src.zip.asc">asc</a>
<a href="http://www.apache.org/dist/incubator/helix/${currentRelease}/src/helix-${currentRelease}-src.zip.md5">md5</a>
- <a href="http://www.apache.org/dist/incubator/helix/${currentRelease}/src/helix-${currentRelease}-src.zip.zip.sha1">sha1</a>
+ <a href="http://www.apache.org/dist/incubator/helix/${currentRelease}/src/helix-${currentRelease}-src.zip.sha1">sha1</a>
</td>
</tr>
</tbody>
[2/3] [HELIX-270] Refactor website to have release-specific pages,
disable link to 0.6.1 page for now
Posted by ka...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/UseCases.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/UseCases.md b/site-releases/0.6.1-incubating/src/site/markdown/UseCases.md
new file mode 100644
index 0000000..d46b372
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/UseCases.md
@@ -0,0 +1,109 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+# Use cases at LinkedIn
+
+At LinkedIn Helix framework is used to manage 3 distributed data systems which are quite different from each other.
+
+* Espresso
+* Databus
+* Search As A Service
+
+## Espresso
+
+Espresso is a distributed, timeline consistent, scal- able, document store that supports local secondary indexing and local transactions.
+Espresso databases are horizontally partitioned into a number of partitions, with each partition having a certain number of replicas
+distributed across the storage nodes.
+Espresso designates one replica of each partition as master and the rest as slaves; only one master may exist for each partition at any time.
+Espresso enforces timeline consistency where only the master of a partition can accept writes to its records, and all slaves receive and
+apply the same writes through a replication stream.
+For load balancing, both master and slave partitions are assigned evenly across all storage nodes.
+For fault tolerance, it adds the constraint that no two replicas of the same partition may be located on the same node.
+
+### State model
+Espresso follows a Master-Slave state model. A replica can be in Offline,Slave or Master state.
+The state machine table describes the next state given the Current State, Final State
+
+```
+ OFFLINE | SLAVE | MASTER
+ _____________________________
+ | | | |
+OFFLINE | N/A | SLAVE | SLAVE |
+ |__________|________|_________|
+ | | | |
+SLAVE | OFFLINE | N/A | MASTER |
+ |__________|________|_________|
+ | | | |
+MASTER | SLAVE | SLAVE | N/A |
+ |__________|________|_________|
+
+```
+
+### Constraints
+* Max number of replicas in Master state:1
+* Execution mode AUTO. i.e on node failure no new replicas will be created. Only the State of remaining replicas will be changed.
+* Number of mastered partitions on each node must be approximately same.
+* The above constraint must be satisfied when a node fails or a new node is added.
+* When new nodes are added the number of partitions moved must be minimized.
+* When new nodes are added the max number of OFFLINE-SLAVE transitions that can happen concurrently on new node is X.
+
+## Databus
+
+Databus is a change data capture (CDC) system that provides a common pipeline for transporting events
+from LinkedIn primary databases to caches within various applications.
+Databus deploys a cluster of relays that pull the change log from multiple databases and
+let consumers subscribe to the change log stream. Each Databus relay connects to one or more database servers and
+hosts a certain subset of databases (and partitions) from those database servers.
+
+For a large partitioned database (e.g. Espresso), the change log is consumed by a bank of consumers.
+Each databus partition is assigned to a consumer such that partitions are evenly distributed across consumers and each partition is
+assigned to exactly one consumer at a time. The set of consumers may grow over time, and consumers may leave the group due to planned or unplanned
+outages. In these cases, partitions must be reassigned, while maintaining balance and the single consumer-per-partition invariant.
+
+### State model
+Databus consumers follow a simple Offline-Online state model.
+The state machine table describes the next state given the Current State, Final State
+
+<pre><code>
+ OFFLINE | ONLINE |
+ ___________________|
+ | | |
+OFFLINE | N/A | ONLINE |
+ |__________|________|
+ | | |
+ONLINE | OFFLINE | N/A |
+ |__________|________|
+
+
+</code></pre>
+
+
+## Search As A Service
+
+LinkedIn�s Search-as-a-service lets internal customers define custom indexes on a chosen dataset
+and then makes those indexes searchable via a service API. The index service runs on a cluster of machines.
+The index is broken into partitions and each partition has a configured number of replicas.
+Each cluster server runs an instance of the Sensei system (an online index store) and hosts index partitions.
+Each new indexing service gets assigned to a set of servers, and the partition replicas must be evenly distributed across those servers.
+
+### State model
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/index.md b/site-releases/0.6.1-incubating/src/site/markdown/index.md
new file mode 100644
index 0000000..632d95c
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/index.md
@@ -0,0 +1,132 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+Navigating the Documentation
+----------------------------
+
+### Conceptual Understanding
+
+[Concepts / Terminology](./Concepts.html)
+
+[Architecture](./Architecture.html)
+
+### Hands-on Helix
+
+[Quickstart](./Quickstart.html)
+
+[Tutorial](./Tutorial.html)
+
+[Javadocs](./apidocs/index.html)
+
+### Recipes
+
+[Distributed lock manager](./recipes/lock_manager.html)
+
+[Rabbit MQ consumer group](./recipes/rabbitmq_consumer_group.html)
+
+[Rsync replicated file store](./recipes/rsync_replicated_file_store.html)
+
+[Service discovery](./recipes/service_discovery.html)
+
+[Distributed Task DAG Execution](./recipes/task_dag_execution.html)
+
+### Download
+
+[0.6.1-incubating](./download.html)
+
+
+What Is Helix
+--------------
+Helix is a generic _cluster management_ framework used for the automatic management of partitioned, replicated and distributed resources hosted on a cluster of nodes.
+
+
+What Is Cluster Management
+--------------------------
+To understand Helix, first you need to understand what is _cluster management_. A distributed system typically runs on multiple nodes for the following reasons:
+
+* scalability
+* fault tolerance
+* load balancing
+
+Each node performs one or more of the primary function of the cluster, such as storing/serving data, producing/consuming data streams, etc. Once configured for your system, Helix acts as the global brain for the system. It is designed to make decisions that cannot be made in isolation. Examples of decisions that require global knowledge and coordination:
+
+* scheduling of maintainence tasks, such as backups, garbage collection, file consolidation, index rebuilds
+* repartitioning of data or resources across the cluster
+* informing dependent systems of changes so they can react appropriately to cluster changes
+* throttling system tasks and changes
+
+While it is possible to integrate these functions into the distributed system, it complicates the code. Helix has abstracted common cluster management tasks, enabling the system builder to model the desired behavior in a declarative state model, and let Helix manage the coordination. The result is less new code to write, and a robust, highly operable system.
+
+
+Key Features of Helix
+---------------------
+1. Automatic assignment of resource/partition to nodes
+2. Node failure detection and recovery
+3. Dynamic addition of Resources
+4. Dynamic addition of nodes to the cluster
+5. Pluggable distributed state machine to manage the state of a resource via state transitions
+6. Automatic load balancing and throttling of transitions
+
+
+Why Helix
+---------
+Modeling a distributed system as a state machine with constraints on state and transitions has the following benefits:
+
+* Separates cluster management from the core functionality.
+* Quick transformation from a single node system to an operable, distributed system.
+* Simplicity: System components do not have to manage global cluster. This division of labor makes it easier to build, debug, and maintain your system.
+
+
+Build Instructions
+------------------
+
+Requirements: Jdk 1.6+, Maven 2.0.8+
+
+```
+ git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+ cd incubator-helix
+ git checkout tags/helix-0.6.1-incubating
+ mvn install package -DskipTests
+```
+
+Maven dependency
+
+```
+ <dependency>
+ <groupId>org.apache.helix</groupId>
+ <artifactId>helix-core</artifactId>
+ <version>0.6.1-incubating</version>
+ </dependency>
+```
+
+[Download](./download.html) Helix artifacts from here.
+
+Publications
+-------------
+
+* Untangling cluster management using Helix at [SOCC Oct 2012](http://www.socc2012.org/home/program)
+ - [paper](https://915bbc94-a-62cb3a1a-s-sites.googlegroups.com/site/acm2012socc/helix_onecol.pdf)
+ - [presentation](http://www.slideshare.net/KishoreGopalakrishna/helix-socc-v10final)
+* Building distributed systems using Helix Apache Con Feb 2013
+ - [presentation at ApacheCon](http://www.slideshare.net/KishoreGopalakrishna/apache-con-buildingddsusinghelix)
+ - [presentation at VMWare](http://www.slideshare.net/KishoreGopalakrishna/apache-helix-presentation-at-vmware)
+* Data driven testing:
+ - [short talk at LSPE meetup](http://www.slideshare.net/KishoreGopalakrishna/data-driven-testing)
+ - [paper DBTest 2013 acm SIGMOD:will be published on Jun 24, 2013](http://dbtest2013.soe.ucsc.edu/Program.htm)
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md b/site-releases/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md
new file mode 100644
index 0000000..84420dd
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md
@@ -0,0 +1,253 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+Distributed lock manager
+------------------------
+Distributed locks are used to synchronize accesses shared resources. Most applications use Zookeeper to model the distributed locks.
+
+The simplest way to model a lock using zookeeper is (See Zookeeper leader recipe for an exact and more advanced solution)
+
+* Each process tries to create an emphemeral node.
+* If can successfully create it then, it acquires the lock
+* Else it will watch on the znode and try to acquire the lock again if the current lock holder disappears
+
+This is good enough if there is only one lock. But in practice, an application will need many such locks. Distributing and managing the locks among difference process becomes challenging. Extending such a solution to many locks will result in
+
+* Uneven distribution of locks among nodes, the node that starts first will acquire all the lock. Nodes that start later will be idle.
+* When a node fails, how the locks will be distributed among remaining nodes is not predicable.
+* When new nodes are added the current nodes dont relinquish the locks so that new nodes can acquire some locks
+
+In other words we want a system to satisfy the following requirements.
+
+* Distribute locks evenly among all nodes to get better hardware utilization
+* If a node fails, the locks that were acquired by that node should be evenly distributed among other nodes
+* If nodes are added, locks must be evenly re-distributed among nodes.
+
+Helix provides a simple and elegant solution to this problem. Simply specify the number of locks and Helix will ensure that above constraints are satisfied.
+
+To quickly see this working run the lock-manager-demo script where 12 locks are evenly distributed among three nodes, and when a node fails, the locks get re-distributed among remaining two nodes. Note that Helix does not re-shuffle the locks completely, instead it simply distributes the locks relinquished by dead node among 2 remaining nodes evenly.
+
+----------------------------------------------------------------------------------------
+
+#### Short version
+ This version starts multiple threads with in same process to simulate a multi node deployment. Try the long version to get a better idea of how it works.
+
+```
+git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+cd incubator-helix
+mvn clean install package -DskipTests
+cd recipes/distributed-lock-manager/target/distributed-lock-manager-pkg/bin
+chmod +x *
+./lock-manager-demo
+```
+
+##### Output
+
+```
+./lock-manager-demo
+STARTING localhost_12000
+STARTING localhost_12002
+STARTING localhost_12001
+STARTED localhost_12000
+STARTED localhost_12002
+STARTED localhost_12001
+localhost_12001 acquired lock:lock-group_3
+localhost_12000 acquired lock:lock-group_8
+localhost_12001 acquired lock:lock-group_2
+localhost_12001 acquired lock:lock-group_4
+localhost_12002 acquired lock:lock-group_1
+localhost_12002 acquired lock:lock-group_10
+localhost_12000 acquired lock:lock-group_7
+localhost_12001 acquired lock:lock-group_5
+localhost_12002 acquired lock:lock-group_11
+localhost_12000 acquired lock:lock-group_6
+localhost_12002 acquired lock:lock-group_0
+localhost_12000 acquired lock:lock-group_9
+lockName acquired By
+======================================
+lock-group_0 localhost_12002
+lock-group_1 localhost_12002
+lock-group_10 localhost_12002
+lock-group_11 localhost_12002
+lock-group_2 localhost_12001
+lock-group_3 localhost_12001
+lock-group_4 localhost_12001
+lock-group_5 localhost_12001
+lock-group_6 localhost_12000
+lock-group_7 localhost_12000
+lock-group_8 localhost_12000
+lock-group_9 localhost_12000
+Stopping localhost_12000
+localhost_12000 Interrupted
+localhost_12001 acquired lock:lock-group_9
+localhost_12001 acquired lock:lock-group_8
+localhost_12002 acquired lock:lock-group_6
+localhost_12002 acquired lock:lock-group_7
+lockName acquired By
+======================================
+lock-group_0 localhost_12002
+lock-group_1 localhost_12002
+lock-group_10 localhost_12002
+lock-group_11 localhost_12002
+lock-group_2 localhost_12001
+lock-group_3 localhost_12001
+lock-group_4 localhost_12001
+lock-group_5 localhost_12001
+lock-group_6 localhost_12002
+lock-group_7 localhost_12002
+lock-group_8 localhost_12001
+lock-group_9 localhost_12001
+
+```
+
+----------------------------------------------------------------------------------------
+
+#### Long version
+This provides more details on how to setup the cluster and where to plugin application code.
+
+##### start zookeeper
+
+```
+./start-standalone-zookeeper 2199
+```
+
+##### Create a cluster
+
+```
+./helix-admin --zkSvr localhost:2199 --addCluster lock-manager-demo
+```
+
+##### Create a lock group
+
+Create a lock group and specify the number of locks in the lock group.
+
+```
+./helix-admin --zkSvr localhost:2199 --addResource lock-manager-demo lock-group 6 OnlineOffline AUTO_REBALANCE
+```
+
+##### Start the nodes
+
+Create a Lock class that handles the callbacks.
+
+```
+
+public class Lock extends StateModel
+{
+ private String lockName;
+
+ public Lock(String lockName)
+ {
+ this.lockName = lockName;
+ }
+
+ public void lock(Message m, NotificationContext context)
+ {
+ System.out.println(" acquired lock:"+ lockName );
+ }
+
+ public void release(Message m, NotificationContext context)
+ {
+ System.out.println(" releasing lock:"+ lockName );
+ }
+
+}
+
+```
+
+LockFactory that creates the lock
+
+```
+public class LockFactory extends StateModelFactory<Lock>{
+
+ /* Instantiates the lock handler, one per lockName*/
+ public Lock create(String lockName)
+ {
+ return new Lock(lockName);
+ }
+}
+```
+
+At node start up, simply join the cluster and helix will invoke the appropriate callbacks on Lock instance. One can start any number of nodes and Helix detects that a new node has joined the cluster and re-distributes the locks automatically.
+
+```
+public class LockProcess{
+
+ public static void main(String args){
+ String zkAddress= "localhost:2199";
+ String clusterName = "lock-manager-demo";
+ //Give a unique id to each process, most commonly used format hostname_port
+ String instanceName ="localhost_12000";
+ ZKHelixAdmin helixAdmin = new ZKHelixAdmin(zkAddress);
+ //configure the instance and provide some metadata
+ InstanceConfig config = new InstanceConfig(instanceName);
+ config.setHostName("localhost");
+ config.setPort("12000");
+ admin.addInstance(clusterName, config);
+ //join the cluster
+ HelixManager manager;
+ manager = HelixManagerFactory.getHelixManager(clusterName,
+ instanceName,
+ InstanceType.PARTICIPANT,
+ zkAddress);
+ manager.getStateMachineEngine().registerStateModelFactory("OnlineOffline", modelFactory);
+ manager.connect();
+ Thread.currentThread.join();
+ }
+
+}
+```
+
+##### Start the controller
+
+Controller can be started either as a separate process or can be embedded within each node process
+
+###### Separate process
+This is recommended when number of nodes in the cluster >100. For fault tolerance, you can run multiple controllers on different boxes.
+
+```
+./run-helix-controller --zkSvr localhost:2199 --cluster lock-manager-demo 2>&1 > /tmp/controller.log &
+```
+
+###### Embedded within the node process
+This is recommended when the number of nodes in the cluster is less than 100. To start a controller from each process, simply add the following lines to MyClass
+
+```
+public class LockProcess{
+
+ public static void main(String args){
+ String zkAddress= "localhost:2199";
+ String clusterName = "lock-manager-demo";
+ .
+ .
+ manager.connect();
+ HelixManager controller;
+ controller = HelixControllerMain.startHelixController(zkAddress,
+ clusterName,
+ "controller",
+ HelixControllerMain.STANDALONE);
+ Thread.currentThread.join();
+ }
+}
+```
+
+----------------------------------------------------------------------------------------
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md b/site-releases/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
new file mode 100644
index 0000000..ec3053a
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
@@ -0,0 +1,227 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+RabbitMQ Consumer Group
+=======================
+
+[RabbitMQ](http://www.rabbitmq.com/) is a well known Open source software the provides robust messaging for applications.
+
+One of the commonly implemented recipes using this software is a work queue. http://www.rabbitmq.com/tutorials/tutorial-four-java.html describes the use case where
+
+* A producer sends a message with a routing key.
+* The message is routed to the queue whose binding key exactly matches the routing key of the message.
+* There are multiple consumers and each consumer is interested in processing only a subset of the messages by binding to the interested keys
+
+The example provided [here](http://www.rabbitmq.com/tutorials/tutorial-four-java.html) describes how multiple consumers can be started to process all the messages.
+
+While this works, in production systems one needs the following
+
+* Ability to handle failures: when a consumers fails another consumer must be started or the other consumers must start processing these messages that should have been processed by the failed consumer.
+* When the existing consumers cannot keep up with the task generation rate, new consumers will be added. The tasks must be redistributed among all the consumers.
+
+In this recipe, we demonstrate handling of consumer failures and new consumer additions using Helix.
+
+Mapping this usecase to Helix is pretty easy as the binding key/routing key is equivalent to a partition.
+
+Let's take an example. Lets say the queue has 6 partitions, and we have 2 consumers to process all the queues.
+What we want is all 6 queues to be evenly divided among 2 consumers.
+Eventually when the system scales, we add more consumers to keep up. This will make each consumer process tasks from 2 queues.
+Now let's say that a consumer failed which reduces the number of active consumers to 2. This means each consumer must process 3 queues.
+
+We showcase how such a dynamic App can be developed using Helix. Even though we use rabbitmq as the pub/sub system one can extend this solution to other pub/sub systems.
+
+Try it
+======
+
+```
+git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+cd incubator-helix
+mvn clean install package -DskipTests
+cd recipes/rabbitmq-consumer-group/bin
+chmod +x *
+export HELIX_PKG_ROOT=`pwd`/helix-core/target/helix-core-pkg
+export HELIX_RABBITMQ_ROOT=`pwd`/recipes/rabbitmq-consumer-group/
+chmod +x $HELIX_PKG_ROOT/bin/*
+chmod +x $HELIX_RABBITMQ_ROOT/bin/*
+```
+
+
+Install Rabbit MQ
+----------------
+
+Setting up RabbitMQ on a local box is straightforward. You can find the instructions here
+http://www.rabbitmq.com/download.html
+
+Start ZK
+--------
+Start zookeeper at port 2199
+
+```
+$HELIX_PKG_ROOT/bin/start-standalone-zookeeper 2199
+```
+
+Setup the consumer group cluster
+--------------------------------
+This will setup the cluster by creating a "rabbitmq-consumer-group" cluster and adds a "topic" with "6" queues.
+
+```
+$HELIX_RABBITMQ_ROOT/bin/setup-cluster.sh localhost:2199
+```
+
+Add consumers
+-------------
+Start 2 consumers in 2 different terminals. Each consumer is given a unique id.
+
+```
+//start-consumer.sh zookeeperAddress (e.g. localhost:2181) consumerId , rabbitmqServer (e.g. localhost)
+$HELIX_RABBITMQ_ROOT/bin/start-consumer.sh localhost:2199 0 localhost
+$HELIX_RABBITMQ_ROOT/bin/start-consumer.sh localhost:2199 1 localhost
+
+```
+
+Start HelixController
+--------------------
+Now start a Helix controller that starts managing the "rabbitmq-consumer-group" cluster.
+
+```
+$HELIX_RABBITMQ_ROOT/bin/start-cluster-manager.sh localhost:2199
+```
+
+Send messages to the Topic
+--------------------------
+
+Start sending messages to the topic. This script randomly selects a routing key (1-6) and sends the message to topic.
+Based on the key, messages gets routed to the appropriate queue.
+
+```
+$HELIX_RABBITMQ_ROOT/bin/send-message.sh localhost 20
+```
+
+After running this, you should see all 20 messages being processed by 2 consumers.
+
+Add another consumer
+--------------------
+Once a new consumer is started, helix detects it. In order to balance the load between 3 consumers, it deallocates 1 partition from the existing consumers and allocates it to the new consumer. We see that
+each consumer is now processing only 2 queues.
+Helix makes sure that old nodes are asked to stop consuming before the new consumer is asked to start consuming for a given partition. But the transitions for each partition can happen in parallel.
+
+```
+$HELIX_RABBITMQ_ROOT/bin/start-consumer.sh localhost:2199 2 localhost
+```
+
+Send messages again to the topic.
+
+```
+$HELIX_RABBITMQ_ROOT/bin/send-message.sh localhost 100
+```
+
+You should see that messages are now received by all 3 consumers.
+
+Stop a consumer
+---------------
+In any terminal press CTRL^C and notice that Helix detects the consumer failure and distributes the 2 partitions that were processed by failed consumer to the remaining 2 active consumers.
+
+
+How does it work
+================
+
+Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=incubator-helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
+
+Cluster setup
+-------------
+This step creates znode on zookeeper for the cluster and adds the state model. We use online offline state model since there is no need for other states. The consumer is either processing a queue or it is not.
+
+It creates a resource called "rabbitmq-consumer-group" with 6 partitions. The execution mode is set to AUTO_REBALANCE. This means that the Helix controls the assignment of partition to consumers and automatically distributes the partitions evenly among the active consumers. When a consumer is added or removed, it ensures that a minimum number of partitions are shuffled.
+
+```
+ zkclient = new ZkClient(zkAddr, ZkClient.DEFAULT_SESSION_TIMEOUT,
+ ZkClient.DEFAULT_CONNECTION_TIMEOUT, new ZNRecordSerializer());
+ ZKHelixAdmin admin = new ZKHelixAdmin(zkclient);
+
+ // add cluster
+ admin.addCluster(clusterName, true);
+
+ // add state model definition
+ StateModelConfigGenerator generator = new StateModelConfigGenerator();
+ admin.addStateModelDef(clusterName, "OnlineOffline",
+ new StateModelDefinition(generator.generateConfigForOnlineOffline()));
+
+ // add resource "topic" which has 6 partitions
+ String resourceName = "rabbitmq-consumer-group";
+ admin.addResource(clusterName, resourceName, 6, "OnlineOffline", "AUTO_REBALANCE");
+```
+
+Starting the consumers
+----------------------
+The only thing consumers need to know is the zkaddress, cluster name and consumer id. It does not need to know anything else.
+
+```
+ _manager =
+ HelixManagerFactory.getZKHelixManager(_clusterName,
+ _consumerId,
+ InstanceType.PARTICIPANT,
+ _zkAddr);
+
+ StateMachineEngine stateMach = _manager.getStateMachineEngine();
+ ConsumerStateModelFactory modelFactory =
+ new ConsumerStateModelFactory(_consumerId, _mqServer);
+ stateMach.registerStateModelFactory("OnlineOffline", modelFactory);
+
+ _manager.connect();
+
+```
+
+Once the consumer has registered the statemodel and the controller is started, the consumer starts getting callbacks (onBecomeOnlineFromOffline) for the partition it needs to host. All it needs to do as part of the callback is to start consuming messages from the appropriate queue. Similarly, when the controller deallocates a partitions from a consumer, it fires onBecomeOfflineFromOnline for the same partition.
+As a part of this transition, the consumer will stop consuming from a that queue.
+
+```
+ @Transition(to = "ONLINE", from = "OFFLINE")
+ public void onBecomeOnlineFromOffline(Message message, NotificationContext context)
+ {
+ LOG.debug(_consumerId + " becomes ONLINE from OFFLINE for " + _partition);
+
+ if (_thread == null)
+ {
+ LOG.debug("Starting ConsumerThread for " + _partition + "...");
+ _thread = new ConsumerThread(_partition, _mqServer, _consumerId);
+ _thread.start();
+ LOG.debug("Starting ConsumerThread for " + _partition + " done");
+
+ }
+ }
+
+ @Transition(to = "OFFLINE", from = "ONLINE")
+ public void onBecomeOfflineFromOnline(Message message, NotificationContext context)
+ throws InterruptedException
+ {
+ LOG.debug(_consumerId + " becomes OFFLINE from ONLINE for " + _partition);
+
+ if (_thread != null)
+ {
+ LOG.debug("Stopping " + _consumerId + " for " + _partition + "...");
+
+ _thread.interrupt();
+ _thread.join(2000);
+ _thread = null;
+ LOG.debug("Stopping " + _consumerId + " for " + _partition + " done");
+
+ }
+ }
+```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md b/site-releases/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
new file mode 100644
index 0000000..f8a74a0
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
@@ -0,0 +1,165 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+Near real time rsync replicated file system
+===========================================
+
+Quickdemo
+---------
+
+* This demo starts 3 instances with id's as ```localhost_12001, localhost_12002, localhost_12003```
+* Each instance stores its files under ```/tmp/<id>/filestore```
+* ``` localhost_12001 ``` is designated as the master and ``` localhost_12002 and localhost_12003``` are the slaves.
+* Files written to master are replicated to the slaves automatically. In this demo, a.txt and b.txt are written to ```/tmp/localhost_12001/filestore``` and it gets replicated to other folders.
+* When the master is stopped, ```localhost_12002``` is promoted to master.
+* The other slave ```localhost_12003``` stops replicating from ```localhost_12001``` and starts replicating from new master ```localhost_12002```
+* Files written to new master ```localhost_12002``` are replicated to ```localhost_12003```
+* In the end state of this quick demo, ```localhost_12002``` is the master and ```localhost_12003``` is the slave. Manually create files under ```/tmp/localhost_12002/filestore``` and see that appears in ```/tmp/localhost_12003/filestore```
+* Ignore the interrupted exceptions on the console :-).
+
+
+```
+git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+cd recipes/rsync-replicated-file-system/
+mvn clean install package -DskipTests
+cd target/rsync-replicated-file-system-pkg/bin
+chmod +x *
+./quickdemo
+
+```
+
+Overview
+--------
+
+There are many applications that require storage for storing large number of relatively small data files. Examples include media stores to store small videos, images, mail attachments etc. Each of these objects is typically kilobytes, often no larger than a few megabytes. An additional distinguishing feature of these usecases is also that files are typically only added or deleted, rarely updated. When there are updates, they are rare and do not have any concurrency requirements.
+
+These are much simpler requirements than what general purpose distributed file system have to satisfy including concurrent access to files, random access for reads and updates, posix compliance etc. To satisfy those requirements, general DFSs are also pretty complex that are expensive to build and maintain.
+
+A different implementation of a distributed file system includes HDFS which is inspired by Google's GFS. This is one of the most widely used distributed file system that forms the main data storage platform for Hadoop. HDFS is primary aimed at processing very large data sets and distributes files across a cluster of commodity servers by splitting up files in fixed size chunks. HDFS is not particularly well suited for storing a very large number of relatively tiny files.
+
+### File Store
+
+It's possible to build a vastly simpler system for the class of applications that have simpler requirements as we have pointed out.
+
+* Large number of files but each file is relatively small.
+* Access is limited to create, delete and get entire files.
+* No updates to files that are already created (or it's feasible to delete the old file and create a new one).
+
+
+We call this system a Partitioned File Store (PFS) to distinguish it from other distributed file systems. This system needs to provide the following features:
+
+* CRD access to large number of small files
+* Scalability: Files should be distributed across a large number of commodity servers based on the storage requirement.
+* Fault-tolerance: Each file should be replicated on multiple servers so that individual server failures do not reduce availability.
+* Elasticity: It should be possible to add capacity to the cluster easily.
+
+
+Apache Helix is a generic cluster management framework that makes it very easy to provide the scalability, fault-tolerance and elasticity features.
+Rsync can be easily used as a replication channel between servers so that each file gets replicated on multiple servers.
+
+Design
+------
+
+High level
+
+* Partition the file system based on the file name.
+* At any time a single writer can write, we call this a master.
+* For redundancy, we need to have additional replicas called slave. Slaves can optionally serve reads.
+* Slave replicates data from the master.
+* When a master fails, slave gets promoted to master.
+
+### Transaction log
+
+Every write on the master will result in creation/deletion of one or more files. In order to maintain timeline consistency slaves need to apply the changes in the same order.
+To facilitate this, the master logs each transaction in a file and each transaction is associated with an 64 bit id in which the 32 LSB represents a sequence number and MSB represents the generation number.
+Sequence gets incremented on every transaction and and generation is increment when a new master is elected.
+
+### Replication
+
+Replication is required to slave to keep up with the changes on the master. Every time the slave applies a change it checkpoints the last applied transaction id.
+During restarts, this allows the slave to pull changes from the last checkpointed id. Similar to master, the slave logs each transaction to the transaction logs but instead of generating new transaction id, it uses the same id generated by the master.
+
+
+### Fail over
+
+When a master fails, a new slave will be promoted to master. If the prev master node is reachable, then the new master will flush all the
+changes from previous master before taking up mastership. The new master will record the end transaction id of the current generation and then starts new generation
+with sequence starting from 1. After this the master will begin accepting writes.
+
+
+
+
+
+
+Rsync based solution
+-------------------
+
+
+
+
+This application demonstrate a file store that uses rsync as the replication mechanism. One can envision a similar system where instead of using rsync,
+can implement a custom solution to notify the slave of the changes and also provide an api to pull the change files.
+#### Concept
+* file_store_dir: Root directory for the actual data files
+* change_log_dir: The transaction logs are generated under this folder.
+* check_point_dir: The slave stores the check points ( last processed transaction) here.
+
+#### Master
+* File server: This component support file uploads and downloads and writes the files to ```file_store_dir```. This is not included in this application. Idea is that most applications have different ways of implementing this component and has some business logic associated with it. It is not hard to come up with such a component if needed.
+* File store watcher: This component watches the ```file_store_dir``` directory on the local file system for any changes and notifies the registered listeners of the changes.
+* Change Log Generator: This registers as a listener of File System Watcher and on each notification logs the changes into a file under ```change_log_dir```.
+
+####Slave
+* File server: This component on the slave will only support reads.
+* Cluster state observer: Slave observes the cluster state and is able to know who is the current master.
+* Replicator: This has two subcomponents
+ - Periodic rsync of change log: This is a background process that periodically rsyncs the ```change_log_dir``` of the master to its local directory
+ - Change Log Watcher: This watches the ```change_log_dir``` for changes and notifies the registered listeners of the change
+ - On demand rsync invoker: This is registered as a listener to change log watcher and on every change invokes rsync to sync only the changed file.
+
+
+#### Coordination
+
+The coordination between nodes is done by Helix. Helix does the partition management and assigns the partition to multiple nodes based on the replication factor. It elects one the nodes as master and designates others as slaves.
+It provides notifications to each node in the form of state transitions ( Offline to Slave, Slave to Master). It also provides notification when there is change is cluster state.
+This allows the slave to stop replicating from current master and start replicating from new master.
+
+In this application, we have only one partition but its very easy to extend it to support multiple partitions. By partitioning the file store, one can add new nodes and Helix will automatically
+re-distribute partitions among the nodes. To summarize, Helix provides partition management, fault tolerance and facilitates automated cluster expansion.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md b/site-releases/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md
new file mode 100644
index 0000000..8e06ead
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md
@@ -0,0 +1,191 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+Service Discovery
+-----------------
+
+One of the common usage of zookeeper is enable service discovery.
+The basic idea is that when a server starts up it advertises its configuration/metadata such as host name port etc on zookeeper.
+This allows clients to dynamically discover the servers that are currently active. One can think of this like a service registry to which a server registers when it starts and
+is automatically deregistered when it shutdowns or crashes. In many cases it serves as an alternative to vips.
+
+The core idea behind this is to use zookeeper ephemeral nodes. The ephemeral nodes are created when the server registers and all its metadata is put into a znode.
+When the server shutdowns, zookeeper automatically removes this znode.
+
+There are two ways the clients can dynamically discover the active servers
+
+#### ZOOKEEPER WATCH
+
+Clients can set a child watch under specific path on zookeeper.
+When a new service is registered/deregistered, zookeeper notifies the client via watchevent and the client can read the list of services. Even though this looks trivial,
+there are lot of things one needs to keep in mind like ensuring that you first set the watch back on zookeeper before reading data from zookeeper.
+
+
+#### POLL
+
+Another approach is for the client to periodically read the zookeeper path and get the list of services.
+
+
+Both approaches have pros and cons, for example setting a watch might trigger herd effect if there are large number of clients. This is worst especially when servers are starting up.
+But good thing about setting watch is that clients are immediately notified of a change which is not true in case of polling.
+In some cases, having both WATCH and POLL makes sense, WATCH allows one to get notifications as soon as possible while POLL provides a safety net if a watch event is missed because of code bug or zookeeper fails to notify.
+
+##### Other important scenarios to take care of
+* What happens when zookeeper session expires. All the watches/ephemeral nodes previously added/created by this server are lost.
+One needs to add the watches again , recreate the ephemeral nodes etc.
+* Due to network issues or java GC pauses session expiry might happen again and again also known as flapping. Its important for the server to detect this and deregister itself.
+
+##### Other operational things to consider
+* What if the node is behaving badly, one might kill the server but will lose the ability to debug.
+It would be nice to have the ability to mark a server as disabled and clients know that a node is disabled and will not contact that node.
+
+#### Configuration ownership
+
+This is an important aspect that is often ignored in the initial stages of your development. In common, service discovery pattern means that servers start up with some configuration and then simply puts its configuration/metadata in zookeeper. While this works well in the beginning,
+configuration management becomes very difficult since the servers themselves are statically configured. Any change in server configuration implies restarting of the server. Ideally, it will be nice to have the ability to change configuration dynamically without having to restart a server.
+
+Ideally you want a hybrid solution, a node starts with minimal configuration and gets the rest of configuration from zookeeper.
+
+h3. How to use Helix to achieve this
+
+Even though Helix has higher level abstraction in terms of statemachine, constraints and objectives,
+service discovery is one of things that existed since we started.
+The controller uses the exact mechanism we described above to discover when new servers join the cluster.
+We create these znodes under /CLUSTERNAME/LIVEINSTANCES.
+Since at any time there is only one controller, we use ZK watch to track the liveness of a server.
+
+This recipe, simply demonstrate how one can re-use that part for implementing service discovery. This demonstrates multiple MODE's of service discovery
+
+* POLL: The client reads from zookeeper at regular intervals 30 seconds. Use this if you have 100's of clients
+* WATCH: The client sets up watcher and gets notified of the changes. Use this if you have 10's of clients.
+* NONE: This does neither of the above, but reads directly from zookeeper when ever needed.
+
+Helix provides these additional features compared to other implementations available else where
+
+* It has the concept of disabling a node which means that a badly behaving node, can be disabled using helix admin api.
+* It automatically detects if a node connects/disconnects from zookeeper repeatedly and disables the node.
+* Configuration management
+ * Allows one to set configuration via admin api at various granulaties like cluster, instance, resource, partition
+ * Configuration can be dynamically changed.
+ * Notifies the server when configuration changes.
+
+
+##### checkout and build
+
+```
+git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+cd incubator-helix
+mvn clean install package -DskipTests
+cd recipes/service-discovery/target/service-discovery-pkg/bin
+chmod +x *
+```
+
+##### start zookeeper
+
+```
+./start-standalone-zookeeper 2199
+```
+
+#### Run the demo
+
+```
+./service-discovery-demo.sh
+```
+
+#### Output
+
+```
+START:Service discovery demo mode:WATCH
+ Registering service
+ host.x.y.z_12000
+ host.x.y.z_12001
+ host.x.y.z_12002
+ host.x.y.z_12003
+ host.x.y.z_12004
+ SERVICES AVAILABLE
+ SERVICENAME HOST PORT
+ myServiceName host.x.y.z 12000
+ myServiceName host.x.y.z 12001
+ myServiceName host.x.y.z 12002
+ myServiceName host.x.y.z 12003
+ myServiceName host.x.y.z 12004
+ Deregistering service:
+ host.x.y.z_12002
+ SERVICES AVAILABLE
+ SERVICENAME HOST PORT
+ myServiceName host.x.y.z 12000
+ myServiceName host.x.y.z 12001
+ myServiceName host.x.y.z 12003
+ myServiceName host.x.y.z 12004
+ Registering service:host.x.y.z_12002
+END:Service discovery demo mode:WATCH
+=============================================
+START:Service discovery demo mode:POLL
+ Registering service
+ host.x.y.z_12000
+ host.x.y.z_12001
+ host.x.y.z_12002
+ host.x.y.z_12003
+ host.x.y.z_12004
+ SERVICES AVAILABLE
+ SERVICENAME HOST PORT
+ myServiceName host.x.y.z 12000
+ myServiceName host.x.y.z 12001
+ myServiceName host.x.y.z 12002
+ myServiceName host.x.y.z 12003
+ myServiceName host.x.y.z 12004
+ Deregistering service:
+ host.x.y.z_12002
+ Sleeping for poll interval:30000
+ SERVICES AVAILABLE
+ SERVICENAME HOST PORT
+ myServiceName host.x.y.z 12000
+ myServiceName host.x.y.z 12001
+ myServiceName host.x.y.z 12003
+ myServiceName host.x.y.z 12004
+ Registering service:host.x.y.z_12002
+END:Service discovery demo mode:POLL
+=============================================
+START:Service discovery demo mode:NONE
+ Registering service
+ host.x.y.z_12000
+ host.x.y.z_12001
+ host.x.y.z_12002
+ host.x.y.z_12003
+ host.x.y.z_12004
+ SERVICES AVAILABLE
+ SERVICENAME HOST PORT
+ myServiceName host.x.y.z 12000
+ myServiceName host.x.y.z 12001
+ myServiceName host.x.y.z 12002
+ myServiceName host.x.y.z 12003
+ myServiceName host.x.y.z 12004
+ Deregistering service:
+ host.x.y.z_12000
+ SERVICES AVAILABLE
+ SERVICENAME HOST PORT
+ myServiceName host.x.y.z 12001
+ myServiceName host.x.y.z 12002
+ myServiceName host.x.y.z 12003
+ myServiceName host.x.y.z 12004
+ Registering service:host.x.y.z_12000
+END:Service discovery demo mode:NONE
+=============================================
+
+```
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md b/site-releases/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md
new file mode 100644
index 0000000..f0474e4
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md
@@ -0,0 +1,204 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Distributed task execution
+
+
+This recipe is intended to demonstrate how task dependencies can be modeled using primitives provided by Helix. A given task can be run with desired parallelism and will start only when up-stream dependencies are met. The demo executes the task DAG described below using 10 workers. Although the demo starts the workers as threads, there is no requirement that all the workers need to run in the same process. In reality, these workers run on many different boxes on a cluster. When worker fails, Helix takes care of
+re-assigning a failed task partition to a new worker.
+
+Redis is used as a result store. Any other suitable implementation for TaskResultStore can be plugged in.
+
+### Workflow
+
+
+#### Input
+
+10000 impression events and around 100 click events are pre-populated in task result store (redis).
+
+* **ImpEvent**: format: id,isFraudulent,country,gender
+
+* **ClickEvent**: format: id,isFraudulent,impEventId
+
+#### Stages
+
++ **FilterImps**: Filters impression where isFraudulent=true.
+
++ **FilterClicks**: Filters clicks where isFraudulent=true
+
++ **impCountsByGender**: Generates impression counts grouped by gender. It does this by incrementing the count for 'impression_gender_counts:<gender_value>' in the task result store (redis hash). Depends on: **FilterImps**
+
++ **impCountsByCountry**: Generates impression counts grouped by country. It does this by incrementing the count for 'impression_country_counts:<country_value>' in the task result store (redis hash). Depends on: **FilterClicks**
+
++ **impClickJoin**: Joins clicks with corresponding impression event using impEventId as the join key. Join is needed to pull dimensions not present in click event. Depends on: **FilterImps, FilterClicks**
+
++ **clickCountsByGender**: Generates click counts grouped by gender. It does this by incrementing the count for click_gender_counts:<gender_value> in the task result store (redis hash). Depends on: **impClickJoin**
+
++ **clickCountsByGender**: Generates click counts grouped by country. It does this by incrementing the count for click_country_counts:<country_value> in the task result store (redis hash). Depends on: **impClickJoin**
+
++ **report**: Reads from all aggregates generated by previous stages and prints them. Depends on: **impCountsByGender, impCountsByCountry, clickCountsByGender,clickCountsByGender**
+
+
+### Creating DAG
+
+Each stage is represented as a Node along with the upstream dependency and desired parallelism. Each stage is modelled as a resource in Helix using OnlineOffline state model. As part of Offline to Online transition, we watch the external view of upstream resources and wait for them to transition to online state. See Task.java for additional info.
+
+```
+
+ Dag dag = new Dag();
+ dag.addNode(new Node("filterImps", 10, ""));
+ dag.addNode(new Node("filterClicks", 5, ""));
+ dag.addNode(new Node("impClickJoin", 10, "filterImps,filterClicks"));
+ dag.addNode(new Node("impCountsByGender", 10, "filterImps"));
+ dag.addNode(new Node("impCountsByCountry", 10, "filterImps"));
+ dag.addNode(new Node("clickCountsByGender", 5, "impClickJoin"));
+ dag.addNode(new Node("clickCountsByCountry", 5, "impClickJoin"));
+ dag.addNode(new Node("report",1,"impCountsByGender,impCountsByCountry,clickCountsByGender,clickCountsByCountry"));
+
+
+```
+
+### DEMO
+
+In order to run the demo, use the following steps
+
+See http://redis.io/topics/quickstart on how to install redis server
+
+```
+
+Start redis e.g:
+./redis-server --port 6379
+
+git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+cd recipes/task-execution
+mvn clean install package -DskipTests
+cd target/task-execution-pkg/bin
+chmod +x task-execution-demo.sh
+./task-execution-demo.sh 2181 localhost 6379
+
+```
+
+```
+
+
+
+
+
+ +-----------------+ +----------------+
+ | filterImps | | filterClicks |
+ | (parallelism=10)| | (parallelism=5)|
+ +----------+-----++ +-------+--------+
+ | | | |
+ | | | |
+ | | | |
+ | | +------->--------v------------+
+ +--------------<-+ +------v-------+ | impClickJoin |
+ |impCountsByGender |impCountsByCountry | (parallelism=10) |
+ |(parallelism=10) |(parallelism=10) ++-------------------+-+
+ +-----------+--+ +---+----------+ | |
+ | | | |
+ | | | |
+ | | +--------v---------+ +-v-------------------+
+ | | |clickCountsByGender |clickCountsByCountry |
+ | | |(parallelism=5) | |(parallelism=5) |
+ | | +----+-------------+ +---------------------+
+ | | | |
+ | | | |
+ | | | |
+ +----->+-----+>-----------v----+<---------------+
+ | report |
+ |(parallelism=1) |
+ +-----------------------+
+
+```
+
+(credit for above ascii art: http://www.asciiflow.com)
+
+### OUTPUT
+
+```
+Done populating dummy data
+Executing filter task for filterImps_3 for impressions_demo
+Executing filter task for filterImps_2 for impressions_demo
+Executing filter task for filterImps_0 for impressions_demo
+Executing filter task for filterImps_1 for impressions_demo
+Executing filter task for filterImps_4 for impressions_demo
+Executing filter task for filterClicks_3 for clicks_demo
+Executing filter task for filterClicks_1 for clicks_demo
+Executing filter task for filterImps_8 for impressions_demo
+Executing filter task for filterImps_6 for impressions_demo
+Executing filter task for filterClicks_2 for clicks_demo
+Executing filter task for filterClicks_0 for clicks_demo
+Executing filter task for filterImps_7 for impressions_demo
+Executing filter task for filterImps_5 for impressions_demo
+Executing filter task for filterClicks_4 for clicks_demo
+Executing filter task for filterImps_9 for impressions_demo
+Running AggTask for impCountsByGender_3 for filtered_impressions_demo gender
+Running AggTask for impCountsByGender_2 for filtered_impressions_demo gender
+Running AggTask for impCountsByGender_0 for filtered_impressions_demo gender
+Running AggTask for impCountsByGender_9 for filtered_impressions_demo gender
+Running AggTask for impCountsByGender_1 for filtered_impressions_demo gender
+Running AggTask for impCountsByGender_4 for filtered_impressions_demo gender
+Running AggTask for impCountsByCountry_4 for filtered_impressions_demo country
+Running AggTask for impCountsByGender_5 for filtered_impressions_demo gender
+Executing JoinTask for impClickJoin_2
+Running AggTask for impCountsByCountry_3 for filtered_impressions_demo country
+Running AggTask for impCountsByCountry_1 for filtered_impressions_demo country
+Running AggTask for impCountsByCountry_0 for filtered_impressions_demo country
+Running AggTask for impCountsByCountry_2 for filtered_impressions_demo country
+Running AggTask for impCountsByGender_6 for filtered_impressions_demo gender
+Executing JoinTask for impClickJoin_1
+Executing JoinTask for impClickJoin_0
+Executing JoinTask for impClickJoin_3
+Running AggTask for impCountsByGender_8 for filtered_impressions_demo gender
+Executing JoinTask for impClickJoin_4
+Running AggTask for impCountsByGender_7 for filtered_impressions_demo gender
+Running AggTask for impCountsByCountry_5 for filtered_impressions_demo country
+Running AggTask for impCountsByCountry_6 for filtered_impressions_demo country
+Executing JoinTask for impClickJoin_9
+Running AggTask for impCountsByCountry_8 for filtered_impressions_demo country
+Running AggTask for impCountsByCountry_7 for filtered_impressions_demo country
+Executing JoinTask for impClickJoin_5
+Executing JoinTask for impClickJoin_6
+Running AggTask for impCountsByCountry_9 for filtered_impressions_demo country
+Executing JoinTask for impClickJoin_8
+Executing JoinTask for impClickJoin_7
+Running AggTask for clickCountsByCountry_1 for joined_clicks_demo country
+Running AggTask for clickCountsByCountry_0 for joined_clicks_demo country
+Running AggTask for clickCountsByCountry_2 for joined_clicks_demo country
+Running AggTask for clickCountsByCountry_3 for joined_clicks_demo country
+Running AggTask for clickCountsByGender_1 for joined_clicks_demo gender
+Running AggTask for clickCountsByCountry_4 for joined_clicks_demo country
+Running AggTask for clickCountsByGender_3 for joined_clicks_demo gender
+Running AggTask for clickCountsByGender_2 for joined_clicks_demo gender
+Running AggTask for clickCountsByGender_4 for joined_clicks_demo gender
+Running AggTask for clickCountsByGender_0 for joined_clicks_demo gender
+Running reports task
+Impression counts per country
+{CANADA=1940, US=1958, CHINA=2014, UNKNOWN=2022, UK=1946}
+Click counts per country
+{US=24, CANADA=14, CHINA=26, UNKNOWN=14, UK=22}
+Impression counts per gender
+{F=3325, UNKNOWN=3259, M=3296}
+Click counts per gender
+{F=33, UNKNOWN=32, M=35}
+
+
+```
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_admin.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_admin.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_admin.md
new file mode 100644
index 0000000..57f34fc
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_admin.md
@@ -0,0 +1,167 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Admin Operations
+
+Helix provides interfaces for the operator to administer the cluster. For convenience, there is a command line interface as well as a REST interface.
+
+### Helix Admin operations
+
+First, make sure you get to the command-line tool, or include it in your shell PATH.
+
+```
+cd helix/helix-core/target/helix-core-pkg/bin
+```
+
+Get help
+
+```
+./helix-admin.sh --help
+```
+
+All other commands have this form:
+
+```
+./helix-admin.sh --zkSvr <ZookeeperServerAddress (Required)> <command> <parameters>
+```
+
+Now, here are the admin commands:
+
+Add a new cluster
+
+```
+ --addCluster <clusterName>
+```
+
+Add a new Instance to a cluster
+
+```
+ --addNode <clusterName> <InstanceAddress (host:port)>
+```
+
+Add a State model to a cluster
+_WE NEED A SPEC FOR A VALID STATE MODEL_
+
+```
+ --addStateModelDef <clusterName> <filename>>
+```
+
+Add a resource to a cluster
+
+```
+ --addResource <clusterName> <resourceName> <partitionNum> <stateModelRef> <mode (AUTO_REBALANCE|AUTO|CUSTOM)>
+```
+
+Upload an IdealState (Partition to Node Mapping)
+_WE NEED A SPEC FOR A VALID IDEAL STATE_
+
+```
+ --addIdealState <clusterName> <resourceName> <filename>
+```
+
+Delete a cluster
+
+```
+ --dropCluster <clusterName>
+```
+
+Delete a resource (drop an existing resource from a cluster)
+
+```
+ --dropResource <clusterName> <resourceName>
+```
+
+Drop an existing instance from a cluster
+
+```
+ --dropNode <clusterName> <InstanceAddress (host:port)>
+```
+
+Enable/disable the entire cluster. This will pause the controller, which means no transitions will be trigger, but the existing nodes in the cluster continue to function, but without any management by the controller.
+
+```
+ --enableCluster <clusterName> <true/false>
+```
+
+Enable/disable an instance. Useful to take a node out of the cluster for maintenance/upgrade.
+
+```
+ --enableInstance <clusterName> <InstanceName> <true/false>
+```
+
+Enable/disable a partition
+
+```
+ --enablePartition <clusterName> <instanceName> <resourceName> <partitionName> <true/false>
+```
+
+Query info of a cluster
+
+```
+ --listClusterInfo <clusterName>
+```
+
+List existing clusters (remember, Helix can manage multiple clusters)
+
+```
+ --listClusters
+```
+
+Query info of a single Instance in a cluster
+
+```
+ --listInstanceInfo <clusterName> <InstanceName>
+```
+
+List instances in a cluster
+
+```
+ --listInstances <clusterName>
+```
+
+Query info of a partition
+
+```
+ --listPartitionInfo <clusterName> <resourceName> <partitionName>
+```
+
+Query info of a resource
+
+```
+ --listResourceInfo <clusterName> <resourceName>
+```
+
+List resources hosted in a cluster
+
+```
+ --listResources <clusterName>
+```
+
+Query info of a state model in a cluster
+
+```
+ --listStateModel <clusterName> <stateModelName>
+```
+
+Query info of state models in a cluster
+
+```
+ --listStateModels <clusterName>
+```
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_controller.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_controller.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_controller.md
new file mode 100644
index 0000000..17cd532
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_controller.md
@@ -0,0 +1,90 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Controller
+
+Next, let\'s implement the controller. This is the brain of the cluster. Helix makes sure there is exactly one active controller running the cluster.
+
+### Start the Helix agent
+
+
+It requires the following parameters:
+
+* clusterName: A logical name to represent the group of nodes
+* instanceName: A logical name of the process creating the manager instance. Generally this is host:port.
+* instanceType: Type of the process. This can be one of the following types, in this case use CONTROLLER:
+ * CONTROLLER: Process that controls the cluster, any number of controllers can be started but only one will be active at any given time.
+ * PARTICIPANT: Process that performs the actual task in the distributed system.
+ * SPECTATOR: Process that observes the changes in the cluster.
+ * ADMIN: To carry out system admin actions.
+* zkConnectString: Connection string to Zookeeper. This is of the form host1:port1,host2:port2,host3:port3.
+
+```
+ manager = HelixManagerFactory.getZKHelixManager(clusterName,
+ instanceName,
+ instanceType,
+ zkConnectString);
+```
+
+### Controller Code
+
+The Controller needs to know about all changes in the cluster. Helix takes care of this with the default implementation.
+If you need additional functionality, see GenericHelixController on how to configure the pipeline.
+
+```
+ manager = HelixManagerFactory.getZKHelixManager(clusterName,
+ instanceName,
+ InstanceType.CONTROLLER,
+ zkConnectString);
+ manager.connect();
+ GenericHelixController controller = new GenericHelixController();
+ manager.addConfigChangeListener(controller);
+ manager.addLiveInstanceChangeListener(controller);
+ manager.addIdealStateChangeListener(controller);
+ manager.addExternalViewChangeListener(controller);
+ manager.addControllerListener(controller);
+```
+The snippet above shows how the controller is started. You can also start the controller using command line interface.
+
+```
+cd helix/helix-core/target/helix-core-pkg/bin
+./run-helix-controller.sh --zkSvr <Zookeeper ServerAddress (Required)> --cluster <Cluster name (Required)>
+```
+
+### Controller deployment modes
+
+Helix provides multiple options to deploy the controller.
+
+#### STANDALONE
+
+The Controller can be started as a separate process to manage a cluster. This is the recommended approach. However, since one controller can be a single point of failure, multiple controller processes are required for reliability. Even if multiple controllers are running, only one will be actively managing the cluster at any time and is decided by a leader-election process. If the leader fails, another leader will take over managing the cluster.
+
+Even though we recommend this method of deployment, it has the drawback of having to manage an additional service for each cluster. See Controller As a Service option.
+
+#### EMBEDDED
+
+If setting up a separate controller process is not viable, then it is possible to embed the controller as a library in each of the participants.
+
+#### CONTROLLER AS A SERVICE
+
+One of the cool feature we added in Helix was to use a set of controllers to manage a large number of clusters.
+
+For example if you have X clusters to be managed, instead of deploying X*3 (3 controllers for fault tolerance) controllers for each cluster, one can deploy just 3 controllers. Each controller can manage X/3 clusters. If any controller fails, the remaining two will manage X/2 clusters.
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_health.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_health.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_health.md
new file mode 100644
index 0000000..ae29436
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_health.md
@@ -0,0 +1,42 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Customizing Health Checks
+
+In this chapter, we\'ll learn how to customize the health check, based on metrics of your distributed system.
+
+### Health Checks
+
+Note: _this in currently in development mode, not yet ready for production._
+
+Helix provides the ability for each node in the system to report health metrics on a periodic basis.
+
+Helix supports multiple ways to aggregate these metrics:
+
+* SUM
+* AVG
+* EXPONENTIAL DECAY
+* WINDOW
+
+Helix persists the aggregated value only.
+
+Applications can define a threshold on the aggregate values according to the SLAs, and when the SLA is violated Helix will fire an alert.
+Currently Helix only fires an alert, but in a future release we plan to use these metrics to either mark the node dead or load balance the partitions.
+This feature will be valuable for distributed systems that support multi-tenancy and have a large variation in work load patterns. In addition, this can be used to detect skewed partitions (hotspots) and rebalance the cluster.
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_messaging.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_messaging.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_messaging.md
new file mode 100644
index 0000000..2dda826
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_messaging.md
@@ -0,0 +1,67 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Messaging
+
+In this chapter, we\'ll learn about messaging, a convenient feature in Helix for sending messages between nodes of a cluster. This is an interesting feature which is quite useful in practice. It is common that nodes in a distributed system require a mechanism to interact with each other.
+
+### Example: Bootstrapping a Replica
+
+Consider a search system where the index replica starts up and it does not have an index. A typical solution is to get the index from a common location, or to copy the index from another replica.
+
+Helix provides a messaging api for intra-cluster communication between nodes in the system. Helix provides a mechanism to specify the message recipient in terms of resource, partition, and state rather than specifying hostnames. Helix ensures that the message is delivered to all of the required recipients. In this particular use case, the instance can specify the recipient criteria as all replicas of the desired partition to bootstrap.
+Since Helix is aware of the global state of the system, it can send the message to appropriate nodes. Once the nodes respond, Helix provides the bootstrapping replica with all the responses.
+
+This is a very generic api and can also be used to schedule various periodic tasks in the cluster, such as data backups, log cleanup, etc.
+System Admins can also perform ad-hoc tasks, such as on-demand backups or a system command (such as rm -rf ;) across all nodes of the cluster
+
+```
+ ClusterMessagingService messagingService = manager.getMessagingService();
+
+ // Construct the Message
+ Message requestBackupUriRequest = new Message(
+ MessageType.USER_DEFINE_MSG, UUID.randomUUID().toString());
+ requestBackupUriRequest
+ .setMsgSubType(BootstrapProcess.REQUEST_BOOTSTRAP_URL);
+ requestBackupUriRequest.setMsgState(MessageState.NEW);
+
+ // Set the Recipient criteria: all nodes that satisfy the criteria will receive the message
+ Criteria recipientCriteria = new Criteria();
+ recipientCriteria.setInstanceName("%");
+ recipientCriteria.setRecipientInstanceType(InstanceType.PARTICIPANT);
+ recipientCriteria.setResource("MyDB");
+ recipientCriteria.setPartition("");
+
+ // Should be processed only by process(es) that are active at the time of sending the message
+ // This means if the recipient is restarted after message is sent, it will not be processe.
+ recipientCriteria.setSessionSpecific(true);
+
+ // wait for 30 seconds
+ int timeout = 30000;
+
+ // the handler that will be invoked when any recipient responds to the message.
+ BootstrapReplyHandler responseHandler = new BootstrapReplyHandler();
+
+ // this will return only after all recipients respond or after timeout
+ int sentMessageCount = messagingService.sendAndWait(recipientCriteria,
+ requestBackupUriRequest, responseHandler, timeout);
+```
+
+See HelixManager.DefaultMessagingService in [Javadocs](./apidocs/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more info.
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_participant.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_participant.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_participant.md
new file mode 100644
index 0000000..19e6f98
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_participant.md
@@ -0,0 +1,100 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Participant
+
+In this chapter, we\'ll learn how to implement a PARTICIPANT, which is a primary functional component of a distributed system.
+
+
+### Start the Helix agent
+
+The Helix agent is a common component that connects each system component with the controller.
+
+It requires the following parameters:
+
+* clusterName: A logical name to represent the group of nodes
+* instanceName: A logical name of the process creating the manager instance. Generally this is host:port.
+* instanceType: Type of the process. This can be one of the following types, in this case, use PARTICIPANT
+ * CONTROLLER: Process that controls the cluster, any number of controllers can be started but only one will be active at any given time.
+ * PARTICIPANT: Process that performs the actual task in the distributed system.
+ * SPECTATOR: Process that observes the changes in the cluster.
+ * ADMIN: To carry out system admin actions.
+* zkConnectString: Connection string to Zookeeper. This is of the form host1:port1,host2:port2,host3:port3.
+
+After the Helix manager instance is created, only thing that needs to be registered is the state model factory.
+The methods of the State Model will be called when controller sends transitions to the Participant. In this example, we'll use the OnlineOffline factory. Other options include:
+
+* MasterSlaveStateModelFactory
+* LeaderStandbyStateModelFactory
+* BootstrapHandler
+
+
+```
+ manager = HelixManagerFactory.getZKHelixManager(clusterName,
+ instanceName,
+ InstanceType.PARTICIPANT,
+ zkConnectString);
+ StateMachineEngine stateMach = manager.getStateMachineEngine();
+
+ //create a stateModelFactory that returns a statemodel object for each partition.
+ stateModelFactory = new OnlineOfflineStateModelFactory();
+ stateMach.registerStateModelFactory(stateModelType, stateModelFactory);
+ manager.connect();
+```
+
+Helix doesn\'t know what it means to change from OFFLIN\-\-\>ONLINE or ONLINE\-\-\>OFFLINE. The following code snippet shows where you insert your system logic for these two state transitions.
+
+```
+public class OnlineOfflineStateModelFactory extends
+ StateModelFactory<StateModel> {
+ @Override
+ public StateModel createNewStateModel(String stateUnitKey) {
+ OnlineOfflineStateModel stateModel = new OnlineOfflineStateModel();
+ return stateModel;
+ }
+ @StateModelInfo(states = "{'OFFLINE','ONLINE'}", initialState = "OFFINE")
+ public static class OnlineOfflineStateModel extends StateModel {
+
+ @Transition(from = "OFFLINE", to = "ONLINE")
+ public void onBecomeOnlineFromOffline(Message message,
+ NotificationContext context) {
+
+ System.out.println("OnlineOfflineStateModel.onBecomeOnlineFromOffline()");
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ // Application logic to handle transition //
+ // For example, you might start a service, run initialization, etc //
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ }
+
+ @Transition(from = "ONLINE", to = "OFFLINE")
+ public void onBecomeOfflineFromOnline(Message message,
+ NotificationContext context) {
+
+ System.out.println("OnlineOfflineStateModel.onBecomeOfflineFromOnline()");
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ // Application logic to handle transition //
+ // For example, you might shutdown a service, log this event, or change monitoring settings //
+ ////////////////////////////////////////////////////////////////////////////////////////////////
+ }
+ }
+}
+```
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/tutorial_propstore.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/tutorial_propstore.md b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_propstore.md
new file mode 100644
index 0000000..af3c60d
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/tutorial_propstore.md
@@ -0,0 +1,30 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial: Application Property Store
+
+In this chapter, we\'ll learn how to use the application property store.
+
+### Property Store
+
+It is common that an application needs support for distributed, shared data structures. Helix uses Zookeeper to store the application data and hence provides notifications when the data changes.
+
+While you could use Zookeeper directly, Helix supports caching the data and a write-through cache. This is far more efficient than reading from Zookeeper for every access.
+
+See [HelixManager.getHelixPropertyStore](./apidocs/reference/org/apache/helix/store/package-summary.html) for details.
[3/3] git commit: [HELIX-270] Refactor website to have
release-specific pages, disable link to 0.6.1 page for now
Posted by ka...@apache.org.
[HELIX-270] Refactor website to have release-specific pages, disable link to 0.6.1 page for now
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/80abba32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/80abba32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/80abba32
Branch: refs/heads/master
Commit: 80abba32529c4f70d6c97d54e0880f3670b7bce3
Parents: 427cc97
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Fri Oct 18 13:08:12 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Fri Oct 18 13:22:24 2013 -0700
----------------------------------------------------------------------
pom.xml | 1 +
site-releases/0.6.1-incubating/pom.xml | 46 ++
.../src/site/apt/privacy-policy.apt | 52 ++
.../releasenotes/release-0.6.0-incubating.apt | 77 +++
.../releasenotes/release-0.6.1-incubating.apt | 110 ++++
.../0.6.1-incubating/src/site/apt/releasing.apt | 107 ++++
.../src/site/markdown/Architecture.md | 248 ++++++++
.../src/site/markdown/Concepts.md | 268 ++++++++
.../src/site/markdown/Features.md | 306 +++++++++
.../src/site/markdown/Quickstart.md | 622 +++++++++++++++++++
.../src/site/markdown/Tutorial.md | 199 ++++++
.../src/site/markdown/UseCases.md | 109 ++++
.../0.6.1-incubating/src/site/markdown/index.md | 132 ++++
.../src/site/markdown/recipes/lock_manager.md | 253 ++++++++
.../markdown/recipes/rabbitmq_consumer_group.md | 227 +++++++
.../recipes/rsync_replicated_file_store.md | 165 +++++
.../site/markdown/recipes/service_discovery.md | 191 ++++++
.../site/markdown/recipes/task_dag_execution.md | 204 ++++++
.../src/site/markdown/tutorial_admin.md | 167 +++++
.../src/site/markdown/tutorial_controller.md | 90 +++
.../src/site/markdown/tutorial_health.md | 42 ++
.../src/site/markdown/tutorial_messaging.md | 67 ++
.../src/site/markdown/tutorial_participant.md | 100 +++
.../src/site/markdown/tutorial_propstore.md | 30 +
.../src/site/markdown/tutorial_rebalance.md | 168 +++++
.../src/site/markdown/tutorial_spectator.md | 72 +++
.../src/site/markdown/tutorial_state.md | 60 ++
.../src/site/markdown/tutorial_throttling.md | 34 +
.../src/site/resources/.htaccess | 20 +
.../src/site/resources/download.cgi | 22 +
.../site/resources/images/HELIX-components.png | Bin 0 -> 82112 bytes
.../src/site/resources/images/PFS-Generic.png | Bin 0 -> 72435 bytes
.../site/resources/images/RSYNC_BASED_PFS.png | Bin 0 -> 78007 bytes
.../resources/images/bootstrap_statemodel.gif | Bin 0 -> 24919 bytes
.../resources/images/helix-architecture.png | Bin 0 -> 282390 bytes
.../src/site/resources/images/helix-logo.jpg | Bin 0 -> 13659 bytes
.../resources/images/helix-znode-layout.png | Bin 0 -> 53074 bytes
.../src/site/resources/images/statemachine.png | Bin 0 -> 41641 bytes
.../src/site/resources/images/system.png | Bin 0 -> 79791 bytes
.../0.6.1-incubating/src/site/site.xml | 114 ++++
.../src/site/xdoc/download.xml.vm | 193 ++++++
site-releases/pom.xml | 47 ++
src/site/markdown/Architecture.md | 5 +
src/site/markdown/Concepts.md | 7 +
src/site/markdown/Features.md | 7 +
src/site/markdown/IRC.md | 4 +
src/site/markdown/Quickstart.md | 6 +-
src/site/markdown/Tutorial.md | 6 +-
src/site/markdown/UseCases.md | 4 +
src/site/markdown/index.md | 11 +-
src/site/markdown/tutorial_admin.md | 8 +-
src/site/markdown/tutorial_controller.md | 6 +-
src/site/markdown/tutorial_health.md | 6 +-
src/site/markdown/tutorial_messaging.md | 8 +-
src/site/markdown/tutorial_participant.md | 6 +-
src/site/markdown/tutorial_propstore.md | 8 +-
src/site/markdown/tutorial_rebalance.md | 6 +-
src/site/markdown/tutorial_spectator.md | 6 +-
src/site/markdown/tutorial_state.md | 6 +-
src/site/markdown/tutorial_throttling.md | 6 +-
.../markdown/tutorial_user_def_rebalancer.md | 7 +-
src/site/markdown/tutorial_yaml.md | 6 +-
src/site/xdoc/download.xml.vm | 2 +-
63 files changed, 4655 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c1cf4c..e4e1ebb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,6 +190,7 @@ under the License.
<module>helix-agent</module>
<module>helix-examples</module>
<module>recipes</module>
+ <module>site-releases</module>
</modules>
<mailingLists>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/pom.xml
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/pom.xml b/site-releases/0.6.1-incubating/pom.xml
new file mode 100644
index 0000000..70a2168
--- /dev/null
+++ b/site-releases/0.6.1-incubating/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.helix</groupId>
+ <artifactId>site-releases</artifactId>
+ <version>0.6.2-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>0.6.1-incubating-site</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Helix :: Site :: 0.6.1-incubating</name>
+
+ <properties>
+ </properties>
+
+ <dependencies>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/apt/privacy-policy.apt
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/apt/privacy-policy.apt b/site-releases/0.6.1-incubating/src/site/apt/privacy-policy.apt
new file mode 100644
index 0000000..ada9363
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/apt/privacy-policy.apt
@@ -0,0 +1,52 @@
+ ----
+ Privacy Policy
+ -----
+ Olivier Lamy
+ -----
+ 2013-02-04
+ -----
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+Privacy Policy
+
+ Information about your use of this website is collected using server access logs and a tracking cookie. The
+ collected information consists of the following:
+
+ [[1]] The IP address from which you access the website;
+
+ [[2]] The type of browser and operating system you use to access our site;
+
+ [[3]] The date and time you access our site;
+
+ [[4]] The pages you visit; and
+
+ [[5]] The addresses of pages from where you followed a link to our site.
+
+ []
+
+ Part of this information is gathered using a tracking cookie set by the
+ {{{http://www.google.com/analytics/}Google Analytics}} service and handled by Google as described in their
+ {{{http://www.google.com/privacy.html}privacy policy}}. See your browser documentation for instructions on how to
+ disable the cookie if you prefer not to share this data with Google.
+
+ We use the gathered information to help us make our site more useful to visitors and to better understand how and
+ when our site is used. We do not track or collect personally identifiable information or associate gathered data
+ with any personally identifying information from other sources.
+
+ By using this website, you consent to the collection of this data in the manner and for the purpose described above.
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/apt/releasenotes/release-0.6.0-incubating.apt
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/apt/releasenotes/release-0.6.0-incubating.apt b/site-releases/0.6.1-incubating/src/site/apt/releasenotes/release-0.6.0-incubating.apt
new file mode 100644
index 0000000..16e2fbf
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/apt/releasenotes/release-0.6.0-incubating.apt
@@ -0,0 +1,77 @@
+ -----
+ Release Notes for 0.6.0-incubating Apache Helix
+ -----
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Release Notes for 0.6.0-incubating Apache Helix
+
+ The Apache Helix would like to announce the release of Apache Helix 0.6.0-incubating
+
+ This is the first release in Apache umbrella.
+
+ Helix is a generic cluster management framework used for the automatic management of partitioned, replicated and distributed resources hosted on a cluster of nodes. Helix provides the following features:
+
+ * Automatic assignment of resource/partition to nodes
+
+ * Node failure detection and recovery
+
+ * Dynamic addition of Resources
+
+ * Dynamic addition of nodes to the cluster
+
+ * Pluggable distributed state machine to manage the state of a resource via state transitions
+
+ * Automatic load balancing and throttling of transitions
+
+ []
+
+* Changes
+
+** Bug
+
+ * [HELIX-1] - Use org.apache.helix package for java sources.
+
+ * [HELIX-2] - Remove jsqlparser dependency from Helix
+
+ * [HELIX-3] - Fix license headers in sources.
+
+ * [HELIX-12] - Issue with starting multiple controllers with same name
+
+ * [HELIX-14] - error in helix-core ivy file
+
+ []
+
+** Task
+
+ * [HELIX-4] - Remove deprecated file based implementation
+
+ * [HELIX-5] - Remove deprecated Accessors
+
+ * [HELIX-13] - New usecase to replicate files between replicas using simple rsync
+
+ * [HELIX-15] - Distributed lock manager recipe
+
+ []
+
+ Have Fun
+ --
+ The Apache Helix Team
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/apt/releasenotes/release-0.6.1-incubating.apt
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/apt/releasenotes/release-0.6.1-incubating.apt b/site-releases/0.6.1-incubating/src/site/apt/releasenotes/release-0.6.1-incubating.apt
new file mode 100644
index 0000000..9305214
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/apt/releasenotes/release-0.6.1-incubating.apt
@@ -0,0 +1,110 @@
+ -----
+ Release Notes for 0.6.1-incubating Apache Helix
+ -----
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Release Notes for 0.6.1-incubating Apache Helix
+
+ The Apache Helix would like to announce the release of Apache Helix 0.6.1-incubating
+
+ This is the second release in Apache umbrella.
+
+ Helix is a generic cluster management framework used for the automatic management of partitioned, replicated and distributed resources hosted on a cluster of nodes. Helix provides the following features:
+
+ * Automatic assignment of resource/partition to nodes
+
+ * Node failure detection and recovery
+
+ * Dynamic addition of Resources
+
+ * Dynamic addition of nodes to the cluster
+
+ * Pluggable distributed state machine to manage the state of a resource via state transitions
+
+ * Automatic load balancing and throttling of transitions
+
+ []
+
+* Changes
+
+** Bug
+
+ * [HELIX-25] - setConfig should check if instance exist or not when setting PARTICIPANT config
+
+ * [HELIX-29] - Not receiving transitions after participant reconnection
+
+ * [HELIX-30] - ZkHelixManager.carryOverPreviousCurrentState() should use a special merge logic
+
+ * [HELIX-34] - Remove watches after the node /resource is deleted
+
+ * [HELIX-35] - Support custom instance id format in CLI
+
+ * [HELIX-41] - fix intermittent test failures
+
+ * [HELIX-44] - ZkHelix property store is not checking the validity of path
+
+ * [HELIX-55] - Session timeout setting not honoured
+
+ * [HELIX-75] - ZKHelixManager declares throws Exception
+
+ * [HELIX-76] - ChangeLogGenerator split bug
+
+
+** Improvements
+
+ * [HELIX-31] - Detect flapping and disable the participant/controller/spectator
+
+ * [HELIX-32] - Flapping detection: if a helix manager starts connect/disconnect frequently it should be disconnected
+
+ * [HELIX-64] - Allow application to provide additional metadata while connecting to cluster
+
+ * [HELIX-73] - Remove assumption that Instance.id is always host_port
+
+ * [HELIX-81] - org.apache.helix.manager.zk.ZKUtil#isClusterSetup() should not log error
+
+
+** New Features
+
+ * [HELIX-19] - Allow process to join the cluster dynamically
+
+ * [HELIX-43] - Add support for error->dropped transition
+
+ * [HELIX-45] - Standalone helix agent
+
+ * [HELIX-63] - Make the idealstate computation code pluggable
+
+ * [HELIX-72] - Allow pluggable rebalancer in controller
+
+
+** Tasks
+
+ * [HELIX-16] - Distributed task execution framework sample app
+
+
+ []
+
+ Cheers,
+ --
+ The Apache Helix Team
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/apt/releasing.apt
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/apt/releasing.apt b/site-releases/0.6.1-incubating/src/site/apt/releasing.apt
new file mode 100644
index 0000000..11d0cd9
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/apt/releasing.apt
@@ -0,0 +1,107 @@
+ -----
+ Helix release process
+ -----
+ -----
+ 2012-12-15
+ -----
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
+Helix release process
+
+ [[1]] Post to the dev list a few days before you plan to do an Helix release
+
+ [[2]] Your maven setting must contains the entry to be able to deploy.
+
+ ~/.m2/settings.xml
+
++-------------
+ <server>
+ <id>apache.releases.https</id>
+ <username></username>
+ <password></password>
+ </server>
++-------------
+
+ [[3]] Apache DAV passwords
+
++-------------
+ Add the following info into your ~/.netrc
+ machine git-wip-us.apache.org login <apache username> <password>
+
++-------------
+ [[4]] Release Helix
+ You should have a GPG agent running in the session you will run the maven release commands(preferred), and confirm it works by running "gpg -ab" (type some text and press Ctrl-D).
+ If you do not have a GPG agent running, make sure that you have the "apache-release" profile set in your settings.xml as shown below.
+
+ Run the release
+
++-------------
+mvn release:prepare release:perform -B
++-------------
+
+ GPG configuration in maven settings xml:
+
++-------------
+<profile>
+ <id>apache-release</id>
+ <properties>
+ <gpg.passphrase>[GPG_PASSWORD]</gpg.passphrase>
+ </properties>
+</profile>
++-------------
+
+ [[4]] go to https://repository.apache.org and close your staged repository. Note the repository url (format https://repository.apache.org/content/repositories/orgapachehelix-019/org/apache/helix/helix/0.6-incubating/)
+
++-------------
+svn co https://dist.apache.org/repos/dist/dev/incubator/helix helix-dev-release
+cd helix-dev-release
+sh ./release-script-svn.sh version stagingRepoUrl
+then svn add <new directory created with new version as name>
+then svn ci
++-------------
+
+ [[5]] Validating the release
+
++-------------
+ * Download sources, extract, build and run tests - mvn clean package
+ * Verify license headers - mvn -Prat -DskipTests
+ * Download binaries and .asc files
+ * Download release manager's public key - From the KEYS file, get the release manager's public key finger print and run gpg --keyserver pgpkeys.mit.edu --recv-key <key>
+ * Validate authenticity of key - run gpg --fingerprint <key>
+ * Check signatures of all the binaries using gpg <binary>
++-------------
+
+ [[6]] Call for a vote in the dev list and wait for 72 hrs. for the vote results. 3 binding votes are necessary for the release to be finalized. example
+ After the vote has passed, move the files from dist dev to dist release: svn mv https://dist.apache.org/repos/dist/dev/incubator/helix/version to https://dist.apache.org/repos/dist/release/incubator/helix/
+
+ [[7]] Prepare release note. Add a page in src/site/apt/releasenotes/ and change value of \<currentRelease> in parent pom.
+
+
+ [[8]] Send out an announcement of the release to:
+
+ * users@helix.incubator.apache.org
+
+ * dev@helix.incubator.apache.org
+
+ [[9]] Celebrate !
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/Architecture.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/Architecture.md b/site-releases/0.6.1-incubating/src/site/markdown/Architecture.md
new file mode 100644
index 0000000..7acf590
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/Architecture.md
@@ -0,0 +1,248 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+Helix aims to provide the following abilities to a distributed system:
+
+* Automatic management of a cluster hosting partitioned, replicated resources.
+* Soft and hard failure detection and handling.
+* Automatic load balancing via smart placement of resources on servers(nodes) based on server capacity and resource profile (size of partition, access patterns, etc).
+* Centralized config management and self discovery. Eliminates the need to modify config on each node.
+* Fault tolerance and optimized rebalancing during cluster expansion.
+* Manages entire operational lifecycle of a node. Addition, start, stop, enable/disable without downtime.
+* Monitor cluster health and provide alerts on SLA violation.
+* Service discovery mechanism to route requests.
+
+To build such a system, we need a mechanism to co-ordinate between different nodes/components in the system. This mechanism can be achieved with a software that reacts to any change in the cluster and comes up with a set of tasks needed to bring the cluster to a stable state. The set of tasks will be assigned to one or more nodes in the cluster. Helix serves this purpose of managing the various components in the cluster.
+
+
+
+Distributed System Components
+
+In general any distributed system cluster will have the following
+
+* Set of nodes also referred to as an instance.
+* Set of resources which can be a database, lucene index or a task.
+* Each resource is also partitioned into one or more Partitions.
+* Each partition may have one or more copies called replicas.
+* Each replica can have a state associated with it. For example Master, Slave, Leader, Standby, Online, Offline etc
+
+Roles
+-----
+
+
+
+Not all nodes in a distributed system will perform similar functionality. For e.g, a few nodes might be serving requests, few nodes might be sending the request and some nodes might be controlling the nodes in the cluster. Based on functionality we have grouped them into
+
+We have divided Helix in 3 logical components based on their responsibility
+
+1. PARTICIPANT: The nodes that actually host the distributed resources.
+2. SPECTATOR: The nodes that simply observe the PARTICIPANT State and route the request accordingly. Routers, for example, need to know the Instance on which a partition is hosted and its state in order to route the request to the appropriate end point.
+3. CONTROLLER: The controller observes and controls the PARTICIPANT nodes. It is responsible for coordinating all transitions in the cluster and ensuring that state constraints are satisfied and cluster stability is maintained.
+
+
+These are simply logical components and can be deployed as per the system requirements. For example:
+
+1. Controller can be deployed as a separate service
+2. Controller can be deployed along with a Participant but only one Controller will be active at any given time.
+
+Both have pros and cons, which will be discussed later and one can chose the mode of deployment as per system needs.
+
+
+## Cluster state/metadata store
+
+We need a distributed store to maintain the state of the cluster and a notification system to notify if there is any change in the cluster state. Helix uses Zookeeper to achieve this functionality.
+
+Zookeeper provides:
+
+* A way to represent PERSISTENT state which basically remains until its deleted.
+* A way to represent TRANSIENT/EPHEMERAL state which vanishes when the process that created the STATE dies.
+* Notification mechanism when there is a change in PERSISTENT/EPHEMERAL STATE
+
+The namespace provided by ZooKeeper is much like that of a standard file system. A name is a sequence of path elements separated by a slash (/). Every node[ZNODE] in ZooKeeper\'s namespace is identified by a path.
+
+More info on Zookeeper can be found here http://zookeeper.apache.org
+
+## Statemachine and constraints
+
+Even though the concept of Resource, Partition, Replicas is common to most distributed systems, one thing that differentiates one distributed system from another is the way each partition is assigned a state and the constraints on each state.
+
+For example:
+
+1. If a system is serving READ ONLY data then all partition\'s replicas are equal and they can either be ONLINE or OFFLINE.
+2. If a system takes BOTH READ and WRITES but ensure that WRITES go through only one partition then the states will be MASTER, SLAVE and OFFLINE. Writes go through the MASTER and is replicated to the SLAVES. Optionally, READS can go through SLAVES.
+
+Apart from defining STATE for each partition, the transition path to each STATE can be application specific. For example, in order to become MASTER it might be a requirement to first become a SLAVE. This ensures that if the SLAVE does not have the data as part of OFFLINE-SLAVE transition it can bootstrap data from other nodes in the system.
+
+Helix provides a way to configure an application specific state machine along with constraints on each state. Along with constraints on STATE, Helix also provides a way to specify constraints on transitions. (More on this later.)
+
+```
+ OFFLINE | SLAVE | MASTER
+ _____________________________
+ | | | |
+OFFLINE | N/A | SLAVE | SLAVE |
+ |__________|________|_________|
+ | | | |
+SLAVE | OFFLINE | N/A | MASTER |
+ |__________|________|_________|
+ | | | |
+MASTER | SLAVE | SLAVE | N/A |
+ |__________|________|_________|
+
+```
+
+
+
+## Concepts
+
+The following terminologies are used in Helix to model a state machine.
+
+* IDEALSTATE: The state in which we need the cluster to be in if all nodes are up and running. In other words, all state constraints are satisfied.
+* CURRENTSTATE: Represents the current state of each node in the cluster
+* EXTERNALVIEW: Represents the combined view of CURRENTSTATE of all nodes.
+
+The goal of Helix is always to make the CURRENTSTATE of the system same as the IDEALSTATE. Some scenarios where this may not be true are:
+
+* When all nodes are down
+* When one or more nodes fail
+* New nodes are added and the partitions need to be reassigned
+
+### IDEALSTATE
+
+Helix lets the application define the IdealState on a resource basis which basically consists of:
+
+* List of partitions. Example: 64
+* Number of replicas for each partition. Example: 3
+* Node and State for each replica.
+
+Example:
+
+* Partition-1, replica-1, Master, Node-1
+* Partition-1, replica-2, Slave, Node-2
+* Partition-1, replica-3, Slave, Node-3
+* .....
+* .....
+* Partition-p, replica-3, Slave, Node-n
+
+Helix comes with various algorithms to automatically assign the partitions to nodes. The default algorithm minimizes the number of shuffles that happen when new nodes are added to the system
+
+### CURRENTSTATE
+
+Every instance in the cluster hosts one or more partitions of a resource. Each of the partitions has a State associated with it.
+
+Example Node-1
+
+* Partition-1, Master
+* Partition-2, Slave
+* ....
+* ....
+* Partition-p, Slave
+
+### EXTERNALVIEW
+
+External clients needs to know the state of each partition in the cluster and the Node hosting that partition. Helix provides one view of the system to SPECTATORS as EXTERNAL VIEW. EXTERNAL VIEW is simply an aggregate of all CURRENTSTATE
+
+* Partition-1, replica-1, Master, Node-1
+* Partition-1, replica-2, Slave, Node-2
+* Partition-1, replica-3, Slave, Node-3
+* .....
+* .....
+* Partition-p, replica-3, Slave, Node-n
+
+## Process Workflow
+
+Mode of operation in a cluster
+
+A node process can be one of the following:
+
+* PARTICIPANT: The process registers itself in the cluster and acts on the messages received in its queue and updates the current state. Example: Storage Node
+* SPECTATOR: The process is simply interested in the changes in the Externalview. The Router is a spectator of the Storage cluster.
+* CONTROLLER: This process actively controls the cluster by reacting to changes in Cluster State and sending messages to PARTICIPANTS.
+
+
+### Participant Node Process
+
+* When Node starts up, it registers itself under LIVEINSTANCES
+* After registering, it waits for new Messages in the message queue
+* When it receives a message, it will perform the required task as indicated in the message
+* After the task is completed, depending on the task outcome it updates the CURRENTSTATE
+
+### Controller Process
+
+* Watches IDEALSTATE
+* Node goes down/comes up or Node is added/removed. Watches LIVEINSTANCES and CURRENTSTATE of each Node in the cluster
+* Triggers appropriate state transition by sending message to PARTICIPANT
+
+### Spectator Process
+
+* When the process starts, it asks cluster manager agent to be notified of changes in ExternalView
+* Whenever it receives a notification, it reads the Externalview and performs required duties. For the Router, it updates its routing table.
+
+#### Interaction between controller, participant and spectator
+
+The following picture shows how controllers, participants and spectators interact with each other.
+
+
+
+## Core algorithm
+
+* Controller gets the IdealState and the CurrentState of active storage nodes from Zookeeper
+* Compute the delta between IdealState and CurrentState for each partition across all participant nodes
+* For each partition compute tasks based on the State Machine Table. It\'s possible to configure priority on the state Transition. For example, in case of Master-Slave:
+ * Attempt mastership transfer if possible without violating constraint.
+ * Partition Addition
+ * Drop Partition
+* Add the tasks in parallel if possible to the respective queue for each storage node (if the tasks added are mutually independent)
+* If a task is dependent on another task being completed, do not add that task
+* After any task is completed by a Participant, Controllers gets notified of the change and the State Transition algorithm is re-run until the CurrentState is same as IdealState.
+
+## Helix znode layout
+
+Helix organizes znodes under clusterName in multiple levels.
+
+The top level (under clusterName) znodes are all Helix defined and in upper case:
+
+* PROPERTYSTORE: application property store
+* STATEMODELDEFES: state model definitions
+* INSTANCES: instance runtime information including current state and messages
+* CONFIGS: configurations
+* IDEALSTATES: ideal states
+* EXTERNALVIEW: external views
+* LIVEINSTANCES: live instances
+* CONTROLLER: cluster controller runtime information
+
+Under INSTANCES, there are runtime znodes for each instance. An instance organizes znodes as follows:
+
+* CURRENTSTATES
+ * sessionId
+ * resourceName
+* ERRORS
+* STATUSUPDATES
+* MESSAGES
+* HEALTHREPORT
+
+Under CONFIGS, there are different scopes of configurations:
+
+* RESOURCE: contains resource scope configurations
+* CLUSTER: contains cluster scope configurations
+* PARTICIPANT: contains participant scope configurations
+
+The following image shows an example of Helix znodes layout for a cluster named "test-cluster":
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/Concepts.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/Concepts.md b/site-releases/0.6.1-incubating/src/site/markdown/Concepts.md
new file mode 100644
index 0000000..02d7406
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/Concepts.md
@@ -0,0 +1,268 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+Helix is based on the idea that a given task has the following attributes associated with it:
+
+* _Location of the task_. For example it runs on Node N1
+* _State_. For example, it is running, stopped etc.
+
+In Helix terminology, a task is referred to as a _resource_.
+
+### IdealState
+
+IdealState simply allows one to map tasks to location and state. A standard way of expressing this in Helix:
+
+```
+ "TASK_NAME" : {
+ "LOCATION" : "STATE"
+ }
+
+```
+Consider a simple case where you want to launch a task \'myTask\' on node \'N1\'. The IdealState for this can be expressed as follows:
+
+```
+{
+ "id" : "MyTask",
+ "mapFields" : {
+ "myTask" : {
+ "N1" : "ONLINE",
+ }
+ }
+}
+```
+### Partition
+
+If this task get too big to fit on one box, you might want to divide it into subTasks. Each subTask is referred to as a _partition_ in Helix. Let\'s say you want to divide the task into 3 subTasks/partitions, the IdealState can be changed as shown below.
+
+\'myTask_0\', \'myTask_1\', \'myTask_2\' are logical names representing the partitions of myTask. Each tasks runs on N1, N2 and N3 respectively.
+
+```
+{
+ "id" : "myTask",
+ "simpleFields" : {
+ "NUM_PARTITIONS" : "3",
+ }
+ "mapFields" : {
+ "myTask_0" : {
+ "N1" : "ONLINE",
+ },
+ "myTask_1" : {
+ "N2" : "ONLINE",
+ },
+ "myTask_2" : {
+ "N3" : "ONLINE",
+ }
+ }
+}
+```
+
+### Replica
+
+Partitioning allows one to split the data/task into multiple subparts. But let\'s say the request rate each partition increases. The common solution is to have multiple copies for each partition. Helix refers to the copy of a partition as a _replica_. Adding a replica also increases the availability of the system during failures. One can see this methodology employed often in Search systems. The index is divided into shards, and each shard has multiple copies.
+
+Let\'s say you want to add one additional replica for each task. The IdealState can simply be changed as shown below.
+
+For increasing the availability of the system, it\'s better to place the replica of a given partition on different nodes.
+
+```
+{
+ "id" : "myIndex",
+ "simpleFields" : {
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ },
+ "mapFields" : {
+ "myIndex_0" : {
+ "N1" : "ONLINE",
+ "N2" : "ONLINE"
+ },
+ "myIndex_1" : {
+ "N2" : "ONLINE",
+ "N3" : "ONLINE"
+ },
+ "myIndex_2" : {
+ "N3" : "ONLINE",
+ "N1" : "ONLINE"
+ }
+ }
+}
+```
+
+### State
+
+Now let\'s take a slightly complicated scenario where a task represents a database. Unlike an index which is in general read-only, a database supports both reads and writes. Keeping the data consistent among the replicas is crucial in distributed data stores. One commonly applied technique is to assign one replica as MASTER and remaining replicas as SLAVE. All writes go to the MASTER and are then replicated to the SLAVE replicas.
+
+Helix allows one to assign different states to each replica. Let\'s say you have two MySQL instances N1 and N2, where one will serve as MASTER and another as SLAVE. The IdealState can be changed to:
+
+```
+{
+ "id" : "myDB",
+ "simpleFields" : {
+ "NUM_PARTITIONS" : "1",
+ "REPLICAS" : "2",
+ },
+ "mapFields" : {
+ "myDB" : {
+ "N1" : "MASTER",
+ "N2" : "SLAVE",
+ }
+ }
+}
+
+```
+
+
+### State Machine and Transitions
+
+IdealState allows one to exactly specify the desired state of the cluster. Given an IdealState, Helix takes up the responsibility of ensuring that the cluster reaches the IdealState. The Helix _controller_ reads the IdealState and then commands the Participant to take appropriate actions to move from one state to another until it matches the IdealState. These actions are referred to as _transitions_ in Helix.
+
+The next logical question is: how does the _controller_ compute the transitions required to get to IdealState? This is where the finite state machine concept comes in. Helix allows applications to plug in a finite state machine. A state machine consists of the following:
+
+* State: Describes the role of a replica
+* Transition: An action that allows a replica to move from one State to another, thus changing its role.
+
+Here is an example of MASTERSLAVE state machine,
+
+```
+ OFFLINE | SLAVE | MASTER
+ _____________________________
+ | | | |
+OFFLINE | N/A | SLAVE | SLAVE |
+ |__________|________|_________|
+ | | | |
+SLAVE | OFFLINE | N/A | MASTER |
+ |__________|________|_________|
+ | | | |
+MASTER | SLAVE | SLAVE | N/A |
+ |__________|________|_________|
+
+```
+
+Helix allows each resource to be associated with one state machine. This means you can have one resource as an index and another as a database in the same cluster. One can associate each resource with a state machine as follows:
+
+```
+{
+ "id" : "myDB",
+ "simpleFields" : {
+ "NUM_PARTITIONS" : "1",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ },
+ "mapFields" : {
+ "myDB" : {
+ "N1" : "MASTER",
+ "N2" : "SLAVE",
+ }
+ }
+}
+
+```
+
+### Current State
+
+CurrentState of a resource simply represents its actual state at a PARTICIPANT. In the below example:
+
+* INSTANCE_NAME: Unique name representing the process
+* SESSION_ID: ID that is automatically assigned every time a process joins the cluster
+
+```
+{
+ "id":"MyResource"
+ ,"simpleFields":{
+ ,"SESSION_ID":"13d0e34675e0002"
+ ,"INSTANCE_NAME":"node1"
+ ,"STATE_MODEL_DEF":"MasterSlave"
+ }
+ ,"mapFields":{
+ "MyResource_0":{
+ "CURRENT_STATE":"SLAVE"
+ }
+ ,"MyResource_1":{
+ "CURRENT_STATE":"MASTER"
+ }
+ ,"MyResource_2":{
+ "CURRENT_STATE":"MASTER"
+ }
+ }
+}
+```
+Each node in the cluster has its own CurrentState.
+
+### External View
+
+In order to communicate with the PARTICIPANTs, external clients need to know the current state of each of the PARTICIPANTs. The external clients are referred to as SPECTATORS. In order to make the life of SPECTATOR simple, Helix provides an EXTERNALVIEW that is an aggregated view of the current state across all nodes. The EXTERNALVIEW has a similar format as IDEALSTATE.
+
+```
+{
+ "id":"MyResource",
+ "mapFields":{
+ "MyResource_0":{
+ "N1":"SLAVE",
+ "N2":"MASTER",
+ "N3":"OFFLINE"
+ },
+ "MyResource_1":{
+ "N1":"MASTER",
+ "N2":"SLAVE",
+ "N3":"ERROR"
+ },
+ "MyResource_2":{
+ "N1":"MASTER",
+ "N2":"SLAVE",
+ "N3":"SLAVE"
+ }
+ }
+}
+```
+
+### Rebalancer
+
+The core component of Helix is the CONTROLLER which runs the REBALANCER algorithm on every cluster event. Cluster events can be one of the following:
+
+* Nodes start/stop and soft/hard failures
+* New nodes are added/removed
+* Ideal state changes
+
+There are few more such as config changes, etc. The key takeaway: there are many ways to trigger the rebalancer.
+
+When a rebalancer is run it simply does the following:
+
+* Compares the IdealState and current state
+* Computes the transitions required to reach the IdealState
+* Issues the transitions to each PARTICIPANT
+
+The above steps happen for every change in the system. Once the current state matches the IdealState, the system is considered stable which implies \'IDEALSTATE = CURRENTSTATE = EXTERNALVIEW\'
+
+### Dynamic IdealState
+
+One of the things that makes Helix powerful is that IdealState can be changed dynamically. This means one can listen to cluster events like node failures and dynamically change the ideal state. Helix will then take care of triggering the respective transitions in the system.
+
+Helix comes with a few algorithms to automatically compute the IdealState based on the constraints. For example, if you have a resource of 3 partitions and 2 replicas, Helix can automatically compute the IdealState based on the nodes that are currently active. See the [tutorial](./tutorial_rebalance.html) to find out more about various execution modes of Helix like AUTO_REBALANCE, AUTO and CUSTOM.
+
+
+
+
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/Features.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/Features.md b/site-releases/0.6.1-incubating/src/site/markdown/Features.md
new file mode 100644
index 0000000..4f78812
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/Features.md
@@ -0,0 +1,306 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+### CONFIGURING IDEALSTATE
+
+
+Read concepts page for definition of Idealstate.
+
+The placement of partitions in a DDS is very critical for reliability and scalability of the system.
+For example, when a node fails, it is important that the partitions hosted on that node are reallocated evenly among the remaining nodes. Consistent hashing is one such algorithm that can guarantee this.
+Helix by default comes with a variant of consistent hashing based of the RUSH algorithm.
+
+This means given a number of partitions, replicas and number of nodes Helix does the automatic assignment of partition to nodes such that
+
+* Each node has the same number of partitions and replicas of the same partition do not stay on the same node.
+* When a node fails, the partitions will be equally distributed among the remaining nodes
+* When new nodes are added, the number of partitions moved will be minimized along with satisfying the above two criteria.
+
+
+Helix provides multiple ways to control the placement and state of a replica.
+
+```
+
+ |AUTO REBALANCE| AUTO | CUSTOM |
+ -----------------------------------------
+ LOCATION | HELIX | APP | APP |
+ -----------------------------------------
+ STATE | HELIX | HELIX | APP |
+ -----------------------------------------
+```
+
+#### HELIX EXECUTION MODE
+
+
+Idealstate is defined as the state of the DDS when all nodes are up and running and healthy.
+Helix uses this as the target state of the system and computes the appropriate transitions needed in the system to bring it to a stable state.
+
+Helix supports 3 different execution modes which allows application to explicitly control the placement and state of the replica.
+
+##### AUTO_REBALANCE
+
+When the idealstate mode is set to AUTO_REBALANCE, Helix controls both the location of the replica along with the state. This option is useful for applications where creation of a replica is not expensive. Example
+
+```
+{
+ "id" : "MyResource",
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "AUTO_REBALANCE",
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ }
+ "listFields" : {
+ "MyResource_0" : [],
+ "MyResource_1" : [],
+ "MyResource_2" : []
+ },
+ "mapFields" : {
+ }
+}
+```
+
+If there are 3 nodes in the cluster, then Helix will internally compute the ideal state as
+
+```
+{
+ "id" : "MyResource",
+ "simpleFields" : {
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ },
+ "mapFields" : {
+ "MyResource_0" : {
+ "N1" : "MASTER",
+ "N2" : "SLAVE",
+ },
+ "MyResource_1" : {
+ "N2" : "MASTER",
+ "N3" : "SLAVE",
+ },
+ "MyResource_2" : {
+ "N3" : "MASTER",
+ "N1" : "SLAVE",
+ }
+ }
+}
+```
+
+Another typical example is evenly distributing a group of tasks among the currently alive processes. For example, if there are 60 tasks and 4 nodes, Helix assigns 15 tasks to each node.
+When one node fails Helix redistributes its 15 tasks to the remaining 3 nodes. Similarly, if a node is added, Helix re-allocates 3 tasks from each of the 4 nodes to the 5th node.
+
+#### AUTO
+
+When the idealstate mode is set to AUTO, Helix only controls STATE of the replicas where as the location of the partition is controlled by application. Example: The below idealstate indicates thats 'MyResource_0' must be only on node1 and node2. But gives the control of assigning the STATE to Helix.
+
+```
+{
+ "id" : "MyResource",
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "AUTO",
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ }
+ "listFields" : {
+ "MyResource_0" : [node1, node2],
+ "MyResource_1" : [node2, node3],
+ "MyResource_2" : [node3, node1]
+ },
+ "mapFields" : {
+ }
+}
+```
+In this mode when node1 fails, unlike in AUTO-REBALANCE mode the partition is not moved from node1 to others nodes in the cluster. Instead, Helix will decide to change the state of MyResource_0 in N2 based on the system constraints. For example, if a system constraint specified that there should be 1 Master and if the Master failed, then node2 will be made the new master.
+
+#### CUSTOM
+
+Helix offers a third mode called CUSTOM, in which application can completely control the placement and state of each replica. Applications will have to implement an interface that Helix will invoke when the cluster state changes.
+Within this callback, the application can recompute the idealstate. Helix will then issue appropriate transitions such that Idealstate and Currentstate converges.
+
+```
+{
+ "id" : "MyResource",
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "CUSTOM",
+ "NUM_PARTITIONS" : "3",
+ "REPLICAS" : "2",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ },
+ "mapFields" : {
+ "MyResource_0" : {
+ "N1" : "MASTER",
+ "N2" : "SLAVE",
+ },
+ "MyResource_1" : {
+ "N2" : "MASTER",
+ "N3" : "SLAVE",
+ },
+ "MyResource_2" : {
+ "N3" : "MASTER",
+ "N1" : "SLAVE",
+ }
+ }
+}
+```
+
+For example, the current state of the system might be 'MyResource_0' -> {N1:MASTER,N2:SLAVE} and the application changes the ideal state to 'MyResource_0' -> {N1:SLAVE,N2:MASTER}. Helix will not blindly issue MASTER-->SLAVE to N1 and SLAVE-->MASTER to N2 in parallel since it might result in a transient state where both N1 and N2 are masters.
+Helix will first issue MASTER-->SLAVE to N1 and after its completed it will issue SLAVE-->MASTER to N2.
+
+
+### State Machine Configuration
+
+Helix comes with 3 default state models that are most commonly used. Its possible to have multiple state models in a cluster.
+Every resource that is added should have a reference to the state model.
+
+* MASTER-SLAVE: Has 3 states OFFLINE,SLAVE,MASTER. Max masters is 1. Slaves will be based on the replication factor. Replication factor can be specified while adding the resource
+* ONLINE-OFFLINE: Has 2 states OFFLINE and ONLINE. Very simple state model and most applications start off with this state model.
+* LEADER-STANDBY:1 Leader and many stand bys. In general the standby's are idle.
+
+Apart from providing the state machine configuration, one can specify the constraints of states and transitions.
+
+For example one can say
+Master:1. Max number of replicas in Master state at any time is 1.
+OFFLINE-SLAVE:5 Max number of Offline-Slave transitions that can happen concurrently in the system
+
+STATE PRIORITY
+Helix uses greedy approach to satisfy the state constraints. For example if the state machine configuration says it needs 1 master and 2 slaves but only 1 node is active, Helix must promote it to master. This behavior is achieved by providing the state priority list as MASTER,SLAVE.
+
+STATE TRANSITION PRIORITY
+Helix tries to fire as many transitions as possible in parallel to reach the stable state without violating constraints. By default Helix simply sorts the transitions alphabetically and fires as many as it can without violating the constraints.
+One can control this by overriding the priority order.
+
+### Config management
+
+Helix allows applications to store application specific properties. The configuration can have different scopes.
+
+* Cluster
+* Node specific
+* Resource specific
+* Partition specific
+
+Helix also provides notifications when any configs are changed. This allows applications to support dynamic configuration changes.
+
+See HelixManager.getConfigAccessor for more info
+
+### Intra cluster messaging api
+
+This is an interesting feature which is quite useful in practice. Often times, nodes in DDS requires a mechanism to interact with each other. One such requirement is a process of bootstrapping a replica.
+
+Consider a search system use case where the index replica starts up and it does not have an index. One of the commonly used solutions is to get the index from a common location or to copy the index from another replica.
+Helix provides a messaging api, that can be used to talk to other nodes in the system. The value added that Helix provides here is, message recipient can be specified in terms of resource,
+partition, state and Helix ensures that the message is delivered to all of the required recipients. In this particular use case, the instance can specify the recipient criteria as all replicas of P1.
+Since Helix is aware of the global state of the system, it can send the message to appropriate nodes. Once the nodes respond Helix provides the bootstrapping replica with all the responses.
+
+This is a very generic api and can also be used to schedule various periodic tasks in the cluster like data backups etc.
+System Admins can also perform adhoc tasks like on demand backup or execute a system command(like rm -rf ;-)) across all nodes.
+
+```
+ ClusterMessagingService messagingService = manager.getMessagingService();
+ //CONSTRUCT THE MESSAGE
+ Message requestBackupUriRequest = new Message(
+ MessageType.USER_DEFINE_MSG, UUID.randomUUID().toString());
+ requestBackupUriRequest
+ .setMsgSubType(BootstrapProcess.REQUEST_BOOTSTRAP_URL);
+ requestBackupUriRequest.setMsgState(MessageState.NEW);
+ //SET THE RECIPIENT CRITERIA, All nodes that satisfy the criteria will receive the message
+ Criteria recipientCriteria = new Criteria();
+ recipientCriteria.setInstanceName("%");
+ recipientCriteria.setRecipientInstanceType(InstanceType.PARTICIPANT);
+ recipientCriteria.setResource("MyDB");
+ recipientCriteria.setPartition("");
+ //Should be processed only the process that is active at the time of sending the message.
+ //This means if the recipient is restarted after message is sent, it will not be processed.
+ recipientCriteria.setSessionSpecific(true);
+ // wait for 30 seconds
+ int timeout = 30000;
+ //The handler that will be invoked when any recipient responds to the message.
+ BootstrapReplyHandler responseHandler = new BootstrapReplyHandler();
+ //This will return only after all recipients respond or after timeout.
+ int sentMessageCount = messagingService.sendAndWait(recipientCriteria,
+ requestBackupUriRequest, responseHandler, timeout);
+```
+
+See HelixManager.getMessagingService for more info.
+
+
+### Application specific property storage
+
+There are several usecases where applications needs support for distributed data structures. Helix uses Zookeeper to store the application data and hence provides notifications when the data changes.
+One value add Helix provides is the ability to specify cache the data and also write through cache. This is more efficient than reading from ZK every time.
+
+See HelixManager.getHelixPropertyStore
+
+### Throttling
+
+Since all state changes in the system are triggered through transitions, Helix can control the number of transitions that can happen in parallel. Some of the transitions may be light weight but some might involve moving data around which is quite expensive.
+Helix allows applications to set threshold on transitions. The threshold can be set at the multiple scopes.
+
+* MessageType e.g STATE_TRANSITION
+* TransitionType e.g SLAVE-MASTER
+* Resource e.g database
+* Node i.e per node max transitions in parallel.
+
+See HelixManager.getHelixAdmin.addMessageConstraint()
+
+### Health monitoring and alerting
+
+This in currently in development mode, not yet productionized.
+
+Helix provides ability for each node in the system to report health metrics on a periodic basis.
+Helix supports multiple ways to aggregate these metrics like simple SUM, AVG, EXPONENTIAL DECAY, WINDOW. Helix will only persist the aggregated value.
+Applications can define threshold on the aggregate values according to the SLA's and when the SLA is violated Helix will fire an alert.
+Currently Helix only fires an alert but eventually we plan to use this metrics to either mark the node dead or load balance the partitions.
+This feature will be valuable in for distributed systems that support multi-tenancy and have huge variation in work load patterns. Another place this can be used is to detect skewed partitions and rebalance the cluster.
+
+This feature is not yet stable and do not recommend to be used in production.
+
+
+### Controller deployment modes
+
+Read Architecture wiki for more details on the Role of a controller. In simple words, it basically controls the participants in the cluster by issuing transitions.
+
+Helix provides multiple options to deploy the controller.
+
+#### STANDALONE
+
+Controller can be started as a separate process to manage a cluster. This is the recommended approach. How ever since one controller can be a single point of failure, multiple controller processes are required for reliability.
+Even if multiple controllers are running only one will be actively managing the cluster at any time and is decided by a leader election process. If the leader fails, another leader will resume managing the cluster.
+
+Even though we recommend this method of deployment, it has the drawback of having to manage an additional service for each cluster. See Controller As a Service option.
+
+#### EMBEDDED
+
+If setting up a separate controller process is not viable, then it is possible to embed the controller as a library in each of the participant.
+
+#### CONTROLLER AS A SERVICE
+
+One of the cool feature we added in helix was use a set of controllers to manage a large number of clusters.
+For example if you have X clusters to be managed, instead of deploying X*3(3 controllers for fault tolerance) controllers for each cluster, one can deploy only 3 controllers. Each controller can manage X/3 clusters.
+If any controller fails the remaining two will manage X/2 clusters. At LinkedIn, we always deploy controllers in this mode.
+
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/Quickstart.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/Quickstart.md b/site-releases/0.6.1-incubating/src/site/markdown/Quickstart.md
new file mode 100644
index 0000000..96c4efb
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/Quickstart.md
@@ -0,0 +1,622 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+Get Helix
+---------
+
+First, let\'s get Helix, either build it, or download.
+
+### Build
+
+ git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+ cd incubator-helix
+ git checkout tags/helix-0.6.1-incubating
+ mvn install package -DskipTests
+ cd helix-core/target/helix-core-pkg/bin //This folder contains all the scripts used in following sections
+ chmod +x *
+
+### Download
+
+Download the 0.6.1-incubating release package [here](./download.html)
+
+Overview
+--------
+
+In this Quickstart, we\'ll set up a master-slave replicated, partitioned system. Then we\'ll demonstrate how to add a node, rebalance the partitions, and show how Helix manages failover.
+
+
+Let\'s Do It
+------------
+
+Helix provides command line interfaces to set up the cluster and view the cluster state. The best way to understand how Helix views a cluster is to build a cluster.
+
+#### First, get to the tools directory
+
+If you built the code
+
+```
+cd helix/incubator-helix/helix-core/target/helix-core-pkg/bin
+```
+
+If you downloaded the release package, extract it.
+
+
+Short Version
+-------------
+You can observe the components working together in this demo, which does the following:
+
+* Create a cluster
+* Add 2 nodes (participants) to the cluster
+* Set up a resource with 6 partitions and 2 replicas: 1 Master, and 1 Slave per partition
+* Show the cluster state after Helix balances the partitions
+* Add a third node
+* Show the cluster state. Note that the third node has taken mastership of 2 partitions.
+* Kill the third node (Helix takes care of failover)
+* Show the cluster state. Note that the two surviving nodes take over mastership of the partitions from the failed node
+
+##### Run the demo
+
+```
+cd helix/incubator-helix/helix-core/target/helix-core-pkg/bin
+./quickstart.sh
+```
+
+##### 2 nodes are set up and the partitions rebalanced
+
+The cluster state is as follows:
+
+```
+CLUSTER STATE: After starting 2 nodes
+ localhost_12000 localhost_12001
+ MyResource_0 M S
+ MyResource_1 S M
+ MyResource_2 M S
+ MyResource_3 M S
+ MyResource_4 S M
+ MyResource_5 S M
+```
+
+Note there is one master and one slave per partition.
+
+##### A third node is added and the cluster rebalanced
+
+The cluster state changes to:
+
+```
+CLUSTER STATE: After adding a third node
+ localhost_12000 localhost_12001 localhost_12002
+ MyResource_0 S M S
+ MyResource_1 S S M
+ MyResource_2 M S S
+ MyResource_3 S S M
+ MyResource_4 M S S
+ MyResource_5 S M S
+```
+
+Note there is one master and _two_ slaves per partition. This is expected because there are three nodes.
+
+##### Finally, a node is killed to simulate a failure
+
+Helix makes sure each partition has a master. The cluster state changes to:
+
+```
+CLUSTER STATE: After the 3rd node stops/crashes
+ localhost_12000 localhost_12001 localhost_12002
+ MyResource_0 S M -
+ MyResource_1 S M -
+ MyResource_2 M S -
+ MyResource_3 M S -
+ MyResource_4 M S -
+ MyResource_5 S M -
+```
+
+
+Long Version
+------------
+Now you can run the same steps by hand. In the detailed version, we\'ll do the following:
+
+* Define a cluster
+* Add two nodes to the cluster
+* Add a 6-partition resource with 1 master and 2 slave replicas per partition
+* Verify that the cluster is healthy and inspect the Helix view
+* Expand the cluster: add a few nodes and rebalance the partitions
+* Failover: stop a node and verify the mastership transfer
+
+### Install/Start zookeeper
+
+Zookeeper can be started in standalone mode or replicated mode.
+
+More info is available at
+
+* http://zookeeper.apache.org/doc/r3.3.3/zookeeperStarted.html
+* http://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html#sc_zkMulitServerSetup
+
+In this example, let\'s start zookeeper in local mode.
+
+##### start zookeeper locally on port 2199
+
+ ./start-standalone-zookeeper.sh 2199 &
+
+### Define the Cluster
+
+The helix-admin tool is used for cluster administration tasks. In the Quickstart, we\'ll use the command line interface. Helix supports a REST interface as well.
+
+zookeeper_address is of the format host:port e.g localhost:2199 for standalone or host1:port,host2:port for multi-node.
+
+Next, we\'ll set up a cluster MYCLUSTER cluster with these attributes:
+
+* 3 instances running on localhost at ports 12913,12914,12915
+* One database named myDB with 6 partitions
+* Each partition will have 3 replicas with 1 master, 2 slaves
+* zookeeper running locally at localhost:2199
+
+##### Create the cluster MYCLUSTER
+ ## helix-admin.sh --zkSvr <zk_address> --addCluster <clustername>
+ ./helix-admin.sh --zkSvr localhost:2199 --addCluster MYCLUSTER
+
+##### Add nodes to the cluster
+
+In this case we\'ll add three nodes: localhost:12913, localhost:12914, localhost:12915
+
+ ## helix-admin.sh --zkSvr <zk_address> --addNode <clustername> <host:port>
+ ./helix-admin.sh --zkSvr localhost:2199 --addNode MYCLUSTER localhost:12913
+ ./helix-admin.sh --zkSvr localhost:2199 --addNode MYCLUSTER localhost:12914
+ ./helix-admin.sh --zkSvr localhost:2199 --addNode MYCLUSTER localhost:12915
+
+#### Define the resource and partitioning
+
+In this example, the resource is a database, partitioned 6 ways. (In a production system, it\'s common to over-partition for better load balancing. Helix has been used in production to manage hundreds of databases each with 10s or 100s of partitions running on 10s of physical nodes.)
+
+##### Create a database with 6 partitions using the MasterSlave state model.
+
+Helix ensures there will be exactly one master for each partition.
+
+ ## helix-admin.sh --zkSvr <zk_address> --addResource <clustername> <resourceName> <numPartitions> <StateModelName>
+ ./helix-admin.sh --zkSvr localhost:2199 --addResource MYCLUSTER myDB 6 MasterSlave
+
+##### Now we can let Helix assign partitions to nodes.
+
+This command will distribute the partitions amongst all the nodes in the cluster. In this example, each partition has 3 replicas.
+
+ ## helix-admin.sh --zkSvr <zk_address> --rebalance <clustername> <resourceName> <replication factor>
+ ./helix-admin.sh --zkSvr localhost:2199 --rebalance MYCLUSTER myDB 3
+
+Now the cluster is defined in Zookeeper. The nodes (localhost:12913, localhost:12914, localhost:12915) and resource (myDB, with 6 partitions using the MasterSlave model). And the _ideal state_ has been calculated, assuming a replication factor of 3.
+
+##### Start the Helix Controller
+
+Now that the cluster is defined in Zookeeper, the Helix controller can manage the cluster.
+
+ ## Start the cluster manager, which will manage MYCLUSTER
+ ./run-helix-controller.sh --zkSvr localhost:2199 --cluster MYCLUSTER 2>&1 > /tmp/controller.log &
+
+##### Start up the cluster to be managed
+
+We\'ve started up Zookeeper, defined the cluster, the resources, the partitioning, and started up the Helix controller. Next, we\'ll start up the nodes of the system to be managed. Each node is a Participant, which is an instance of the system component to be managed. Helix assigns work to Participants, keeps track of their roles and health, and takes action when a node fails.
+
+ # start up each instance. These are mock implementations that are actively managed by Helix
+ ./start-helix-participant.sh --zkSvr localhost:2199 --cluster MYCLUSTER --host localhost --port 12913 --stateModelType MasterSlave 2>&1 > /tmp/participant_12913.log
+ ./start-helix-participant.sh --zkSvr localhost:2199 --cluster MYCLUSTER --host localhost --port 12914 --stateModelType MasterSlave 2>&1 > /tmp/participant_12914.log
+ ./start-helix-participant.sh --zkSvr localhost:2199 --cluster MYCLUSTER --host localhost --port 12915 --stateModelType MasterSlave 2>&1 > /tmp/participant_12915.log
+
+
+#### Inspect the Cluster
+
+Now, let\'s see the Helix view of our cluster. We\'ll work our way down as follows:
+
+```
+Clusters -> MYCLUSTER -> instances -> instance detail
+ -> resources -> resource detail
+ -> partitions
+```
+
+A single Helix controller can manage multiple clusters, though so far, we\'ve only defined one cluster. Let\'s see:
+
+```
+## List existing clusters
+./helix-admin.sh --zkSvr localhost:2199 --listClusters
+
+Existing clusters:
+MYCLUSTER
+```
+
+Now, let\'s see the Helix view of MYCLUSTER
+
+```
+## helix-admin.sh --zkSvr <zk_address> --listClusterInfo <clusterName>
+./helix-admin.sh --zkSvr localhost:2199 --listClusterInfo MYCLUSTER
+
+Existing resources in cluster MYCLUSTER:
+myDB
+Instances in cluster MYCLUSTER:
+localhost_12915
+localhost_12914
+localhost_12913
+```
+
+
+Let\'s look at the details of an instance
+
+```
+## ./helix-admin.sh --zkSvr <zk_address> --listInstanceInfo <clusterName> <InstanceName>
+./helix-admin.sh --zkSvr localhost:2199 --listInstanceInfo MYCLUSTER localhost_12913
+
+InstanceConfig: {
+ "id" : "localhost_12913",
+ "mapFields" : {
+ },
+ "listFields" : {
+ },
+ "simpleFields" : {
+ "HELIX_ENABLED" : "true",
+ "HELIX_HOST" : "localhost",
+ "HELIX_PORT" : "12913"
+ }
+}
+```
+
+
+##### Query info of a resource
+
+```
+## helix-admin.sh --zkSvr <zk_address> --listResourceInfo <clusterName> <resourceName>
+./helix-admin.sh --zkSvr localhost:2199 --listResourceInfo MYCLUSTER myDB
+
+IdealState for myDB:
+{
+ "id" : "myDB",
+ "mapFields" : {
+ "myDB_0" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "MASTER",
+ "localhost_12915" : "SLAVE"
+ },
+ "myDB_1" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "SLAVE",
+ "localhost_12915" : "MASTER"
+ },
+ "myDB_2" : {
+ "localhost_12913" : "MASTER",
+ "localhost_12914" : "SLAVE",
+ "localhost_12915" : "SLAVE"
+ },
+ "myDB_3" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "SLAVE",
+ "localhost_12915" : "MASTER"
+ },
+ "myDB_4" : {
+ "localhost_12913" : "MASTER",
+ "localhost_12914" : "SLAVE",
+ "localhost_12915" : "SLAVE"
+ },
+ "myDB_5" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "MASTER",
+ "localhost_12915" : "SLAVE"
+ }
+ },
+ "listFields" : {
+ "myDB_0" : [ "localhost_12914", "localhost_12913", "localhost_12915" ],
+ "myDB_1" : [ "localhost_12915", "localhost_12913", "localhost_12914" ],
+ "myDB_2" : [ "localhost_12913", "localhost_12915", "localhost_12914" ],
+ "myDB_3" : [ "localhost_12915", "localhost_12913", "localhost_12914" ],
+ "myDB_4" : [ "localhost_12913", "localhost_12914", "localhost_12915" ],
+ "myDB_5" : [ "localhost_12914", "localhost_12915", "localhost_12913" ]
+ },
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "AUTO",
+ "NUM_PARTITIONS" : "6",
+ "REPLICAS" : "3",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ "STATE_MODEL_FACTORY_NAME" : "DEFAULT"
+ }
+}
+
+ExternalView for myDB:
+{
+ "id" : "myDB",
+ "mapFields" : {
+ "myDB_0" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "MASTER",
+ "localhost_12915" : "SLAVE"
+ },
+ "myDB_1" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "SLAVE",
+ "localhost_12915" : "MASTER"
+ },
+ "myDB_2" : {
+ "localhost_12913" : "MASTER",
+ "localhost_12914" : "SLAVE",
+ "localhost_12915" : "SLAVE"
+ },
+ "myDB_3" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "SLAVE",
+ "localhost_12915" : "MASTER"
+ },
+ "myDB_4" : {
+ "localhost_12913" : "MASTER",
+ "localhost_12914" : "SLAVE",
+ "localhost_12915" : "SLAVE"
+ },
+ "myDB_5" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "MASTER",
+ "localhost_12915" : "SLAVE"
+ }
+ },
+ "listFields" : {
+ },
+ "simpleFields" : {
+ "BUCKET_SIZE" : "0"
+ }
+}
+```
+
+Now, let\'s look at one of the partitions:
+
+ ## helix-admin.sh --zkSvr <zk_address> --listResourceInfo <clusterName> <partition>
+ ./helix-admin.sh --zkSvr localhost:2199 --listResourceInfo mycluster myDB_0
+
+#### Expand the Cluster
+
+Next, we\'ll show how Helix does the work that you\'d otherwise have to build into your system. When you add capacity to your cluster, you want the work to be evenly distributed. In this example, we started with 3 nodes, with 6 partitions. The partitions were evenly balanced, 2 masters and 4 slaves per node. Let\'s add 3 more nodes: localhost:12916, localhost:12917, localhost:12918
+
+ ./helix-admin.sh --zkSvr localhost:2199 --addNode MYCLUSTER localhost:12916
+ ./helix-admin.sh --zkSvr localhost:2199 --addNode MYCLUSTER localhost:12917
+ ./helix-admin.sh --zkSvr localhost:2199 --addNode MYCLUSTER localhost:12918
+
+And start up these instances:
+
+ # start up each instance. These are mock implementations that are actively managed by Helix
+ ./start-helix-participant.sh --zkSvr localhost:2199 --cluster MYCLUSTER --host localhost --port 12916 --stateModelType MasterSlave 2>&1 > /tmp/participant_12916.log
+ ./start-helix-participant.sh --zkSvr localhost:2199 --cluster MYCLUSTER --host localhost --port 12917 --stateModelType MasterSlave 2>&1 > /tmp/participant_12917.log
+ ./start-helix-participant.sh --zkSvr localhost:2199 --cluster MYCLUSTER --host localhost --port 12918 --stateModelType MasterSlave 2>&1 > /tmp/participant_12918.log
+
+
+And now, let Helix do the work for you. To shift the work, simply rebalance. After the rebalance, each node will have one master and two slaves.
+
+ ./helix-admin.sh --zkSvr localhost:2199 --rebalance MYCLUSTER myDB 3
+
+#### View the cluster
+
+OK, let\'s see how it looks:
+
+
+```
+./helix-admin.sh --zkSvr localhost:2199 --listResourceInfo MYCLUSTER myDB
+
+IdealState for myDB:
+{
+ "id" : "myDB",
+ "mapFields" : {
+ "myDB_0" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "SLAVE",
+ "localhost_12917" : "MASTER"
+ },
+ "myDB_1" : {
+ "localhost_12916" : "SLAVE",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "MASTER"
+ },
+ "myDB_2" : {
+ "localhost_12913" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_3" : {
+ "localhost_12915" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_4" : {
+ "localhost_12916" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_5" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "MASTER",
+ "localhost_12915" : "SLAVE"
+ }
+ },
+ "listFields" : {
+ "myDB_0" : [ "localhost_12917", "localhost_12913", "localhost_12914" ],
+ "myDB_1" : [ "localhost_12918", "localhost_12917", "localhost_12916" ],
+ "myDB_2" : [ "localhost_12913", "localhost_12917", "localhost_12918" ],
+ "myDB_3" : [ "localhost_12915", "localhost_12917", "localhost_12918" ],
+ "myDB_4" : [ "localhost_12916", "localhost_12917", "localhost_12918" ],
+ "myDB_5" : [ "localhost_12914", "localhost_12915", "localhost_12913" ]
+ },
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "AUTO",
+ "NUM_PARTITIONS" : "6",
+ "REPLICAS" : "3",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ "STATE_MODEL_FACTORY_NAME" : "DEFAULT"
+ }
+}
+
+ExternalView for myDB:
+{
+ "id" : "myDB",
+ "mapFields" : {
+ "myDB_0" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "SLAVE",
+ "localhost_12917" : "MASTER"
+ },
+ "myDB_1" : {
+ "localhost_12916" : "SLAVE",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "MASTER"
+ },
+ "myDB_2" : {
+ "localhost_12913" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_3" : {
+ "localhost_12915" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_4" : {
+ "localhost_12916" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_5" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "MASTER",
+ "localhost_12915" : "SLAVE"
+ }
+ },
+ "listFields" : {
+ },
+ "simpleFields" : {
+ "BUCKET_SIZE" : "0"
+ }
+}
+```
+
+Mission accomplished. The partitions are nicely balanced.
+
+#### How about Failover?
+
+Building a fault tolerant system isn\'t trivial, but with Helix, it\'s easy. Helix detects a failed instance, and triggers mastership transfer automatically.
+
+First, let's fail an instance. In this example, we\'ll kill localhost:12918 to simulate a failure.
+
+We lost localhost:12918, so myDB_1 lost its MASTER. Helix can fix that, it will transfer mastership to a healthy node that is currently a SLAVE, say localhost:12197. Helix balances the load as best as it can, given there are 6 partitions on 5 nodes. Let\'s see:
+
+
+```
+./helix-admin.sh --zkSvr localhost:2199 --listResourceInfo MYCLUSTER myDB
+
+IdealState for myDB:
+{
+ "id" : "myDB",
+ "mapFields" : {
+ "myDB_0" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "SLAVE",
+ "localhost_12917" : "MASTER"
+ },
+ "myDB_1" : {
+ "localhost_12916" : "SLAVE",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "MASTER"
+ },
+ "myDB_2" : {
+ "localhost_12913" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_3" : {
+ "localhost_12915" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_4" : {
+ "localhost_12916" : "MASTER",
+ "localhost_12917" : "SLAVE",
+ "localhost_12918" : "SLAVE"
+ },
+ "myDB_5" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "MASTER",
+ "localhost_12915" : "SLAVE"
+ }
+ },
+ "listFields" : {
+ "myDB_0" : [ "localhost_12917", "localhost_12913", "localhost_12914" ],
+ "myDB_1" : [ "localhost_12918", "localhost_12917", "localhost_12916" ],
+ "myDB_2" : [ "localhost_12913", "localhost_12918", "localhost_12917" ],
+ "myDB_3" : [ "localhost_12915", "localhost_12918", "localhost_12917" ],
+ "myDB_4" : [ "localhost_12916", "localhost_12917", "localhost_12918" ],
+ "myDB_5" : [ "localhost_12914", "localhost_12915", "localhost_12913" ]
+ },
+ "simpleFields" : {
+ "IDEAL_STATE_MODE" : "AUTO",
+ "NUM_PARTITIONS" : "6",
+ "REPLICAS" : "3",
+ "STATE_MODEL_DEF_REF" : "MasterSlave",
+ "STATE_MODEL_FACTORY_NAME" : "DEFAULT"
+ }
+}
+
+ExternalView for myDB:
+{
+ "id" : "myDB",
+ "mapFields" : {
+ "myDB_0" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "SLAVE",
+ "localhost_12917" : "MASTER"
+ },
+ "myDB_1" : {
+ "localhost_12916" : "SLAVE",
+ "localhost_12917" : "MASTER"
+ },
+ "myDB_2" : {
+ "localhost_12913" : "MASTER",
+ "localhost_12917" : "SLAVE"
+ },
+ "myDB_3" : {
+ "localhost_12915" : "MASTER",
+ "localhost_12917" : "SLAVE"
+ },
+ "myDB_4" : {
+ "localhost_12916" : "MASTER",
+ "localhost_12917" : "SLAVE"
+ },
+ "myDB_5" : {
+ "localhost_12913" : "SLAVE",
+ "localhost_12914" : "MASTER",
+ "localhost_12915" : "SLAVE"
+ }
+ },
+ "listFields" : {
+ },
+ "simpleFields" : {
+ "BUCKET_SIZE" : "0"
+ }
+}
+```
+
+As we\'ve seen in this Quickstart, Helix takes care of partitioning, load balancing, elasticity, failure detection and recovery.
+
+##### ZOOINSPECTOR
+
+You can view all of the underlying data by going direct to zookeeper. Use ZooInspector that comes with zookeeper to browse the data. This is a java applet (make sure you have X windows)
+
+To start zooinspector run the following command from <zk_install_directory>/contrib/ZooInspector
+
+ java -cp zookeeper-3.3.3-ZooInspector.jar:lib/jtoaster-1.0.4.jar:../../lib/log4j-1.2.15.jar:../../zookeeper-3.3.3.jar org.apache.zookeeper.inspector.ZooInspector
+
+#### Next
+
+Now that you understand the idea of Helix, read the [tutorial](./tutorial.html) to learn how to choose the right state model and constraints for your system, and how to implement it. In many cases, the built-in features meet your requirements. And best of all, Helix is a customizable framework, so you can plug in your own behavior, while retaining the automation provided by Helix.
+
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/80abba32/site-releases/0.6.1-incubating/src/site/markdown/Tutorial.md
----------------------------------------------------------------------
diff --git a/site-releases/0.6.1-incubating/src/site/markdown/Tutorial.md b/site-releases/0.6.1-incubating/src/site/markdown/Tutorial.md
new file mode 100644
index 0000000..27f9fd9
--- /dev/null
+++ b/site-releases/0.6.1-incubating/src/site/markdown/Tutorial.md
@@ -0,0 +1,199 @@
+<!---
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+# Helix Tutorial
+
+In this tutorial, we will cover the roles of a Helix-managed cluster, and show the code you need to write to integrate with it. In many cases, there is a simple default behavior that is often appropriate, but you can also customize the behavior.
+
+Convention: we first cover the _basic_ approach, which is the easiest to implement. Then, we'll describe _advanced_ options, which give you more control over the system behavior, but require you to write more code.
+
+
+### Prerequisites
+
+1. Read [Concepts/Terminology](./Concepts.html) and [Architecture](./Architecture.html)
+2. Read the [Quickstart guide](./Quickstart.html) to learn how Helix models and manages a cluster
+3. Install Helix source. See: [Quickstart](./Quickstart.html) for the steps.
+
+### Tutorial Outline
+
+1. [Participant](./tutorial_participant.html)
+2. [Spectator](./tutorial_spectator.html)
+3. [Controller](./tutorial_controller.html)
+4. [Rebalancing Algorithms](./tutorial_rebalance.html)
+5. [State Machines](./tutorial_state.html)
+6. [Messaging](./tutorial_messaging.html)
+7. [Customized health check](./tutorial_health.html)
+8. [Throttling](./tutorial_throttling.html)
+9. [Application Property Store](./tutorial_propstore.html)
+10. [Admin Interface](./tutorial_admin.html)
+
+### Preliminaries
+
+First, we need to set up the system. Let\'s walk through the steps in building a distributed system using Helix.
+
+### Start Zookeeper
+
+This starts a zookeeper in standalone mode. For production deployment, see [Apache Zookeeper](http://zookeeper.apache.org) for instructions.
+
+```
+ ./start-standalone-zookeeper.sh 2199 &
+```
+
+### Create a cluster
+
+Creating a cluster will define the cluster in appropriate znodes on zookeeper.
+
+Using the java API:
+
+```
+ // Create setup tool instance
+ // Note: ZK_ADDRESS is the host:port of Zookeeper
+ String ZK_ADDRESS = "localhost:2199";
+ admin = new ZKHelixAdmin(ZK_ADDRESS);
+
+ String CLUSTER_NAME = "helix-demo";
+ //Create cluster namespace in zookeeper
+ admin.addCluster(CLUSTER_NAME);
+```
+
+OR
+
+Using the command-line interface:
+
+```
+ ./helix-admin.sh --zkSvr localhost:2199 --addCluster helix-demo
+```
+
+
+### Configure the nodes of the cluster
+
+First we\'ll add new nodes to the cluster, then configure the nodes in the cluster. Each node in the cluster must be uniquely identifiable.
+The most commonly used convention is hostname:port.
+
+```
+ String CLUSTER_NAME = "helix-demo";
+ int NUM_NODES = 2;
+ String hosts[] = new String[]{"localhost","localhost"};
+ String ports[] = new String[]{7000,7001};
+ for (int i = 0; i < NUM_NODES; i++)
+ {
+
+ InstanceConfig instanceConfig = new InstanceConfig(hosts[i]+ "_" + ports[i]);
+ instanceConfig.setHostName(hosts[i]);
+ instanceConfig.setPort(ports[i]);
+ instanceConfig.setInstanceEnabled(true);
+
+ //Add additional system specific configuration if needed. These can be accessed during the node start up.
+ instanceConfig.getRecord().setSimpleField("key", "value");
+ admin.addInstance(CLUSTER_NAME, instanceConfig);
+
+ }
+```
+
+### Configure the resource
+
+A _resource_ represents the actual task performed by the nodes. It can be a database, index, topic, queue or any other processing entity.
+A _resource_ can be divided into many sub-parts known as _partitions_.
+
+
+#### Define the _state model_ and _constraints_
+
+For scalability and fault tolerance, each partition can have one or more replicas.
+The _state model_ allows one to declare the system behavior by first enumerating the various STATES, and the TRANSITIONS between them.
+A simple model is ONLINE-OFFLINE where ONLINE means the task is active and OFFLINE means it\'s not active.
+You can also specify how many replicas must be in each state, these are known as _constraints_.
+For example, in a search system, one might need more than one node serving the same index to handle the load.
+
+The allowed states:
+
+* MASTER
+* SLAVE
+* OFFLINE
+
+The allowed transitions:
+
+* OFFLINE to SLAVE
+* SLAVE to OFFLINE
+* SLAVE to MASTER
+* MASTER to SLAVE
+
+The constraints:
+
+* no more than 1 MASTER per partition
+* the rest of the replicas should be slaves
+
+The following snippet shows how to declare the _state model_ and _constraints_ for the MASTER-SLAVE model.
+
+```
+
+ StateModelDefinition.Builder builder = new StateModelDefinition.Builder(STATE_MODEL_NAME);
+
+ // Add states and their rank to indicate priority. A lower rank corresponds to a higher priority
+ builder.addState(MASTER, 1);
+ builder.addState(SLAVE, 2);
+ builder.addState(OFFLINE);
+
+ // Set the initial state when the node starts
+ builder.initialState(OFFLINE);
+
+ // Add transitions between the states.
+ builder.addTransition(OFFLINE, SLAVE);
+ builder.addTransition(SLAVE, OFFLINE);
+ builder.addTransition(SLAVE, MASTER);
+ builder.addTransition(MASTER, SLAVE);
+
+ // set constraints on states.
+
+ // static constraint: upper bound of 1 MASTER
+ builder.upperBound(MASTER, 1);
+
+ // dynamic constraint: R means it should be derived based on the replication factor for the cluster
+ // this allows a different replication factor for each resource without
+ // having to define a new state model
+ //
+ builder.dynamicUpperBound(SLAVE, "R");
+
+ StateModelDefinition statemodelDefinition = builder.build();
+ admin.addStateModelDef(CLUSTER_NAME, STATE_MODEL_NAME, myStateModel);
+```
+
+#### Assigning partitions to nodes
+
+The final goal of Helix is to ensure that the constraints on the state model are satisfied.
+Helix does this by assigning a STATE to a partition (such as MASTER, SLAVE), and placing it on a particular node.
+
+There are 3 assignment modes Helix can operate on
+
+* AUTO_REBALANCE: Helix decides the placement and state of a partition.
+* AUTO: Application decides the placement but Helix decides the state of a partition.
+* CUSTOM: Application controls the placement and state of a partition.
+
+For more info on the assignment modes, see [Rebalancing Algorithms](./tutorial_rebalance.html) of the tutorial.
+
+```
+ String RESOURCE_NAME = "MyDB";
+ int NUM_PARTITIONS = 6;
+ STATE_MODEL_NAME = "MasterSlave";
+ String MODE = "AUTO";
+ int NUM_REPLICAS = 2;
+
+ admin.addResource(CLUSTER_NAME, RESOURCE_NAME, NUM_PARTITIONS, STATE_MODEL_NAME, MODE);
+ admin.rebalance(CLUSTER_NAME, RESOURCE_NAME, NUM_REPLICAS);
+```
+