[midPoint-git] [Evolveum/midpoint] 8c0f1d: Rework AffinityController for MT sync tasks

mederly noreply at github.com
Tue Oct 6 09:33:30 CEST 2020


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8c0f1d810fcc106e2b77ee1cd70e49e80fe256d1
      https://github.com/Evolveum/midpoint/commit/8c0f1d810fcc106e2b77ee1cd70e49e80fe256d1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-10-06 (Tue, 06 Oct 2020)

  Changed paths:
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/SequenceChecker.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskMechanics.java
    A model/model-intest/src/test/resources/sync/resource-dummy-multi-changes.xml
    A model/model-intest/src/test/resources/sync/task-multi-changes.xml
    M model/model-intest/testng-integration-full.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceEventListenerImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java
    R provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/AffinityController.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/ChangeProcessingCoordinator.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/ChangeProcessor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/LiveSynchronizer.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/OldestTokenWatcher.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/ProcessChangeRequest.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/RequestsBuffer.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/Change.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  Rework AffinityController for MT sync tasks

The AffinityController was flawed so it caused worker threads of sync
tasks to loop indefinitely when encountered already-bound primary
identifiers.

Because another (unrelated) flaw was found during fixing this bug,
the component was rewritten into RequestsBuffer that should now work
correctly.

We also re-enabled forgotten TestLiveSyncTaskMechanics[Multithreaded]
tests, while making them more robust and temporarily disabling
unfinished parts.

This should resolve MID-6248.


  Commit: fe6d62106b4d0e77e9baab78aadaaf7f55dc8b0b
      https://github.com/Evolveum/midpoint/commit/fe6d62106b4d0e77e9baab78aadaaf7f55dc8b0b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-10-06 (Tue, 06 Oct 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java

  Log Message:
  -----------
  Fix subresult handling for clockwork concurrency


  Commit: 74748f8331b7167a0f120458d585f8ec825cf2ef
      https://github.com/Evolveum/midpoint/commit/74748f8331b7167a0f120458d585f8ec825cf2ef
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-10-06 (Tue, 06 Oct 2020)

  Changed paths:
    M config/initial-objects/000-system-configuration.xml
    M config/initial-objects/310-dashboard-admin.xml
    M config/initial-objects/501-archetype-task-reconciliation.xml
    M config/initial-objects/502-archetype-task-recomputation.xml
    M config/initial-objects/503-archetype-task-import.xml
    M config/initial-objects/504-archetype-task-live-sync.xml
    M config/initial-objects/505-archetype-task-async-update.xml
    M config/initial-objects/506-archetype-task-cleanup.xml
    M config/initial-objects/507-archetype-task-report.xml
    M config/initial-objects/508-archetype-task-single-bulk-action.xml
    M config/initial-objects/509-archetype-task-iterative-bulk-action.xml
    M config/initial-objects/520-archetype-task-certification.xml
    M config/initial-objects/521-archetype-task-approval.xml
    M config/initial-objects/528-archetype-task-util.xml
    M config/initial-objects/529-archetype-task-system.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/factory/GuiComponentFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/registry/GuiComponentRegistry.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/AssociationAndExpressionPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ConditionPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DatePanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DefaultContainerablePanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DropDownChoicePanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/EnumPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ExecuteScriptWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ItemPanelContext.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ItemPathPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LabelPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LinkedReferencePanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/LockoutStatusPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/MetadataPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ModificationsPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ObjectDeltaPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/PolyStringEditorPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ProfilingLoggerLevelPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/QueryTextAreaPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/RelationPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ResourceAttributeRefPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TaskIntentFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TaskObjectClassFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextAreaPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/ThreeStateComboPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/UploadDownloadPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/VariableBindingDefinitionTypePanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/WorkItemDetailsPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/registry/GuiComponentRegistryImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/SimpleRoleSelector.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/sample/SampleFormFocusTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/model/PrismContainerWrapperModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskErrorsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
    M gui/admin-gui/src/main/resources/initial-objects/060-archetype-report-dashboard.xml
    M gui/admin-gui/src/main/resources/initial-objects/061-archetype-report-collection.xml
    M gui/admin-gui/src/main/resources/initial-objects/310-dashboard-admin.xml
    M gui/admin-gui/src/main/resources/initial-objects/501-archetype-task-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/502-archetype-task-recomputation.xml
    M gui/admin-gui/src/main/resources/initial-objects/503-archetype-task-import.xml
    M gui/admin-gui/src/main/resources/initial-objects/504-archetype-task-live-sync.xml
    M gui/admin-gui/src/main/resources/initial-objects/505-archetype-task-async-update.xml
    M gui/admin-gui/src/main/resources/initial-objects/506-archetype-task-cleanup.xml
    M gui/admin-gui/src/main/resources/initial-objects/507-archetype-task-report.xml
    M gui/admin-gui/src/main/resources/initial-objects/508-archetype-task-single-bulk-action.xml
    M gui/admin-gui/src/main/resources/initial-objects/509-archetype-task-iterative-bulk-action.xml
    M gui/admin-gui/src/main/resources/initial-objects/520-archetype-task-certification.xml
    M gui/admin-gui/src/main/resources/initial-objects/521-archetype-task-approval.xml
    M gui/admin-gui/src/main/resources/initial-objects/528-archetype-task-util.xml
    M gui/admin-gui/src/main/resources/initial-objects/529-archetype-task-system.xml
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    A model/certification-impl/src/test/resources/schema/piracy.xsd
    A model/report-impl/src/test/resources/schema/piracy.xsd
    M pom.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/BasicPage.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/Evolveum/midpoint/compare/6f1a38e360ed...74748f8331b7


More information about the midPoint-svn mailing list