Revert "2020-07-29 Update of code"

.github/workflows/docker_test_2.yml → .github/workflows/cluster_vtctl_web.yml

@@ -1,11 +1,10 @@
-name: docker test 2
+name: cluster_vtctl_web
 on: [push, pull_request]
 jobs:
 
  build:
- name: Docker Test 2
+ name: cluster vtctl web
  runs-on: ubuntu-latest
-
  steps:
 
  - name: Set up Go
@@ -16,6 +15,8 @@ jobs:
  - name: Check out code
  uses: actions/checkout@v2
 
- - name: Run tests which requires docker - 2
+ - name: Run vtctl web
  run: |
- go run test.go -docker=true --follow -shard 25
+ # Running web test inside docker
+ go run test.go -docker=true -print-log -shard 10
+

.github/workflows/docker_test_1.yml → .github/workflows/misc_test_docker.yml

@@ -1,11 +1,10 @@
-name: docker_test_1
+name: misc test
 on: [push, pull_request]
 jobs:
 
  build:
- name: Docker Test 1
+ name: Misc Test
  runs-on: ubuntu-latest
-
  steps:
 
  - name: Set up Go
@@ -16,6 +15,6 @@ jobs:
  - name: Check out code
  uses: actions/checkout@v2
 
- - name: Run tests which requires docker 1
+ - name: Run Misc test which requires docker
  run: |
- go run test.go -docker=true --follow -shard 10
+ go run test.go -docker=true -shard 25

Makefile

@@ -22,7 +22,7 @@ export REWRITER=go/vt/sqlparser/rewriter.go
 # Since we are not using this Makefile for compilation, limiting parallelism will not increase build time.
 .NOTPARALLEL:
 
-.PHONY: all build install test clean unit_test unit_test_cover unit_test_race integration_test proto proto_banner site_test site_integration_test docker_bootstrap docker_test docker_unit_test java_test reshard_tests e2e_test e2e_test_race minimaltools tools web_bootstrap web_build web_start
+.PHONY: all build build_web install test clean unit_test unit_test_cover unit_test_race integration_test proto proto_banner site_test site_integration_test docker_bootstrap docker_test docker_unit_test java_test reshard_tests e2e_test e2e_test_race minimaltools tools
 
 all: build
 
@@ -37,11 +37,22 @@ ifdef VT_EXTRA_BUILD_FLAGS
 export EXTRA_BUILD_FLAGS := $(VT_EXTRA_BUILD_FLAGS)
 endif
 
+# This target needs to be manually run every time any file within web/vtctld2/app is modified to regenerate rice-box.go
+embed_static: 
+ cd go/vt/vtctld
+ go run github.com/GeertJohan/go.rice/rice embed-go
+ go build .
+
 embed_config:
  cd go/vt/mysqlctl
  go run github.com/GeertJohan/go.rice/rice embed-go
  go build .
 
+build_web:
+ echo $$(date): Building web artifacts
+ cd web/vtctld2 && ng build -prod
+ cp -f web/vtctld2/src/{favicon.ico,plotly-latest.min.js,primeui-ng-all.min.css} web/vtctld2/dist/
+
 build:
 ifndef NOBANNER
  echo $$(date): Building source tree
@@ -276,14 +287,6 @@ docker_lite_testing:
  chmod -R o=g *
  docker build -f docker/lite/Dockerfile.testing -t vitess/lite:testing .
 
-docker_local:
- chmod -R o=g *
- docker build -f docker/local/Dockerfile -t vitess/local .
-
-docker_mini:
- chmod -R o=g *
- docker build -f docker/mini/Dockerfile -t vitess/mini .
-
 # This rule loads the working copy of the code into a bootstrap image,
 # and then runs the tests inside Docker.
 # Example: $ make docker_test flavor=mariadb
@@ -348,19 +351,3 @@ client_go_gen:
  # Move and cleanup
  mv vitess.io/vitess/go/vt/topo/k8stopo/client go/vt/topo/k8stopo/
  rmdir -p vitess.io/vitess/go/vt/topo/k8stopo/
