upstream update

.travis.yml

@@ -115,11 +115,6 @@ before_script:
 script:
   # Log GOMAXPROCS (should be 2 as of 07/2015).
   - go run travis/log_gomaxprocs.go
-  # Shard 0: Run unit tests and post coverage to coveralls.io (will show up on pull request).
-  - |
-    if [[ $TEST_MATRIX = *"-shard 0"* ]]; then
-      go run test.go $TEST_FLAGS goveralls
-    fi
   - |
     if [[ $TRAVIS_PULL_REQUEST = "false" ]]; then
       go run test.go $TEST_FLAGS $TEST_MATRIX

Makefile

@@ -70,11 +70,6 @@ unit_test_cover: build
 unit_test_race: build
 	tools/unit_test_race.sh
 
-# Run coverage and upload to coveralls.io.
-# Requires the secret COVERALLS_TOKEN env variable to be set.
-unit_test_goveralls: build
-	travis/goveralls.sh
-
 .ONESHELL:
 SHELL = /bin/bash
 
@@ -176,7 +171,7 @@ docker_base:
 
 docker_base_mysql56:
 	chmod -R o=g *
-	docker build -f Dockerfile.percona -t vitess/base:mysql56 .
+	docker build -f Dockerfile.mysql56 -t vitess/base:mysql56 .
 
 docker_base_mariadb:
 	chmod -R o=g *

bootstrap.sh

@@ -137,8 +137,6 @@ gotools=" \
        honnef.co/go/unused/cmd/unused \
 "
 
-# Tools for uploading code coverage to coveralls.io (used by Travis CI).
-gotools+=" github.com/modocache/gover github.com/mattn/goveralls"
 # The cover tool needs to be installed into the Go toolchain, so it will fail
 # if Go is installed somewhere that requires root access.
 source tools/shell_functions.inc

config/mycnf/rbr.cnf

@@ -0,0 +1 @@
+binlog-format=row

data/test/tabletserver/ddl_cases.txt

@@ -8,6 +8,11 @@
   "Action": "drop", "TableName": "b"
 }
 
+"drop table b.c"
+{
+  "Action": "drop", "TableName": "b.c"
+}
+
 "alter table c alter foo"
 {
   "Action": "alter", "TableName": "c", "NewTable": "c"
@@ -18,16 +23,31 @@
   "Action": "alter", "TableName": "c", "NewTable": "c"
 }
 
+"alter table b.c comment 'aa'"
+{
+  "Action": "alter", "TableName": "b.c", "NewTable": "b.c"
+}
+
 "drop index a on b"
 {
   "Action": "alter", "TableName": "b", "NewName": "b"
 }
 
+"drop index a on b.c"
+{
+  "Action": "alter", "TableName": "b.c", "NewName": "b.c"
+}
+
 "rename table a to b"
 {
   "Action": "rename", "TableName": "a", "NewTable": "b"
 }
 
+"rename table c.a to c.b"
+{
+  "Action": "rename", "TableName": "c.a", "NewTable": "c.b"
+}
+
 "alter table a rename b"
 {
   "Action": "rename", "TableName": "a", "NewTable": "b"
@@ -38,12 +58,17 @@
   "Action": "rename", "TableName": "a", "NewTable": "b"
 }
 
+"alter table c.a rename to c.b"
+{
+  "Action": "rename", "TableName": "c.a", "NewTable": "c.b"
+}
+
 "create view a asdasd"
 {
   "Action": "create", "NewName": "a"
 }
 
-"alter view c alter foo"
+"alter view c as foo"
 {
   "Action": "alter", "TableName": "c", "NewTable": "c"
 }

data/test/vtgate/unsupported_cases.txt

@@ -10,6 +10,15 @@
 "create table a(id int)"
 "unsupported construct"
 
+"create table a.b(id int)"
+"unsupported construct"
+
+"alter table a ADD id int"
+"unsupported construct"
+
+"alter table a.b ADD id int"
+"unsupported construct"
+
 # DBA statements
 "explain select * from user"
 "unsupported construct"

dev.env

@@ -36,11 +36,11 @@ export PYTHONPATH=$(prepend_path $PYTHONPATH $VTTOP/test)
 export PYTHONPATH=$(prepend_path $PYTHONPATH $VTTOP/test/cluster/sandbox)
 
 # Ensure bootstrap and install_grpc use python2 on systems which default to python3
