Merge branch 'fix-drainer-bug' of https://github.com/weekface/tidb-op…

…erator into fix-drainer-bug
pingcap · Jul 6, 2020 · 3d59b78 · 3d59b78
2 parents 616bd2c + f555be5
commit 3d59b78
Show file tree

Hide file tree

Showing 13 changed files with 129 additions and 751 deletions.
diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml
@@ -28,7 +28,7 @@ storage: 10Gi
 # disbale detect causality
 disableDetect: false
 # if drainer donesn't have checkpoint, use initial commitTS to initial checkpoint
-initialCommitTs: "0"
+initialCommitTs: "-1"
 
 # Whether enable the TLS connection between TiDB server components
 tlsCluster:

diff --git a/docs/api-references/docs.md b/docs/api-references/docs.md
@@ -3314,22 +3314,6 @@ Set this value longer than the expected cleanup time for your process.
 Defaults to 30 seconds.</p>
 </td>
 </tr>
-<tr>
-<td>
-<code>lifecycle</code></br>
-<em>
-<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#lifecycle-v1-core">
-Kubernetes core/v1.Lifecycle
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Lifecycle describes actions that the management system should take in response to container lifecycle
-events. For the PostStart and PreStop lifecycle handlers, management of the container blocks
-until the action is complete, unless the container process fails, in which case the handler is aborted.</p>
-</td>
-</tr>
 </tbody>
 </table>
 <h3 id="configmapref">ConfigMapRef</h3>
@@ -10293,6 +10277,22 @@ TiDBConfig
 <p>Config is the Configuration of tidb-servers</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>lifecycle</code></br>
+<em>
+<a href="https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.13/#lifecycle-v1-core">
+Kubernetes core/v1.Lifecycle
+</a>
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>Lifecycle describes actions that the management system should take in response to container lifecycle
+events. For the PostStart and PreStop lifecycle handlers, management of the container blocks
+until the action is complete, unless the container process fails, in which case the handler is aborted.</p>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="tidbstatus">TiDBStatus</h3>

diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml
@@ -244,8 +244,10 @@ spec:
   # Whether enable PVC reclaim for orphan PVC left by statefulset scale-in
   enablePVReclaim: false
 
-  # Persistent volume reclaim policy applied to the PVs that consumed by TiDB cluster
-  pvReclaimPolicy: Recycle
+  ## Persistent volume reclaim policy applied to the PVs that consumed by the TiDB cluster, default is Retain.
+  ## Note that the reclaim policy Recycle may not be supported by some storage types, .e.g. local.
+  ## Ref: https://kubernetes.io/docs/tasks/administer-cluster/change-pv-reclaim-policy/
+  pvReclaimPolicy: Retain
 
   # ** TLS related Configuration **
   # Whether enable the TLS connection between TiDB server components

diff --git a/examples/basic-cn/tidb-cluster.yaml b/examples/basic-cn/tidb-cluster.yaml
@@ -25,7 +25,10 @@ spec:
     # storageClassName: local-storage
     requests:
       storage: "1Gi"
-    config: {}
+    config:
+      storage:
+        # In basic examples, we set this to avoid using too much storage.
+        reserve-space: "0MB"
   tidb:
     baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb
     replicas: 1

diff --git a/examples/basic/tidb-cluster.yaml b/examples/basic/tidb-cluster.yaml
@@ -25,7 +25,10 @@ spec:
     # storageClassName: local-storage
     requests:
       storage: "1Gi"
-    config: {}
+    config:
+      storage:
+        # In basic examples, we set this to avoid using too much storage.
+        reserve-space: "0MB"
   tidb:
     baseImage: pingcap/tidb
     replicas: 1

diff --git a/hack/local-up-operator.sh b/hack/local-up-operator.sh
@@ -150,6 +150,7 @@ fi
 echo "info: loading images into cluster"
 images=(
     $DOCKER_REGISTRY/pingcap/tidb-operator:${IMAGE_TAG}
+    $DOCKER_REGISTRY/pingcap/tidb-backup-manager:${IMAGE_TAG}
 )
 for n in ${images[@]}; do
     echo "info: loading image $n"
@@ -176,6 +177,7 @@ helm_args=(
     --name tidb-operator-dev
     --namespace "$NAMESPACE"
     --set-string operatorImage=$DOCKER_REGISTRY/pingcap/tidb-operator:${IMAGE_TAG}
+    --set-string tidbBackupManagerImage=$DOCKER_REGISTRY/pingcap/tidb-backup-manager:${IMAGE_TAG}
     --set-string controllerManager.logLevel=4
     --set-string scheduler.logLevel=4
 )

diff --git a/images/tidb-backup-manager/Dockerfile b/images/tidb-backup-manager/Dockerfile
@@ -1,9 +1,9 @@
 FROM pingcap/tidb-enterprise-tools:latest
 ARG VERSION=v1.51.0
 ARG SHUSH_VERSION=v1.4.0
-ARG TOOLKIT_VERSION=v3.0.15
+ARG TOOLKIT_VERSION=v4.0.2
 ARG TOOLKIT_V31=v3.1.2
-ARG TOOLKIT_V40=v4.0.1
+ARG TOOLKIT_V40=v4.0.2
 RUN apk update && apk add ca-certificates
 
 RUN wget -nv https://github.com/ncw/rclone/releases/download/${VERSION}/rclone-${VERSION}-linux-amd64.zip \