resolves merge conflicts

Signed-off-by: Vitaliy Mogilevskiy <[email protected]>

.github/pull_request_template.md

@@ -1,4 +1,5 @@
 <!--
+  Thank you for your contribution to the Vitess project.
   How to contribute: https://vitess.io/docs/contributing/
   Please first make sure there is an open Issue to discuss the feature/fix suggested in this PR.
   If this is a new feature, please mark the Issue as "RFC".
@@ -8,25 +9,15 @@
 
 ## Description
 <!-- A few sentences describing the overall goals of the pull request's commits. -->
+<!-- If this is a bug fix and you think the fix should be backported, please write so. -->
 
 ## Related Issue(s)
-<!-- List related issues and pull requests: -->
+<!-- List related issues and pull requests. If this PR fixes an issue, please add it using Fixes #????  -->
 
-- 
 
 ## Checklist
-- [ ] Should this PR be backported?
 - [ ] Tests were added or are not required
 - [ ] Documentation was added or is not required
 
 ## Deployment Notes
-<!-- Notes regarding deployment of the contained body of work. These should note any db migrations, etc. -->
-
-## Impacted Areas in Vitess
-Components that this PR will affect:
-
-- [ ]  Query Serving
-- [ ]  VReplication
-- [ ]  Cluster Management
-- [ ]  Build/CI
-- [ ]  VTAdmin
+<!-- Notes regarding deployment of the contained body of work. These should note any db migrations, etc. -->

.github/workflows/check_formatting.yml

@@ -4,13 +4,23 @@ jobs:
 
   build:
     name: Check Formatting
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
 
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
+
+    - name: Tune the OS
+      run: |
+        echo '1024 65535' | sudo tee -a /proc/sys/net/ipv4/ip_local_port_range
+
+    # TEMPORARY WHILE GITHUB FIXES THIS https://github.com/actions/virtual-environments/issues/3185
+    - name: Add the current IP address, long hostname and short hostname record to /etc/hosts file
+      run: |
+        echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
+    # DON'T FORGET TO REMOVE CODE ABOVE WHEN ISSUE IS ADRESSED!
 
     - name: Check out code
       uses: actions/checkout@v2

.github/workflows/check_make_parser.yml

@@ -4,25 +4,26 @@ jobs:
 
   build:
     name: Check Make Parser
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
 
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
+
+    - name: Tune the OS
+      run: |
+        echo '1024 65535' | sudo tee -a /proc/sys/net/ipv4/ip_local_port_range
 
     - name: Check out code
       uses: actions/checkout@v2
 
     - name: Get dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
-        sudo service mysql stop
+        sudo apt-get install -y make unzip g++ etcd curl git wget
         sudo service etcd stop
-        sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-        sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
     - name: Run make minimaltools

.github/workflows/check_make_sizegen.yml

@@ -6,30 +6,31 @@ jobs:
     name: Check Make Sizegen
     runs-on: ubuntu-latest
     steps:
+
+    - name: Set up Go
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.16
 
-      - name: Set up Go
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.15
+    - name: Tune the OS
+      run: |
+        echo '1024 65535' | sudo tee -a /proc/sys/net/ipv4/ip_local_port_range
 
-      - name: Check out code
-        uses: actions/checkout@v2
+    - name: Check out code
+      uses: actions/checkout@v2
 
-      - name: Get dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
-          sudo service mysql stop
-          sudo service etcd stop
-          sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-          sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-          go mod download
+    - name: Get dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y make unzip g++ etcd curl git wget
+        sudo service etcd stop
+        go mod download
 
-      - name: Run make minimaltools
-        run: |
-          make minimaltools
+    - name: Run make minimaltools
+      run: |
+        make minimaltools
 
-      - name: check_make_sizegen
-        run: |
-          tools/check_make_sizegen.sh
+    - name: check_make_sizegen
+      run: |
+        tools/check_make_sizegen.sh
 

.github/workflows/check_make_visitor.yml

@@ -4,25 +4,26 @@ jobs:
 
   build:
     name: Check Make Visitor
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
 
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
+
+    - name: Tune the OS
+      run: |
+        echo '1024 65535' | sudo tee -a /proc/sys/net/ipv4/ip_local_port_range
 
     - name: Check out code
       uses: actions/checkout@v2
 
     - name: Get dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
-        sudo service mysql stop
+        sudo apt-get install -y make unzip g++ etcd curl git wget
         sudo service etcd stop
-        sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-        sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
     - name: Run make minimaltools

.github/workflows/cluster_endtoend_11.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_12.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_13.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_14.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_15.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_16.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_17.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_18.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_19.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_20.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_21.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_22.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_23.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_24.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_26.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_mysql80.yml

@@ -5,13 +5,24 @@ on: [push, pull_request]
 jobs:
 
   build:
+    name: Run endtoend tests on Cluster (mysql80)
     runs-on: ubuntu-20.04
 
     steps:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
+
+    - name: Tune the OS
+      run: |
+        echo '1024 65535' | sudo tee -a /proc/sys/net/ipv4/ip_local_port_range
+
+    # TEMPORARY WHILE GITHUB FIXES THIS https://github.com/actions/virtual-environments/issues/3185
+    - name: Add the current IP address, long hostname and short hostname record to /etc/hosts file
+      run: |
+        echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
+    # DON'T FORGET TO REMOVE CODE ABOVE WHEN ISSUE IS ADRESSED!
 
     - name: Check out code
       uses: actions/checkout@v2

.github/workflows/cluster_endtoend_onlineddl_declarative.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_onlineddl_ghost.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |

.github/workflows/cluster_endtoend_onlineddl_revert.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: 1.16
 
     - name: Tune the OS
       run: |