-command -v python2  && PYTHON=python2 || PYTHON=python
+command -v python2 >/dev/null && PYTHON=python2 || PYTHON=python
 export PYTHON
-command -v pip2 && PIP=pip2 || PIP=pip
+command -v pip2 >/dev/null && PIP=pip2 || PIP=pip
 export PIP
-command -v virtualenv2 && VIRTUALENV=virtualenv2 || VIRTUALENV=virtualenv
+command -v virtualenv2 >/dev/null && VIRTUALENV=virtualenv2 || VIRTUALENV=virtualenv
 export VIRTUALENV
 
 selenium_dist=$VTROOT/dist/selenium

doc/HorizontalReshardingGuide.md

@@ -36,18 +36,18 @@ We do this by providing a VSchema definition as follows:
 
 ``` json
 {
-  "Sharded": true,
-  "Vindexes": {
+  "sharded": true,
+  "vindexes": {
     "hash": {
-      "Type": "hash"
+      "type": "hash"
     }
   },
-  "Tables": {
+  "tables": {
     "messages": {
-      "ColVindexes": [
+      "column_vindexes": [
         {
-          "Col": "page",
-          "Name": "hash"
+          "column": "page",
+          "name": "hash"
         }
       ]
     }

doc/ReplicatoinLagBasedThrottlingOfTransactions.md

@@ -0,0 +1,42 @@
+# Replication Lag Based Throttling of Transactions 
+Vitess supports throttling of transactions based on replication lag. When this
+feature is turned on, each VTTablet master monitors the replication lag from
+the replicas, and based on the observed replication lag tries to rate-limit the
+received transactions to keep the replication lag under a configured limit.
+
+The decision of whether to throttle a transaction is done in the "BEGIN"
+statement rather than in the "COMMIT" statement to avoid having a transaction
+perform a lot of work just to eventually be throttled and potentially 
+rolled-back if the open-transaction timeout is exceeded.
+
+If a BEGIN statement is throttled the client receives the gRPC UNAVAILABLE
+error code.
+
+The following VTTablet command line flags control the replication-lag based 
+throttler:
+
+* *enable-tx-throttler*
+
+A boolean flag controling whether the replication-lag-based throttling is enabled.
+
+* *tx-throttler-config*
+
+A text-format representation of the  [throttlerdata.Configuration](https://github.com/youtube/vitess/blob/master/proto/throttlerdata.proto) protocol buffer 
+that contains configuration options for the throttler. 
+The most important fields in that message are *target_replication_lag_sec* and 
+*max_replication_lag_sec* that specify the desired limits on the replication lag. See the comments in the protocol definition file for more details.
+If this is not specified a [default](https://github.com/youtube/vitess/blob/master/go/vt/tabletserver/tabletenv/config.go) configuration will be used.
+
+* *tx-throttler-healthcheck-cells*
+
+A comma separated list of datacenter cells. The throttler will only monitor
+the non-RDONLY replicas found in these cells for replication lag.
+
+# Caveats and Known Issues
+* The throttler keeps trying to explore the maximum rate possible while keeping
+the replication lag under the desired limit; as such the desired replication 
+lag limit may occasionally be slightly violated.
+
+* Transactions are considered homegenous. There is currently no support
+for specifying how "expensive" a transaction is.
+

doc/ShardingKubernetes.md

@@ -29,18 +29,18 @@ We do this by providing a VSchema definition as follows:
 
 ``` json
 {
-  "Sharded": true,
-  "Vindexes": {
+  "sharded": true,
+  "vindexes": {
     "hash": {
-      "Type": "hash"
+      "type": "hash"
     }
   },
-  "Tables": {
+  "tables": {
     "messages": {
-      "ColVindexes": [
+      "column_vindexes": [
         {
-          "Col": "page",
-          "Name": "hash"
+          "column": "page",
+          "name": "hash"
         }
       ]
     }

docs/sitemap.xml

@@ -22,25 +22,25 @@
     <loc>http://vitess.io/user-guide/horizontal-sharding.html</loc>
   </url>
   <url>
-    <loc>http://vitess.io/overview/</loc>
+    <loc>http://vitess.io/about/</loc>
   </url>
   <url>
-    <loc>http://vitess.io/about/</loc>
+    <loc>http://vitess.io/search/</loc>
   </url>
   <url>
-    <loc>http://vitess.io/terms/</loc>
+    <loc>http://vitess.io/overview/</loc>
   </url>
   <url>
-    <loc>http://vitess.io/</loc>
+    <loc>http://vitess.io/getting-started/</loc>
   </url>
   <url>
-    <loc>http://vitess.io/search/</loc>
+    <loc>http://vitess.io/contributing/</loc>
   </url>
   <url>
-    <loc>http://vitess.io/getting-started/</loc>
+    <loc>http://vitess.io/terms/</loc>
   </url>
   <url>
-    <loc>http://vitess.io/contributing/</loc>
+    <loc>http://vitess.io/</loc>
   </url>
   <url>
     <loc>http://vitess.io/user-guide/introduction.html</loc>

docs/user-guide/horizontal-sharding.html

@@ -319,18 +319,18 @@ <h2 id="configure-sharding-information">Configure sharding information</h2>
 <p>The first step is to tell Vitess how we want to partition the data.
 We do this by providing a VSchema definition as follows:</p>
 <div class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span>
-  <span class="nt">&quot;Sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
-  <span class="nt">&quot;Vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
+  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
     <span class="nt">&quot;hash&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;Type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
     <span class="p">}</span>
   <span class="p">},</span>
-  <span class="nt">&quot;Tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
     <span class="nt">&quot;messages&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;ColVindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
+      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
         <span class="p">{</span>
-          <span class="nt">&quot;Col&quot;</span><span class="p">:</span> <span class="s2">&quot;page&quot;</span><span class="p">,</span>
-          <span class="nt">&quot;Name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;page&quot;</span><span class="p">,</span>
+          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
         <span class="p">}</span>
       <span class="p">]</span>
     <span class="p">}</span>

docs/user-guide/sharding-kubernetes.html

@@ -315,18 +315,18 @@ <h2 id="configure-sharding-information">Configure sharding information</h2>
 <p>The first step is to tell Vitess how we want to partition the data.
 We do this by providing a VSchema definition as follows:</p>
 <div class="highlight"><pre><code class="language-json" data-lang="json"><span class="p">{</span>
-  <span class="nt">&quot;Sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
-  <span class="nt">&quot;Vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
+  <span class="nt">&quot;sharded&quot;</span><span class="p">:</span> <span class="kc">true</span><span class="p">,</span>
+  <span class="nt">&quot;vindexes&quot;</span><span class="p">:</span> <span class="p">{</span>
     <span class="nt">&quot;hash&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;Type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+      <span class="nt">&quot;type&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
     <span class="p">}</span>
   <span class="p">},</span>
-  <span class="nt">&quot;Tables&quot;</span><span class="p">:</span> <span class="p">{</span>
+  <span class="nt">&quot;tables&quot;</span><span class="p">:</span> <span class="p">{</span>
     <span class="nt">&quot;messages&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="nt">&quot;ColVindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
+      <span class="nt">&quot;column_vindexes&quot;</span><span class="p">:</span> <span class="p">[</span>
         <span class="p">{</span>
-          <span class="nt">&quot;Col&quot;</span><span class="p">:</span> <span class="s2">&quot;page&quot;</span><span class="p">,</span>
-          <span class="nt">&quot;Name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
+          <span class="nt">&quot;column&quot;</span><span class="p">:</span> <span class="s2">&quot;page&quot;</span><span class="p">,</span>
+          <span class="nt">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;hash&quot;</span>
         <span class="p">}</span>
       <span class="p">]</span>
     <span class="p">}</span>

examples/kubernetes/env.sh

@@ -6,9 +6,17 @@
 # use cases just need KUBECTL=kubectl, we'll make that the default.
 KUBECTL=${KUBECTL:-kubectl}
 
-# Kuberentes namespace for Vitess and components.
+# Kubernetes api address for $KUBECTL 
+# The default value is 127.0.0.1:8080
+# When the Kubernetes api server is not local, We can easily access the api by edit KUBERNETES_API_SERVER's value
+KUBERNETES_API_SERVER=${KUBERNETES_API_SERVER:-'127.0.0.1:8080'}
+
+# Kubernetes namespace for Vitess and components.
 VITESS_NAME=${VITESS_NAME:-'default'}
 
+# Kubernetes options config
+KUBECTL_OPTIONS="--namespace=$VITESS_NAME --server=$KUBERNETES_API_SERVER"
+
 # CELLS should be a comma separated list of cells
 # the first cell listed will become local to vtctld.
 CELLS=${CELLS:-'test'}
@@ -18,7 +26,7 @@ VTCTLD_PORT=${VTCTLD_PORT:-30001}
 
 # Get the ExternalIP of any node.
 get_node_ip() {
-  $KUBECTL get -o template --template '{{range (index .items 0).status.addresses}}{{if eq .type "ExternalIP" "LegacyHostIP"}}{{.address}}{{end}}{{end}}' nodes --namespace=$VITESS_NAME
+  $KUBECTL $KUBECTL_OPTIONS get -o template --template '{{range (index .items 0).status.addresses}}{{if eq .type "ExternalIP" "LegacyHostIP"}}{{.address}}{{end}}{{end}}' nodes
 }
 
 # Try to find vtctld address if not provided.
@@ -33,7 +41,7 @@ get_vtctld_addr() {
 
 # Find the name of a vtctld pod.
 get_vtctld_pod() {
-  $KUBECTL get -o template --template "{{if ge (len .items) 1 }}{{(index .items 0).metadata.name}}{{end}}" -l 'app=vitess,component=vtctld' pods --namespace=$VITESS_NAME
+  $KUBECTL $KUBECTL_OPTIONS get -o template --template "{{if ge (len .items) 1 }}{{(index .items 0).metadata.name}}{{end}}" -l 'app=vitess,component=vtctld' pods
 }
 
 start_vtctld_forward() {
@@ -44,7 +52,7 @@ start_vtctld_forward() {
   fi
 
   tmpfile=`mktemp`
-  $KUBECTL port-forward -p $pod 0:15999 --namespace=$VITESS_NAME &> $tmpfile &
+  $KUBECTL $KUBECTL_OPTIONS port-forward -p $pod 0:15999 &> $tmpfile &
   vtctld_forward_pid=$!
 
   until [[ `cat $tmpfile` =~ :([0-9]+)\ -\> ]]; do :; done

examples/kubernetes/etcd-down.sh

@@ -13,10 +13,10 @@ cells=`echo $CELLS | tr ',' ' '`
 # Delete replication controllers
 for cell in 'global' $cells; do
   echo "Stopping etcd replicationcontroller for $cell cell..."
-  $KUBECTL delete replicationcontroller etcd-$cell --namespace=$VITESS_NAME
+  $KUBECTL $KUBECTL_OPTIONS delete replicationcontroller etcd-$cell
 
   echo "Deleting etcd service for $cell cell..."
-  $KUBECTL delete service etcd-$cell --namespace=$VITESS_NAME
-  $KUBECTL delete service etcd-$cell-srv --namespace=$VITESS_NAME
+  $KUBECTL $KUBECTL_OPTIONS delete service etcd-$cell
+  $KUBECTL $KUBECTL_OPTIONS delete service etcd-$cell-srv
 done
 

examples/kubernetes/etcd-up.sh

@@ -21,7 +21,7 @@ for cell in 'global' $cells; do
   echo "Creating etcd service for $cell cell..."
   cat etcd-service-template.yaml | \
     sed -e "s/{{cell}}/$cell/g" | \
-    $KUBECTL create --namespace=$VITESS_NAME -f -
+    $KUBECTL $KUBECTL_OPTIONS create -f -
 
   # Expand template variables
   sed_script=""
@@ -31,6 +31,6 @@ for cell in 'global' $cells; do
 
   # Create the replication controller.
   echo "Creating etcd replicationcontroller for $cell cell..."
-  cat etcd-controller-template.yaml | sed -e "$sed_script" | $KUBECTL create --namespace=$VITESS_NAME -f -
+  cat etcd-controller-template.yaml | sed -e "$sed_script" | $KUBECTL $KUBECTL_OPTIONS create -f -
 done
 

examples/kubernetes/guestbook-controller.yaml → examples/kubernetes/guestbook-controller-template.yaml

@@ -26,3 +26,4 @@ spec:
             limits:
               memory: "128Mi"
               cpu: "100m"
+          args: ["--port", "{{port}}", "--cell", "{{cell}}", "--keyspace", "{{keyspace}}", "--vtgate_port", "{{vtgate_port}}"]