Orchestrator Integration Removal and orc_client_user removal (#11503)

* feat: remove orchestrator integration Signed-off-by: Manan Gupta <[email protected]> * feat: remove orc_client from the init_db.sql file Signed-off-by: Manan Gupta <[email protected]> * feat: fix imports Signed-off-by: Manan Gupta <[email protected]> Signed-off-by: Manan Gupta <[email protected]>
vitessio · Nov 2, 2022 · 83eef5d · 83eef5d
1 parent 0e300fc
commit 83eef5d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 417 deletions.
diff --git a/config/init_db.sql b/config/init_db.sql
@@ -90,13 +90,6 @@ GRANT SELECT, PROCESS, SUPER, REPLICATION CLIENT, RELOAD
 GRANT SELECT, UPDATE, DELETE, DROP
   ON performance_schema.* TO 'vt_monitoring'@'localhost';
 
-# User for Orchestrator (https://github.com/openark/orchestrator).
-CREATE USER 'orc_client_user'@'%' IDENTIFIED BY 'orc_client_user_password';
-GRANT SUPER, PROCESS, REPLICATION SLAVE, RELOAD
-  ON *.* TO 'orc_client_user'@'%';
-GRANT SELECT
-  ON _vt.* TO 'orc_client_user'@'%';
-
 FLUSH PRIVILEGES;
 
 RESET SLAVE ALL;

diff --git a/doc/releasenotes/16_0_0_summary.md b/doc/releasenotes/16_0_0_summary.md
@@ -6,6 +6,13 @@
 
 ## Major Changes
 
+### Breaking Changes
+
+#### Orchestrator Integration Deletion
+
+Orchestrator integration in `vttablet` was deprecated in the previous release and is deleted in this release.
+Consider using `VTOrc` instead of `Orchestrator`.
+
 ### New command line flags and behavior
 
 #### VTGate: Support query timeout --query-timeout

diff --git a/examples/compose/config/init_db.sql b/examples/compose/config/init_db.sql
@@ -64,13 +64,6 @@ GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, PROCESS, FILE,
   LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW,
   SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER
   ON *.* TO 'vt_filtered'@'localhost';
-# User for Orchestrator (https://github.com/openark/orchestrator).
-# TODO: Reenable when the password is randomly generated.
-CREATE USER 'orc_client_user'@'%' IDENTIFIED BY 'orc_client_user_password';
-GRANT SUPER, PROCESS, REPLICATION SLAVE, RELOAD
-  ON *.* TO 'orc_client_user'@'%';
-GRANT SELECT
-  ON _vt.* TO 'orc_client_user'@'%';
 FLUSH PRIVILEGES;
 RESET SLAVE ALL;
 RESET MASTER;
diff --git a/go/vt/vttablet/tabletmanager/orchestrator.go b/go/vt/vttablet/tabletmanager/orchestrator.go
diff --git a/go/vt/vttablet/tabletmanager/restore.go b/go/vt/vttablet/tabletmanager/restore.go
@@ -30,6 +30,7 @@ import (
 	"vitess.io/vitess/go/vt/log"
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl"
+	"vitess.io/vitess/go/vt/proto/vttime"
 	"vitess.io/vitess/go/vt/servenv"
 	"vitess.io/vitess/go/vt/topo"
 	"vitess.io/vitess/go/vt/topo/topoproto"
@@ -40,7 +41,6 @@ import (
 	binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata"
 	topodatapb "vitess.io/vitess/go/vt/proto/topodata"
 	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
-	"vitess.io/vitess/go/vt/proto/vttime"
 )
 
 // This file handles the initial backup restore upon startup.
@@ -105,16 +105,6 @@ func (tm *TabletManager) RestoreData(ctx context.Context, logger logutil.Logger,
 	if tm.Cnf == nil {
 		return fmt.Errorf("cannot perform restore without my.cnf, please restart vttablet with a my.cnf file specified")
 	}
-	// Tell Orchestrator we're stopped on purpose for some Vitess task.
-	// Do this in the background, as it's best-effort.
-	go func() {
-		if tm.orc == nil {
-			return
-		}
-		if err := tm.orc.BeginMaintenance(tm.Tablet(), "vttablet has been told to Restore"); err != nil {
-			log.Warningf("Orchestrator BeginMaintenance failed: %v", err)
-		}
-	}()
 
 	var (
 		err       error
@@ -155,17 +145,6 @@ func (tm *TabletManager) RestoreData(ctx context.Context, logger logutil.Logger,
 	if err != nil {
 		return err
 	}
-
-	// Tell Orchestrator we're no longer stopped on purpose.
-	// Do this in the background, as it's best-effort.
-	go func() {
-		if tm.orc == nil {
-			return
-		}
-		if err := tm.orc.EndMaintenance(tm.Tablet()); err != nil {
-			log.Warningf("Orchestrator EndMaintenance failed: %v", err)
-		}
-	}()
 	return nil
 }
 

diff --git a/go/vt/vttablet/tabletmanager/rpc_backup.go b/go/vt/vttablet/tabletmanager/rpc_backup.go
@@ -17,11 +17,10 @@ limitations under the License.
 package tabletmanager
 
 import (
+	"context"
 	"fmt"
 	"time"
 
-	"context"
-
 	"vitess.io/vitess/go/vt/logutil"
 	"vitess.io/vitess/go/vt/mysqlctl"
 	"vitess.io/vitess/go/vt/topo/topoproto"
@@ -89,16 +88,6 @@ func (tm *TabletManager) Backup(ctx context.Context, logger logutil.Logger, req
 		if err := tm.changeTypeLocked(ctx, topodatapb.TabletType_BACKUP, DBActionNone, SemiSyncActionUnset); err != nil {
 			return err
 		}
-		// Tell Orchestrator we're stopped on purpose for some Vitess task.
-		// Do this in the background, as it's best-effort.
-		go func() {
-			if tm.orc == nil {
-				return
-			}
-			if err := tm.orc.BeginMaintenance(tm.Tablet(), "vttablet has been told to run an offline backup"); err != nil {
-				logger.Warningf("Orchestrator BeginMaintenance failed: %v", err)
-			}
-		}()
 	}
 	// create the loggers: tee to console and source
 	l := logutil.NewTeeLogger(logutil.NewConsoleLogger(), logger)
@@ -134,17 +123,6 @@ func (tm *TabletManager) Backup(ctx context.Context, logger logutil.Logger, req
 				l.Errorf("mysql backup command returned error: %v", returnErr)
 			}
 			returnErr = err
-		} else {
-			// Tell Orchestrator we're no longer stopped on purpose.
-			// Do this in the background, as it's best-effort.
-			go func() {
-				if tm.orc == nil {
-					return
-				}
-				if err := tm.orc.EndMaintenance(tm.Tablet()); err != nil {
-					logger.Warningf("Orchestrator EndMaintenance failed: %v", err)
-				}
-			}()
 		}
 	}