Skip to content

Rename master to primary/source in web interface of vtorc - 12.0 #9254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harshit-gangal merged 1 commit into from
Nov 18, 2021
Merged

Rename master to primary/source in web interface of vtorc - 12.0 #9254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions web/orchestrator/public/css/orchestrator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ body {
margin-bottom: 8px;
}

.instance .instance-master-section {
.instance .instance-primary-section {
position: absolute;
bottom: 0px;
left: 0px;
Expand All @@ -796,7 +796,7 @@ body {
width: 48%;
}

.instance.accept_drop_check .instance-master-section {
.instance.accept_drop_check .instance-primary-section {
height: 100%;
}

Expand Down
42 changes: 21 additions & 21 deletions web/orchestrator/public/js/cluster-analysis-shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
12 changes: 6 additions & 6 deletions web/orchestrator/public/js/cluster-tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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)
Expand Down Expand Up @@ -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;
}
});
Expand Down
Loading