[midPoint-git] [Evolveum/midpoint] bfa121: Merge branch 'master' into tmp/task-mode-in-provis...

Fri Nov 25 00:20:37 CET 2022

  Branch: refs/heads/tmp/task-mode-in-provisioning
  Home:   https://github.com/Evolveum/midpoint
  Commit: bfa1213b290b31416cd345ce63b5880c682efb16
      https://github.com/Evolveum/midpoint/commit/bfa1213b290b31416cd345ce63b5880c682efb16
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-11-24 (Thu, 24 Nov 2022)

  Changed paths:
    M gui/admin-gui/package-lock.json
    M gui/admin-gui/src/frontend/scss/_list-group-menu.scss
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/CustomListGroupMenuItem.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/ListGroupMenu.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/ListGroupMenuItem.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/ListGroupMenuItemPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/ListGroupMenuItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/ListGroupMenuPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/ListGroupMenuPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/MenuItemLinkPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/listGroup/MenuItemLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/PageAssignmentHolderDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageLogin.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/CustomListGroupMenuItem.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenu.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuItem.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuItemPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuItemPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/MenuItemLinkPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/MenuItemLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleOfTeammateMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/MetadataContainerPanel.html
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/SqaleUpdateContext.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java

  Log Message:
  -----------
  Merge branch 'master' into tmp/task-mode-in-provisioning

  Commit: 89e139da6ee738b31576a1a4fb95b90de987cad3
      https://github.com/Evolveum/midpoint/commit/89e139da6ee738b31576a1a4fb95b90de987cad3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-11-25 (Fri, 25 Nov 2022)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/SynchronizationUtils.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-provisioning-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/executor/LinkUpdater.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/loader/ProjectionsLoadOperation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ShadowUpdater.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/action/BaseClockworkAction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/reactions/SynchronizationActionExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/reactions/SynchronizationActionFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/Synchronizer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateActivityRun.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportActivityRun.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportFromResourceLauncher.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/RemainingShadowsActivityRun.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ResourceObjectsReconciliationActivityRun.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityRun.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/DeletionActivityHandler.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestProgressReporting.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestTaskReporting.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestThresholds.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestThresholdsMultiNode.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestThresholdsSingleTask.java
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-uuid.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/LiveSyncOptions.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceObjectChangeListener.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceObjectShadowChangeDescription.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceOperationDescription.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceOperationListener.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/errors/ObjectNotFoundHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/manager/OperationResultRecorder.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/manager/ShadowUpdater.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/AbstractActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/DelegatingActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/FailedObjectsFilterCreator.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/LocalActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/SearchBasedActivityRun.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/run/processing/ProcessingCoordinator.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestActivities.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestBucketingLive.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestWorkerTasks.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/MockComponentActivityRun.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/simple/SimpleMockActivityRun.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskUpdatedListener.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskUtil.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskListenerRegistry.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerConfiguration.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tasks/SuspendAndDeleteHelper.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tasks/TaskCleaner.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tasks/TaskPersister.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/tracing/TracerImpl.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestMiscellaneous.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestTaskManagerBasic.java

  Log Message:
  -----------
  Introduce shadow death timestamp

Handling of dead shadows was not consistent: we marked them as dead
at defined places, and if this was on the right occasion (e.g. during
reconciliation run or with discovery enabled), we invoked appropriate
synchronization reaction. At other places, the shadow could be marked
dead without invoking any synchronization code. Moreover, some hacks
had to be done, namely avoiding marking shadows as dead when in
simulation mode. And still, the solution was not 100% correct:
e.g. it broke down when thresholds were in action (see
TestThresholds.test430ReconcileDeleteAllSimulateExecute).

So, in this commit, we introduced deathTimestamp property in shadow.
It is used (along with fullSynchronizationTimestamp) to determine if the
shadow has to be processed during 3rd part of the reconciliation.
We also no longer skip marking shadows as dead in simulation mode.

There are some induced changes:

- Full synchronization timestamp is now set only AFTER the
synchronization is executed; and only if the result is not FATAL_ERROR.
(This does not apply to synchronizationSituationDescription.)
- The DELETED sync reaction is run only if there is no "replacement"
live projection for particular user. This is to avoid problems of e.g.
account renames or delete+add operations (TestUuid).

Other changes:

- Task execution mode is set in LocalActivityRun according to the
activity execution mode.
- The "simulate" flag was removed from some provisioning events. It is
superseded by the task execution mode.
- Unneeded marking shadow as dead in ProjectionsLoadOperation is gone.
- New event-based task waiting mechanism in tests was fixed.

Work in progress. Some tests may fail.

Compare: https://github.com/Evolveum/midpoint/compare/bfa1213b290b%5E...89e139da6ee7