-
-# Check prerequisites and install dependencies
-web_bootstrap:
- ./tools/web_bootstrap.sh
-
-# Do a production build of the vtctld UI.
-# This target needs to be manually run every time any file within web/vtctld2/app 
-# is modified to regenerate rice-box.go
-web_build: web_bootstrap
- ./tools/web_build.sh
-
-# Start a front-end dev server with hot reloading on http://localhost:4200.
-# This expects that you have a vtctld API server running on http://localhost:15000.
-# Following the local Docker install guide is recommended: https://vitess.io/docs/get-started/local-docker/
-web_start: web_bootstrap
- cd web/vtctld2 && npm run start

build.env

@@ -43,4 +43,3 @@ mkdir -p .git/hooks
 ln -sf "$PWD/misc/git/pre-commit" .git/hooks/pre-commit
 ln -sf "$PWD/misc/git/commit-msg" .git/hooks/commit-msg
 git config core.hooksPath .git/hooks
-export EXTRA_BIN=$PWD/test/bin

config/init_db.sql

@@ -91,7 +91,7 @@ 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).
+# User for Orchestrator (https://github.com/github/orchestrator).
 CREATE USER 'orc_client_user'@'%' IDENTIFIED BY 'orc_client_user_password';
 GRANT SUPER, PROCESS, REPLICATION SLAVE, RELOAD
  ON *.* TO 'orc_client_user'@'%';

config/mycnf/default.cnf

@@ -19,6 +19,7 @@ server-id = {{.ServerID}}
 # additional configuration (like enabling semi-sync) before we connect to
 # the master.
 skip_slave_start
+slave_load_tmpdir = {{.SlaveLoadTmpDir}}
 socket = {{.SocketFile}}
 tmpdir = {{.TmpDir}}
 

config/tablet/default.yaml

@@ -78,27 +78,16 @@ oltp:
  maxRows: 10000 # queryserver-config-max-result-size
  warnRows: 0 # queryserver-config-warn-result-size
 
-healthcheck:
- intervalSeconds: 20 # health_check_interval
- degradedThresholdSeconds: 30 # degraded_threshold
- unhealthyThresholdSeconds: 7200 # unhealthy_threshold
-
-gracePeriods:
- transactionShutdownSeconds: 0 # transaction_shutdown_grace_period
- transitionSeconds: 0 # serving_state_grace_period
-
-replicationTracker:
- mode: disable # enable_replication_reporter
- heartbeatIntervalMilliseconds: 0 # heartbeat_enable, heartbeat_interval
-
 hotRowProtection:
  mode: disable|dryRun|enable # enable_hot_row_protection, enable_hot_row_protection_dry_run
- # Recommended value: same as txPool.size.
+ # Default value is same as txPool.size.
  maxQueueSize: 20 # hot_row_protection_max_queue_size
  maxGlobalQueueSize: 1000 # hot_row_protection_max_global_queue_size
  maxConcurrency: 5 # hot_row_protection_concurrent_transactions
 
 consolidator: enable|disable|notOnMaster # enable-consolidator, enable-consolidator-replicas
+heartbeatIntervalMilliseconds: 0 # heartbeat_enable, heartbeat_interval
+shutdownGracePeriodSeconds: 0 # transaction_shutdown_grace_period
 passthroughDML: false # queryserver-config-passthrough-dmls
 streamBufferSize: 32768 # queryserver-config-stream-buffer-size
 queryCacheSize: 5000 # queryserver-config-query-cache-size

docker/k8s/orchestrator/Dockerfile

@@ -19,7 +19,7 @@ FROM debian:stretch-slim
 RUN apt-get update && \
  apt-get upgrade -qq && \
  apt-get install wget ca-certificates jq -qq --no-install-recommends && \
- wget https://github.com/openark/orchestrator/releases/download/v3.1.1/orchestrator_3.1.0_amd64.deb && \
+ wget https://github.com/github/orchestrator/releases/download/v3.1.1/orchestrator_3.1.0_amd64.deb && \
  dpkg -i orchestrator_3.1.0_amd64.deb && \
  rm orchestrator_3.1.0_amd64.deb && \
  apt-get purge wget -qq && \