Merge pull request kubevirt#12848 from iholder101/migrations/reduce_t…

…imeout Reduce default CompletionTimeoutPerGiB from 800s to 150s
dhiller · Sep 25, 2024 · 69c4145 · 69c4145
2 parents b09f8ce + 59bd705
commit 69c4145
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -15006,7 +15006,7 @@
       "$ref": "#/definitions/k8s.io.apimachinery.pkg.api.resource.Quantity"
      },
      "completionTimeoutPerGiB": {
-      "description": "CompletionTimeoutPerGiB is the maximum number of seconds per GiB a migration is allowed to take. If a live-migration takes longer to migrate than this value multiplied by the size of the VMI, the migration will be cancelled, unless AllowPostCopy is true. Defaults to 800",
+      "description": "CompletionTimeoutPerGiB is the maximum number of seconds per GiB a migration is allowed to take. If a live-migration takes longer to migrate than this value multiplied by the size of the VMI, the migration will be cancelled, unless AllowPostCopy is true. Defaults to 150",
       "type": "integer",
       "format": "int64"
      },

diff --git a/manifests/generated/kv-resource.yaml b/manifests/generated/kv-resource.yaml
@@ -579,7 +579,7 @@ spec:
                         description: |-
                           CompletionTimeoutPerGiB is the maximum number of seconds per GiB a migration is allowed to take.
                           If a live-migration takes longer to migrate than this value multiplied by the size of the VMI,
-                          the migration will be cancelled, unless AllowPostCopy is true. Defaults to 800
+                          the migration will be cancelled, unless AllowPostCopy is true. Defaults to 150
                         format: int64
                         type: integer
                       disableTLS:
@@ -3865,7 +3865,7 @@ spec:
                         description: |-
                           CompletionTimeoutPerGiB is the maximum number of seconds per GiB a migration is allowed to take.
                           If a live-migration takes longer to migrate than this value multiplied by the size of the VMI,
-                          the migration will be cancelled, unless AllowPostCopy is true. Defaults to 800
+                          the migration will be cancelled, unless AllowPostCopy is true. Defaults to 150
                         format: int64
                         type: integer
                       disableTLS:

diff --git a/pkg/virt-config/virt-config.go b/pkg/virt-config/virt-config.go
@@ -41,7 +41,7 @@ const (
 	MigrationAllowAutoConverge               bool   = false
 	MigrationAllowPostCopy                   bool   = false
 	MigrationProgressTimeout                 int64  = 150
-	MigrationCompletionTimeoutPerGiB         int64  = 800
+	MigrationCompletionTimeoutPerGiB         int64  = 150
 	DefaultAMD64MachineType                         = "q35"
 	DefaultPPC64LEMachineType                       = "pseries"
 	DefaultAARCH64MachineType                       = "virt"

diff --git a/pkg/virt-handler/vm_test.go b/pkg/virt-handler/vm_test.go
@@ -1796,10 +1796,10 @@ var _ = Describe("VirtualMachineInstance", func() {
 			vmiFeeder.Add(vmi)
 			options := &cmdclient.MigrationOptions{
 				Bandwidth:               resource.MustParse("0Mi"),
-				ProgressTimeout:         150,
-				CompletionTimeoutPerGiB: 800,
-				UnsafeMigration:         false,
-				AllowPostCopy:           false,
+				ProgressTimeout:         virtconfig.MigrationProgressTimeout,
+				CompletionTimeoutPerGiB: virtconfig.MigrationCompletionTimeoutPerGiB,
+				UnsafeMigration:         virtconfig.DefaultUnsafeMigrationOverride,
+				AllowPostCopy:           virtconfig.MigrationAllowPostCopy,
 			}
 			client.EXPECT().MigrateVirtualMachine(vmi, options)
 			controller.Execute()

diff --git a/pkg/virt-operator/resource/generate/components/validations_generated.go b/pkg/virt-operator/resource/generate/components/validations_generated.go
@@ -1200,7 +1200,7 @@ var CRDsValidation map[string]string = map[string]string{
                   description: |-
                     CompletionTimeoutPerGiB is the maximum number of seconds per GiB a migration is allowed to take.
                     If a live-migration takes longer to migrate than this value multiplied by the size of the VMI,
-                    the migration will be cancelled, unless AllowPostCopy is true. Defaults to 800
+                    the migration will be cancelled, unless AllowPostCopy is true. Defaults to 150
                   format: int64
                   type: integer
                 disableTLS:
@@ -13593,7 +13593,7 @@ var CRDsValidation map[string]string = map[string]string{
                   description: |-
                     CompletionTimeoutPerGiB is the maximum number of seconds per GiB a migration is allowed to take.
                     If a live-migration takes longer to migrate than this value multiplied by the size of the VMI,
-                    the migration will be cancelled, unless AllowPostCopy is true. Defaults to 800
+                    the migration will be cancelled, unless AllowPostCopy is true. Defaults to 150
                   format: int64
                   type: integer
                 disableTLS:
@@ -14007,7 +14007,7 @@ var CRDsValidation map[string]string = map[string]string{
                   description: |-
                     CompletionTimeoutPerGiB is the maximum number of seconds per GiB a migration is allowed to take.
                     If a live-migration takes longer to migrate than this value multiplied by the size of the VMI,
-                    the migration will be cancelled, unless AllowPostCopy is true. Defaults to 800
+                    the migration will be cancelled, unless AllowPostCopy is true. Defaults to 150
                   format: int64
                   type: integer
                 disableTLS:

diff --git a/staging/src/kubevirt.io/api/core/v1/types.go b/staging/src/kubevirt.io/api/core/v1/types.go
@@ -2665,7 +2665,7 @@ type MigrationConfiguration struct {
 	BandwidthPerMigration *resource.Quantity `json:"bandwidthPerMigration,omitempty"`
 	// CompletionTimeoutPerGiB is the maximum number of seconds per GiB a migration is allowed to take.
 	// If a live-migration takes longer to migrate than this value multiplied by the size of the VMI,
-	// the migration will be cancelled, unless AllowPostCopy is true. Defaults to 800
+	// the migration will be cancelled, unless AllowPostCopy is true. Defaults to 150
 	CompletionTimeoutPerGiB *int64 `json:"completionTimeoutPerGiB,omitempty"`
 	// ProgressTimeout is the maximum number of seconds a live migration is allowed to make no progress.
 	// Hitting this timeout means a migration transferred 0 data for that many seconds. The migration is

diff --git a/staging/src/kubevirt.io/api/core/v1/types_swagger_generated.go b/staging/src/kubevirt.io/api/core/v1/types_swagger_generated.go
diff --git a/staging/src/kubevirt.io/client-go/api/openapi_generated.go b/staging/src/kubevirt.io/client-go/api/openapi_generated.go