kubevirt / containerized-data-importer

49%

main: 49%

LAST BUILD ON BRANCH fix-status-update-conflicts

branch: fix-status-update-conflicts

CHANGE BRANCH

x

Reset

• fix-status-update-conflicts
• 1-32-kvci
• 1-33-kvci
• 2550-assume-fixed
• 31-deps-bump
• 3466
• 3556
• Fix-functional-tests-ginkgo-args-building
• add-clone-populator-watches
• add-operator-probes
• add-pxcsi-support
• add-test-filter-capability
• add-vcenter-decription-test
• add-vddk-certconfigmapr
• add_cdi-api-dataimportcron-mutate_delete_rbac
• add_prom_unit_tests
• allow-access-cluster-services-csv
• auth
• autoupdate
• bazel-6.5.0
• bazel-builder-skopeo
• bazel-push-images-use-skopeo
• bazel-rules-oci
• bazeldnf-caret-fix
• bugfix/move-applystorageprofile-to-cdi-api
• bugfix/snapshot-volumemode-diff
• build-functest-shebang
• bump-containers-image-34
• bump-go-1.24.0
• cbt-query-usage
• cephfs-typo
• change-cdi-deploy-selectors
• change-metrics-port
• change-termination-message-policy
• chore-remove-deprecated-buildnametocertificate
• clone-pvc-events
• cloner_test_ids
• cnv-44140
• cnv-52722
• cnv-58645
• cnv-69038
• cnv64424
• comment-fix
• compress-image-binaries
• consolidate-stream-data-to-file
• container_image_poller
• csv-dump-network-policies
• datasource-pointer
• debug-certrotation-ut
• decompose-ds-controller-watches
• dep-update-common-pkg
• dependabot/go_modules/github.com/docker/docker-28.0.0incompatible
• dependabot/go_modules/github.com/go-jose/go-jose/v3-3.0.4
• dependabot/go_modules/github.com/ulikunitz/xz-0.5.14
• dependabot/go_modules/golang.org/x/crypto-0.35.0
• dependabot/go_modules/golang.org/x/net-0.38.0
• dependabot/go_modules/staging/src/kubevirt.io/containerized-data-importer-api/golang.org/x/net-0.33.0
• dependabot/go_modules/staging/src/kubevirt.io/containerized-data-importer-api/golang.org/x/net-0.36.0
• dependabot/go_modules/staging/src/kubevirt.io/containerized-data-importer-api/golang.org/x/net-0.38.0
• dependabot/go_modules/tools/release-notes/github.com/go-git/go-git/v5-5.16.5
• dependabot/go_modules/tools/release-notes/golang.org/x/crypto-0.45.0
• deprecation-typo-v2-transfer
• dev-pvc-rm
• dic-poller-get-acknowledge-arch-digest
• dic_pvc_source
• dic_sa
• dump-network-policies
• dv-events-from-pvc
• dv-recreated-status
• enable_webhook_pvc_rendering_featuregate
• exclude-scratch-pvcs-from-backup
• expose-group-version
• feat/snapshot-restore-sc-selection
• feature/add-status-subresource-to-storageprofile-crd
• fix-bazel-build-images
• fix-cdi-space-calculations
• fix-cert-collection
• fix-cluster-sync-kind
• fix-dataimportcron-nil-map-assignment
• fix-datasource-references
• fix-doc-dv
• fix-doc-sources
• fix-error-formatting
• fix-key-comparison
• fix-label-regex
• fix-metric-linter
• fix-multi-stage-import-test
• fix-rr-names
• fix-schedulable-running-condition
• fix-snapshot-restore-size-inflation
• fix-upload-tests
• fix/cephfs_capabilities
• fix/storageprofile-error-message-status
• fix_CDIDataVolumeUnusualRestartCount_alert
• fix_clone_target_size_validation
• fix_dic_image_pull_failed
• fix_dv_bound_cond_unknown
• fix_dv_events_test
• fix_empty_storageprofile_test_event_check
• fix_flaky_dic_snapshot_cond_test
• fix_registry_datasource_import_without_certConfigMap
• fix_storageprofile_rendering
• fix_test_storage_profile_snapshot_source
• fix_vddk_volume_import_source_update_test
• flake-upload-proxy-static
• force-dic-test-pullmethod-node
• gcnv_caps
• go-workspace
• hpp-overlay-csi
• http-checksum
• http-ds-validate-image-size
• hyperdisk-caps
• ibmc-vpc-block-csi
• imageio_skip_tls
• importer-report-scratch-space-message
• improve-dv-testsc
• investigate-test-25
• issue-3878
• kvci-1-31
• kvci-nfs-fix
• label-datasources-architecture
• label-tests-vmware-and-imageio
• main
• metrics-io-timeout
• metricsdocs
• move-destructive-flag-to-label-filter
• mtv-3514
• multi-arch-release
• multiarch-test-images
• mutate_pvc_min_size
• network-policies-mapping-cdi-dnm
• new-builder-1-23
• oci-clone-strategy
• pass-annotation-removal
• portworx_rwx_block
• portworx_rwx_block_conditionally
• propogate-labels-from-dv
• provisioner-aware-vsc-selection-for-dic
• pvc-clone-doc
• rebind-capacity-present
• reconcile-ds-on-reference-update
• reconcile_storageprofile_min_pvc_size_annotation
• register-volume-populators
• release-tool-go
• release-v1.1
• release-v1.10
• release-v1.11
• release-v1.12
• release-v1.13
• release-v1.14
• release-v1.15
• release-v1.16
• release-v1.17
• release-v1.18
• release-v1.19
• release-v1.2
• release-v1.20
• release-v1.21
• release-v1.22
• release-v1.23
• release-v1.24
• release-v1.25
• release-v1.26
• release-v1.28
• release-v1.3
• release-v1.4
• release-v1.5
• release-v1.6
• release-v1.60
• release-v1.7
• release-v1.8
• release-v1.9
• releases-docs-dead-link
• replace-virt-default-functest
• report-upload-error-message-on-write-error
• required-scc
• restore-size-hint
• return_nosniff_header
• revert-3644-portworx_rwx_block
• revert-multi-arch-temporarily
• revert-snap-manual-cleanup
• safe-cwe-79
• scc-volumes-hotloop
• selected-node-tmp-host-assisted
• set_min_pvc_size_per_sc_ann
• sparse-check-tests
• status-imports-to-keep
• support-multiarch-registry-import
• sync-scc-restricted-v2
• targeted-sync-ci-err
• temp-sc-owner-ref
• test
• test-https-proxy-no-certdir
• test-image-multiarch-manifest
• tinycore-multiarch
• tls-security-profile-propagation
• update-builder-go-124
• update-default-fsoverhead
• update_CDIDataVolumeUnusualRestartCount_health_impact_label
• update_CDI_alerts_health_and_eval_time
• update_builder_go_123
• update_oauth_to_027
• update_x_net_0_33_0
• use-operator-observability-toolkit
• v1.60.1
• v1.60.4
• v1.60.5
• v1.61.0
• v1.62.0
• v1.63.0
• v1.63.0-alpha.0
• v1.63.1
• v1.64.0
• v1.999.0-test.0
• vddk-error-wrapping
• vddk-extra-args-crd
• volume-capabilities-oracle
• watch_resource_quota
• webhook-ns-selector
• wrap-upload-server-error-message

Build # #5826

Build Type

Pull #4040

travis-ci

Committed by aglitke

Commit Message

Use patch instead of update for DataVolume status to reduce conflicts

When multiple controllers act on the same PVC concurrently, the DataVolume
is reconciled multiple times in parallel. This causes status updates to fail
with conflict errors because the resourceVersion becomes stale between read
and update operations.

This change switches from Status().Update() to Status().Patch() using a
MergeFrom patch strategy. Patches are more resilient to concurrent updates
as they apply changes without requiring an exact resourceVersion match,
reducing conflict errors when multiple controllers are active.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Signed-off-by: Adam Litke <alitke@redhat.com>

Pull Request Pull Request #4040: Use patch instead of update for DataVolume status to reduce conflicts

Run Details

4 of 4 new or added lines in 1 file covered. (100.0%)

14715 of 29749 relevant lines covered (49.46%)

0.55 hits per line