[midPoint-git] [Evolveum/midpoint] ddccc8: Fix issues with "actions executed" (MID-5920)
mederly
noreply at github.com
Wed Mar 18 22:32:31 CET 2020
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: ddccc848457168c0a9126b79343ea6d987d29012
https://github.com/Evolveum/midpoint/commit/ddccc848457168c0a9126b79343ea6d987d29012
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-03-18 (Wed, 18 Mar 2020)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/ActionsExecutedInformation.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/statistics/SynchronizationInformation.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.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-xfer1-source.xml
A model/model-intest/src/test/resources/sync/resource-dummy-xfer1-target-deletable.xml
A model/model-intest/src/test/resources/sync/resource-dummy-xfer2-source.xml
A model/model-intest/src/test/resources/sync/resource-dummy-xfer2-target-not-deletable.xml
A model/model-intest/src/test/resources/sync/role-xfer1.xml
A model/model-intest/src/test/resources/sync/role-xfer2.xml
A model/model-intest/src/test/resources/sync/task-xfer1.xml
A model/model-intest/src/test/resources/sync/task-xfer2.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningContext.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/sync/ChangeProcessor.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyTestResource.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestResource.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ActionsExecutedInfoAsserter.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ActionsExecutedPartInfoAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/SynchronizationInfoAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/StateReporter.java
M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
Log Message:
-----------
Fix issues with "actions executed" (MID-5920)
1. A fault in ActionsExecutedInformation caused the numbers to grow
during each "get" operation. So they soon started to diverge from
reality.
2. A fault in ChangeProcessor caused reporting actions executed (but
also some other counters) to coordinator task instead of worker tasks.
This caused wrong "resulting actions executed" counters for
multithreaded LiveSync and AsyncUpdate tasks.
Commit: ef518cec0964e106bf7afd95ae5e9e51d53cdba6
https://github.com/Evolveum/midpoint/commit/ef518cec0964e106bf7afd95ae5e9e51d53cdba6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-03-18 (Wed, 18 Mar 2020)
Changed paths:
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskMechanics.java
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/sync/AsyncUpdater.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/ProcessChangeRequest.java
M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/RunningTask.java
Log Message:
-----------
Fix op.results for threaded LiveSync/AsyncUpdate
Operation results handling in multithreaded LiveSync was faulty because
the ConnectorInstanceConnIdImpl.sync() method tried to compute,
cleanup and summarize results that were not yet complete -- they
were filled-in asynchronously, in worker threads.
So we changed this behavior and provide worker threads with their own,
separate operation results.
This change applies to AsyncUpdate as well, although the original
mechanism was a bit different there.
Commit: c06edfcec4991786c04862453eaad72cf8a008c6
https://github.com/Evolveum/midpoint/commit/c06edfcec4991786c04862453eaad72cf8a008c6
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2020-03-18 (Wed, 18 Mar 2020)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismPropertyValueWrapper.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismValueWrapperImpl.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/TestQueryBuilder.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/AbstractSpringTest.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.java
A model/model-intest/src/test/resources/crud/account-jack-dummy-maroon-no-delete.xml
A model/model-intest/src/test/resources/crud/resource-dummy-maroon-no-delete.xml
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java
M tools/ninja/src/test/java/com/evolveum/midpoint/ninja/BaseTest.java
M tools/ninja/src/test/java/com/evolveum/midpoint/ninja/DeleteRepositoryTest.java
M tools/ninja/src/test/java/com/evolveum/midpoint/ninja/ImportInvalidRepositoryTest.java
M tools/ninja/src/test/java/com/evolveum/midpoint/ninja/ImportRepositoryTest.java
M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AbstractUnitTest.java
M tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/MidpointTestMixin.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/54fa7a95dfcd...c06edfcec499
More information about the midPoint-svn
mailing list