*: set skip_disk_quota_check parameter to true permanently (#511)

Signed-off-by: huanghaoyuanhhy <haoyuan.huang@zilliz.com>
zilliztech · Jan 21, 2025 · 50f445f · 50f445f
1 parent cae2549
commit 50f445f
Show file tree

Hide file tree

Showing 9 changed files with 459 additions and 454 deletions.
diff --git a/core/backup_impl_restore_backup.go b/core/backup_impl_restore_backup.go
@@ -311,7 +311,6 @@ func (b *BackupContext) RestoreBackup(ctx context.Context, request *backuppb.Res
 			DropExistCollection:   request.GetDropExistCollection(),
 			DropExistIndex:        request.GetDropExistIndex(),
 			SkipCreateCollection:  request.GetSkipCreateCollection(),
-			SkipDiskQuotaCheck:    request.GetSkipImportDiskQuotaCheck(),
 			MaxShardNum:           request.GetMaxShardNum(),
 			SkipParams:            request.GetSkipParams(),
 			UseV2Restore:          request.GetUseV2Restore(),

diff --git a/core/client/grpc.go b/core/client/grpc.go
@@ -359,11 +359,9 @@ type GrpcBulkInsertInput struct {
 	DB             string
 	CollectionName string
 	PartitionName  string
-	// offset 0 is path to insertLog file, offset 1 is path to deleteLog file
-	Paths              []string
-	EndTime            int64
-	IsL0               bool
-	SkipDiskQuotaCheck bool
+	Paths          []string // offset 0 is path to insertLog file, offset 1 is path to deleteLog file
+	EndTime        int64
+	IsL0           bool
 }
 
 func (m *GrpcClient) BulkInsert(ctx context.Context, input GrpcBulkInsertInput) (int64, error) {
@@ -377,7 +375,7 @@ func (m *GrpcClient) BulkInsert(ctx context.Context, input GrpcBulkInsertInput)
 	} else {
 		opts = append(opts, &commonpb.KeyValuePair{Key: "backup", Value: "true"})
 	}
-	skipOpt := &commonpb.KeyValuePair{Key: "skip_disk_quota_check", Value: strconv.FormatBool(input.SkipDiskQuotaCheck)}
+	skipOpt := &commonpb.KeyValuePair{Key: "skip_disk_quota_check", Value: "true"}
 	opts = append(opts, skipOpt)
 
 	in := &milvuspb.ImportRequest{

diff --git a/core/client/restful.go b/core/client/restful.go
@@ -25,11 +25,9 @@ type RestfulBulkInsertInput struct {
 	DB             string
 	CollectionName string
 	PartitionName  string
-	// offset 0 is path to insertLog file, offset 1 is path to deleteLog file
-	Paths              [][]string
-	EndTime            int64
-	IsL0               bool
-	SkipDiskQuotaCheck bool
+	Paths          [][]string // offset 0 is path to insertLog file, offset 1 is path to deleteLog file
+	EndTime        int64
+	IsL0           bool
 }
 
 type Restful interface {
@@ -103,7 +101,7 @@ func (r *RestfulClient) BulkInsert(ctx context.Context, input RestfulBulkInsertI
 	} else {
 		opts["backup"] = "true"
 	}
-	opts["skip_disk_quota_check"] = strconv.FormatBool(input.SkipDiskQuotaCheck)
+	opts["skip_disk_quota_check"] = "true"
 
 	createReq := createImportReq{
 		DbName:         input.DB,

diff --git a/core/proto/backup.proto b/core/proto/backup.proto
@@ -289,7 +289,7 @@ message RestoreBackupRequest {
   bool skipCreateCollection = 15;
   string id = 16;
   // if true, skip the diskQuota in Import
-  bool skipImportDiskQuotaCheck = 17;
+  bool skipImportDiskQuotaCheck = 17 [deprecated=true];
   // whether restore RBAC
   bool rbac = 18;
   // target max shard number
@@ -334,7 +334,7 @@ message RestoreCollectionTask {
   bool dropExistIndex = 17;
   // if true will skip create collections
   bool skipCreateCollection = 18;
-  bool skipDiskQuotaCheck = 19;
+  bool skipDiskQuotaCheck = 19 [deprecated=true]; // when restore, skip disk quota check will always be true
   // target max shard number
   int32 maxShardNum = 20;
   SkipParams skipParams = 21;

diff --git a/core/proto/backuppb/backup.pb.go b/core/proto/backuppb/backup.pb.go
diff --git a/core/restore/collection.go b/core/restore/collection.go
@@ -173,7 +173,7 @@ func (ct *CollectionTask) restoreDataV2(ctx context.Context) error {
 	ct.logger.Info("start restore partition segment", zap.Int("partition_num", len(ct.task.GetCollBackup().GetPartitionBackups())))
 	for _, part := range ct.task.GetCollBackup().GetPartitionBackups() {
 		if err := ct.restorePartitionV2(ctx, part); err != nil {
-			return fmt.Errorf("restore_collection: restore partition data v1: %w", err)
+			return fmt.Errorf("restore_collection: restore partition data v2: %w", err)
 		}
 	}
 
@@ -556,7 +556,7 @@ func (ct *CollectionTask) restoreNotL0SegV2(ctx context.Context, part *backuppb.
 		}
 
 		if err := ct.bulkInsertViaRestful(ctx, part.GetPartitionName(), paths, false); err != nil {
-			return fmt.Errorf("restore_collection: restore data v1 bulk insert via restful: %w", err)
+			return fmt.Errorf("restore_collection: bulk insert via restful: %w", err)
 		}
 	}
 
@@ -691,13 +691,12 @@ func (ct *CollectionTask) notL0Groups(ctx context.Context, part *backuppb.Partit
 func (ct *CollectionTask) bulkInsertViaGrpc(ctx context.Context, partition string, paths []string, isL0 bool) error {
 	ct.logger.Info("start bulk insert via grpc", zap.Strings("paths", paths), zap.String("partition", partition))
 	in := client.GrpcBulkInsertInput{
-		DB:                 ct.task.GetTargetDbName(),
-		CollectionName:     ct.task.GetTargetCollectionName(),
-		PartitionName:      partition,
-		Paths:              paths,
-		EndTime:            ct.task.GetCollBackup().EndTime,
-		IsL0:               isL0,
-		SkipDiskQuotaCheck: ct.task.GetSkipDiskQuotaCheck(),
+		DB:             ct.task.GetTargetDbName(),
+		CollectionName: ct.task.GetTargetCollectionName(),
+		PartitionName:  partition,
+		Paths:          paths,
+		EndTime:        ct.task.GetCollBackup().EndTime,
+		IsL0:           isL0,
 	}
 	jobID, err := ct.grpcCli.BulkInsert(ctx, in)
 	if err != nil {

diff --git a/docs/docs.go b/docs/docs.go
@@ -1057,7 +1057,7 @@ const docTemplate = `{
                     "type": "boolean"
                 },
                 "skipImportDiskQuotaCheck": {
-                    "description": "if true, skip the diskQuota in Import",
+                    "description": "if true, skip the diskQuota in Import\n\nDeprecated: Marked as deprecated in backup.proto.",
                     "type": "boolean"
                 },
                 "skipParams": {
@@ -1193,6 +1193,7 @@ const docTemplate = `{
                     "type": "boolean"
                 },
                 "skipDiskQuotaCheck": {
+                    "description": "Deprecated: Marked as deprecated in backup.proto.",
                     "type": "boolean"
                 },
                 "skipParams": {

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -1050,7 +1050,7 @@
                     "type": "boolean"
                 },
                 "skipImportDiskQuotaCheck": {
-                    "description": "if true, skip the diskQuota in Import",
+                    "description": "if true, skip the diskQuota in Import\n\nDeprecated: Marked as deprecated in backup.proto.",
                     "type": "boolean"
                 },
                 "skipParams": {
@@ -1186,6 +1186,7 @@
                     "type": "boolean"
                 },
                 "skipDiskQuotaCheck": {
+                    "description": "Deprecated: Marked as deprecated in backup.proto.",
                     "type": "boolean"
                 },
                 "skipParams": {

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -570,7 +570,10 @@ definitions:
           index or data
         type: boolean
       skipImportDiskQuotaCheck:
-        description: if true, skip the diskQuota in Import
+        description: |-
+          if true, skip the diskQuota in Import
+
+          Deprecated: Marked as deprecated in backup.proto.
         type: boolean
       skipParams:
         allOf:
@@ -659,6 +662,7 @@ definitions:
         description: if true will skip create collections
         type: boolean
       skipDiskQuotaCheck:
+        description: 'Deprecated: Marked as deprecated in backup.proto.'
         type: boolean
       skipParams:
         $ref: '#/definitions/backuppb.SkipParams'