Merge pull request #6484 from planetscale/ds-7.0-backport-6481

Backport #6481
vitessio · Jul 28, 2020 · 10b0928 · 10b0928
2 parents b53e1a2 + 02eb3b8
commit 10b0928
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 59 deletions.
diff --git a/go/vt/vtctld/rice-box.go b/go/vt/vtctld/rice-box.go
diff --git a/tools/web_bootstrap.sh b/tools/web_bootstrap.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2019 The Vitess Authors.
+# Copyright 2020 The Vitess Authors.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/tools/web_build.sh b/tools/web_build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2019 The Vitess Authors.
+# Copyright 2020 The Vitess Authors.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/web/vtctld2/app/index.html b/web/vtctld2/app/index.html
@@ -27,5 +27,5 @@
 </head>
 <body class="flex-column">
   <vt-app-root class="flex-column flex-grow">Loading...</vt-app-root>
-<script type="text/javascript" src="inline.js"></script><script type="text/javascript" src="styles.38b88af69dfd283498eb.bundle.js"></script><script type="text/javascript" src="main.3a2141f06032f2bc1229.bundle.js"></script></body>
+<script type="text/javascript" src="inline.js"></script><script type="text/javascript" src="styles.38b88af69dfd283498eb.bundle.js"></script><script type="text/javascript" src="main.9a3d6a925af135b7c609.bundle.js"></script></body>
 </html>
diff --git a/web/vtctld2/app/inline.js b/web/vtctld2/app/inline.js
diff --git a/...2/app/main.3a2141f06032f2bc1229.bundle.js → ...2/app/main.9a3d6a925af135b7c609.bundle.js b/...2/app/main.3a2141f06032f2bc1229.bundle.js → ...2/app/main.9a3d6a925af135b7c609.bundle.js
diff --git a/...pp/main.3a2141f06032f2bc1229.bundle.js.gz → ...pp/main.9a3d6a925af135b7c609.bundle.js.gz b/...pp/main.3a2141f06032f2bc1229.bundle.js.gz → ...pp/main.9a3d6a925af135b7c609.bundle.js.gz
diff --git a/web/vtctld2/src/app/dashboard/shard.component.ts b/web/vtctld2/src/app/dashboard/shard.component.ts
@@ -120,8 +120,8 @@ export class ShardComponent implements OnInit, OnDestroy {
     if (!isMaster) {
       // Add replication-related methods to the 'Change' section for slaves.
       result[1].items.push(
-        {label: 'Start Slave', command: (event) => {this.openStartSlaveDialog(); }},
-        {label: 'Stop Slave', command: (event) => {this.openStopSlaveDialog(); }},
+        {label: 'Start Replication', command: (event) => {this.openStartSlaveDialog(); }},
+        {label: 'Stop Replication', command: (event) => {this.openStopSlaveDialog(); }},
       );
     }
     if (this.featuresService.activeReparents) {
@@ -490,20 +490,20 @@ export class ShardComponent implements OnInit, OnDestroy {
   }
 
   openStartSlaveDialog() {
-    this.dialogSettings = new DialogSettings('Start', `Start Slave on ${this.selectedTablet.label}`,
-                                             `Restart replication on slave ${this.selectedTablet.label}.`,
-                                             `There was a problem starting slave on ${this.selectedTablet.label}:`);
-    this.dialogSettings.setMessage(`Started Slave on ${this.selectedTablet.label}`);
+    this.dialogSettings = new DialogSettings('Start', `Start replication on ${this.selectedTablet.label}`,
+                                             `Restart replication on ${this.selectedTablet.label}.`,
+                                             `There was a problem starting replication on ${this.selectedTablet.label}:`);
+    this.dialogSettings.setMessage(`Started replication on ${this.selectedTablet.label}`);
     let flags = new PingTabletFlags(this.selectedTablet.alias).flags;
     this.dialogContent = new DialogContent('tablet_alias', flags, {}, undefined, 'StartSlave');
     this.dialogSettings.toggleModal();
   }
 
   openStopSlaveDialog() {
-    this.dialogSettings = new DialogSettings('Stop', `Stop Slave on ${this.selectedTablet.label}`,
-                                             `Stop replication on slave ${this.selectedTablet.label}. May render the tablet unhealthy.`,
-                                             `There was a problem stopping slave on ${this.selectedTablet.label}:`);
-    this.dialogSettings.setMessage(`Stopped Slave on ${this.selectedTablet.label}`);
+    this.dialogSettings = new DialogSettings('Stop', `Stop replication on ${this.selectedTablet.label}`,
+                                             `Stop replication on ${this.selectedTablet.label}. May render the tablet unhealthy.`,
+                                             `There was a problem stopping replication on ${this.selectedTablet.label}:`);
+    this.dialogSettings.setMessage(`Stopped replication on ${this.selectedTablet.label}`);
     let flags = new PingTabletFlags(this.selectedTablet.alias).flags;
     this.dialogContent = new DialogContent('tablet_alias', flags, {}, undefined, 'StopSlave');
     this.dialogSettings.toggleModal();

diff --git a/web/vtctld2/src/app/dashboard/tablet.component.ts b/web/vtctld2/src/app/dashboard/tablet.component.ts
@@ -116,19 +116,19 @@ export class TabletComponent implements OnInit, OnDestroy {
   }
 
   openStartSlaveDialog() {
-    this.dialogSettings = new DialogSettings('Start', `Start Slave, ${this.tablet.label}`, '',
-                                             `There was a problem starting slave, ${this.tablet.label}:`);
-    this.dialogSettings.setMessage(`Started Slave, ${this.tablet.label}`);
+    this.dialogSettings = new DialogSettings('Start', `Start Replication, ${this.tablet.label}`, '',
+                                             `There was a problem starting replication on, ${this.tablet.label}:`);
+    this.dialogSettings.setMessage(`Started Replication, ${this.tablet.label}`);
     this.dialogSettings.onCloseFunction = this.refreshTabletView.bind(this);
     let flags = new PingTabletFlags(this.tablet.ref).flags;
     this.dialogContent = new DialogContent('tablet_alias', flags, {}, undefined, 'StartSlave');
     this.dialogSettings.toggleModal();
   }
 
   openStopSlaveDialog() {
-    this.dialogSettings = new DialogSettings('Stop', `Stop Slave, ${this.tablet.label}`, '',
-                                             `There was a problem stopping slave, ${this.tablet.label}:`);
-    this.dialogSettings.setMessage(`Stopped Slave, ${this.tablet.label}`);
+    this.dialogSettings = new DialogSettings('Stop', `Stop Replication, ${this.tablet.label}`, '',
+                                             `There was a problem stopping replication on, ${this.tablet.label}:`);
+    this.dialogSettings.setMessage(`Stopped Replication, ${this.tablet.label}`);
     this.dialogSettings.onCloseFunction = this.refreshTabletView.bind(this);
     let flags = new PingTabletFlags(this.tablet.ref).flags;
     this.dialogContent = new DialogContent('tablet_alias', flags, {}, undefined, 'StopSlave');