From 59715af797d7e70039c922268de30543e674c380 Mon Sep 17 00:00:00 2001
From: "edward.zeng" <jie.zeng@zilliz.com>
Date: Fri, 18 Nov 2022 22:01:05 +0800
Subject: [PATCH] Bump milvus version to 2.2.0 (#391)

Signed-off-by: Edward Zeng <jie.zeng@zilliz.com>

Signed-off-by: Edward Zeng <jie.zeng@zilliz.com>
---
 charts/milvus/Chart.yaml           |  4 ++--
 charts/milvus/README.md            |  2 ++
 charts/milvus/templates/config.tpl |  8 +++++---
 charts/milvus/values.yaml          | 17 +++++++++++------
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml
index e505d794..123f4a99 100644
--- a/charts/milvus/Chart.yaml
+++ b/charts/milvus/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 name: milvus
-appVersion: "2.1.4"
+appVersion: "2.2.0"
 kubeVersion: "^1.10.0-0"
 description: Milvus is an open-source vector database built to power AI applications and vector similarity search.
-version: 3.2.18
+version: 3.3.0
 keywords:
   - milvus
   - elastic
diff --git a/charts/milvus/README.md b/charts/milvus/README.md
index c02e916a..cd72c1c3 100644
--- a/charts/milvus/README.md
+++ b/charts/milvus/README.md
@@ -64,6 +64,8 @@ $ helm upgrade --install my-release milvus/milvus --set pulsar.enabled=false --s
 ```
 
 ### Upgrade an existing Milvus cluster
+> **IMPORTANT** If you have installed a milvus cluster with version below v2.1.x, you need follow the instructions at here: https://github.com/milvus-io/milvus/blob/master/deployments/migrate-meta/README.md. After meta migration, you use `helm upgrade` to update your cluster again.
+
 E.g. to scale out query node from 1(default) to 2:
 ```bash
 # Helm v3.x
diff --git a/charts/milvus/templates/config.tpl b/charts/milvus/templates/config.tpl
index 11e8a214..a3e38b8d 100644
--- a/charts/milvus/templates/config.tpl
+++ b/charts/milvus/templates/config.tpl
@@ -297,8 +297,10 @@ dataNode:
     flowGraph:
       maxQueueLength: 1024  # Maximum length of task queue in flowgraph
       maxParallelism: 1024  # Maximum number of tasks executed in parallel in the flowgraph
-  flush:
-    insertBufSize: "{{ .Values.dataNode.flush.insertBufSize }}"  # Bytes, 16 MB
+  segment:
+    insertBufSize: "{{ .Values.dataNode.segment.insertBufSize }}"  # Bytes, 16 MB
+    deleteBufBytes: "{{ .Values.dataNode.segment.deleteBufBytes }}"  # Bytes, 64 MB
+    syncPeriod: "{{ .Values.dataNode.segment.syncPeriod }}"  # Seconds, 10min
 
 log:
   level: {{ .Values.log.level }}
@@ -367,7 +369,7 @@ common:
     authorizationEnabled: {{ .Values.authorization.enabled }}
   simdType: {{ .Values.common.simdType }}  # default to auto
   indexSliceSize: 16 # MB
-  threadCoreCoefficient: {{ .Values.common.threadCoreCoefficient }}  # default to 10
+  threadCoreCoefficient: {{ .Values.common.threadCoreCoefficient }}
 
   storageType: minio
   mem_purge_ratio: 0.2 # in Linux os, if memory-fragmentation-size >= used-memory * ${mem_purge_ratio}, then do `malloc_trim`
diff --git a/charts/milvus/values.yaml b/charts/milvus/values.yaml
index 60903b76..78be81b0 100644
--- a/charts/milvus/values.yaml
+++ b/charts/milvus/values.yaml
@@ -5,7 +5,7 @@ cluster:
 image:
   all:
     repository: milvusdb/milvus
-    tag: v2.1.4
+    tag: v2.2.0
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
@@ -510,9 +510,9 @@ dataCoordinator:
     enableAutoCompaction: true
 
   gc:
-    interval: 60   # gc interval in seconds
-    missingTolerance: 3600  # file meta missing tolerance duration in seconds, 1 day
-    dropTolerance: 3600  # file belongs to dropped entity tolerance duration in seconds, 1 day
+    interval: 3600   # gc interval in seconds
+    missingTolerance: 86400  # file meta missing tolerance duration in seconds, 1 day
+    dropTolerance: 86400  # file belongs to dropped entity tolerance duration in seconds, 1 day
 
 
   service:
@@ -536,8 +536,13 @@ dataNode:
   profiling:
     enabled: false  # Enable live profiling
 
-  flush:
-    insertBufSize: "16777216"  ## bytes, 16MB
+  segment:
+    # Max buffer size to flush for a single segment.
+    insertBufSize: "16777216"  # Bytes, 16 MB
+    # Max buffer size to flush del for a single channel
+    deleteBufBytes: "67108864"  # Bytes, 64MB
+    # The period to sync segments if buffer is not empty.
+    syncPeriod: 600  # Seconds, 10min
 
 common:
   compaction: