Merge pull request #9229 from planetscale/vtorc-website-naming

Rename master to primary/source in web interface of vtorc
vitessio · Nov 15, 2021 · 693c5db · 693c5db
2 parents 0f6b9ed + d777ac4
commit 693c5db
Show file tree

Hide file tree

Showing 9 changed files with 216 additions and 216 deletions.
diff --git a/web/orchestrator/public/css/orchestrator.css b/web/orchestrator/public/css/orchestrator.css
@@ -787,7 +787,7 @@ body {
     margin-bottom: 8px;
 }
 
-.instance .instance-master-section {
+.instance .instance-primary-section {
   position: absolute;
   bottom: 0px;
   left: 0px;
@@ -796,7 +796,7 @@ body {
   width: 48%;
 }
 
-.instance.accept_drop_check .instance-master-section {
+.instance.accept_drop_check .instance-primary-section {
   height: 100%;
 }
 

diff --git a/web/orchestrator/public/js/cluster-analysis-shared.js b/web/orchestrator/public/js/cluster-analysis-shared.js
@@ -1,25 +1,25 @@
 var interestingAnalysis = {
-	"DeadMaster" : true,
-	"DeadMasterAndReplicas" : true,
-	"DeadMasterAndSomeReplicas" : true,
-	"DeadMasterWithoutReplicas" : true,
-	"UnreachableMasterWithLaggingReplicas": true,
-	"UnreachableMaster" : true,
-	"LockedSemiSyncMaster" : true,
-	"AllMasterReplicasNotReplicating" : true,
-	"AllMasterReplicasNotReplicatingOrDead" : true,
-	"DeadCoMaster" : true,
-	"DeadCoMasterAndSomeReplicas" : true,
-	"DeadIntermediateMaster" : true,
-	"DeadIntermediateMasterWithSingleReplicaFailingToConnect" : true,
-	"DeadIntermediateMasterWithSingleReplica" : true,
-	"DeadIntermediateMasterAndSomeReplicas" : true,
-	"DeadIntermediateMasterAndReplicas" : true,
-	"AllIntermediateMasterReplicasFailingToConnectOrDead" : true,
-	"AllIntermediateMasterReplicasNotReplicating" : true,
-	"UnreachableIntermediateMasterWithLaggingReplicas": true,
-	"UnreachableIntermediateMaster" : true,
-	"BinlogServerFailingToConnectToMaster" : true,
+	"DeadPrimary" : true,
+	"DeadPrimaryAndReplicas" : true,
+	"DeadPrimaryAndSomeReplicas" : true,
+	"DeadPrimaryWithoutReplicas" : true,
+	"UnreachablePrimaryWithLaggingReplicas": true,
+	"UnreachablePrimary" : true,
+	"LockedSemiSyncPrimary" : true,
+	"AllPrimaryReplicasNotReplicating" : true,
+	"AllPrimaryReplicasNotReplicatingOrDead" : true,
+	"DeadCoPrimary" : true,
+	"DeadCoPrimaryAndSomeReplicas" : true,
+	"DeadIntermediatePrimary" : true,
+	"DeadIntermediatePrimaryWithSingleReplicaFailingToConnect" : true,
+	"DeadIntermediatePrimaryWithSingleReplica" : true,
+	"DeadIntermediatePrimaryAndSomeReplicas" : true,
+	"DeadIntermediatePrimaryAndReplicas" : true,
+	"AllIntermediatePrimaryReplicasFailingToConnectOrDead" : true,
+	"AllIntermediatePrimaryReplicasNotReplicating" : true,
+	"UnreachableIntermediatePrimaryWithLaggingReplicas": true,
+	"UnreachableIntermediatePrimary" : true,
+	"BinlogServerFailingToConnectToPrimary" : true,
 };
 
 var errorMapping = {

diff --git a/web/orchestrator/public/js/cluster-tree.js b/web/orchestrator/public/js/cluster-tree.js
@@ -15,7 +15,7 @@ function visualizeInstances(nodesMap, onSvgInstanceWrapper, clusterControl) {
       pseudoChild.children.forEach(function(child) {
         child.parent = pseudoChild;
       });
-      pseudoChild.hasMaster = true;
+      pseudoChild.hasPrimary = true;
       pseudoChild.parent = node;
       pseudoChild.isAnchor = true;
       pseudoChild.id += "__virtualnode";
@@ -28,9 +28,9 @@ function visualizeInstances(nodesMap, onSvgInstanceWrapper, clusterControl) {
   // Calculate tree dimensions
   var maxNodeDepth = 20;
   // virtualDepth is the depth in tree excluding virtual nodes.
-  // Virtual nodes are introduced as a means to present co-masters on same depth while retaining tree structure. This is
-  // merely for visualization purposes. In such case, a virtual node is introduced which is the parent (though not master) of
-  // said co-masters. But the virtual node is not displayed, and does not affect the visualized depth positioning of the nodes
+  // Virtual nodes are introduced as a means to present co-primaries on same depth while retaining tree structure. This is
+  // merely for visualization purposes. In such case, a virtual node is introduced which is the parent (though not primary) of
+  // said co-primaries. But the virtual node is not displayed, and does not affect the visualized depth positioning of the nodes
   // underneath it.
   function getNodeDepth(node, recursiveLevel) {
     if (recursiveLevel > maxNodeDepth)
@@ -94,13 +94,13 @@ function visualizeInstances(nodesMap, onSvgInstanceWrapper, clusterControl) {
 
   var root = null;
   nodesList.forEach(function(node) {
-    if (!node.hasMaster) {
+    if (!node.hasPrimary) {
       root = node;
     }
   });
   if (root == null) {
     nodesList.forEach(function(node) {
-      if (node.isCoMaster) {
+      if (node.isCoPrimary) {
         root = node;
       }
     });