Merge pull request #819 from wenningerk/doc_proposal

DC expands to Designated Controller in most places - make consistent
ClusterLabs · Oct 23, 2015 · 12320da · 12320da
2 parents f08e81c + 64114c0
commit 12320da
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 856 deletions.
diff --git a/crmd/fsa_defines.h b/crmd/fsa_defines.h
@@ -95,14 +95,14 @@ enum crmd_fsa_state {
       http://www.cs.indiana.edu/cgi-bin/techreports/TRNNN.cgi?trnum=TR521
 
       Loosly known as the Bully Algorithm, its major points are:
-      - Election is initiated by any node (N) notices that the coordinator
+      - Election is initiated by any node (N) notices that the controller
 	is no longer responding
       - Concurrent multiple elections are possible
       - Algorithm
 	  + N sends ELECTION messages to all nodes that occur earlier in
 	  the CCM's membership list.
-	  + If no one responds, N wins and becomes coordinator
-	  + N sends out COORDINATOR messages to all other nodes in the
+	  + If no one responds, N wins and becomes controller
+	  + N sends out CONTROLLER messages to all other nodes in the
 	  partition
 	  + If one of higher-ups answers, it takes over. N is done.
       

diff --git a/doc/crm-flowchart.fig b/doc/crm-flowchart.fig
@@ -315,7 +315,7 @@ Single
 	 0.000 -1.000 0.000
 4 1 0 50 0 14 16 0.0000 4 195 3300 3330 3105 Local Resource Manager\001
 4 1 0 50 0 14 14 0.0000 4 120 720 5625 4050 Events\001
-4 1 0 50 0 14 18 0.0000 4 240 4455 5850 1125 Designated Coordinator Node\001
+4 1 0 50 0 14 18 0.0000 4 240 4455 5850 1125 Designated Controller Node\001
 4 1 0 50 0 14 16 0.0000 4 195 3300 14175 3015 Local Resource Manager\001
 4 1 0 50 0 14 14 0.0000 4 120 720 16470 3960 Events\001
 4 1 0 50 0 14 18 0.0000 4 240 5280 16650 1215 Any client node in the partition\001