Fix loading full shadows in recon. processor

We need "no discovery" option there. E.g. correct handling of maintenance mode depends on full shadow load throwing an exception in that stage. This fixes TestResourceInMaintenance. Related to MID-7053.
Evolveum · Sep 25, 2021 · 7284c38 · 7284c38
1 parent 1eeb52b
commit 7284c38
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 25 deletions.
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
@@ -1685,4 +1685,9 @@ public void rotWithDeltaDeletion() {
         rot();
         state.clearSecondaryDelta();
     }
+
+    /** Assumes that the resource is loaded. */
+    public boolean isInMaintenance() {
+        return ResourceTypeUtil.isInMaintenance(resource);
+    }
 }
diff --git a/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java b/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
@@ -176,11 +176,20 @@ public <F extends ObjectType> void updateFocusTemplate(LensContext<F> context, O
         }
     }
 
-    public <F extends ObjectType> void loadFullShadow(@NotNull LensProjectionContext projCtx, String reason,
+    public void loadFullShadow(@NotNull LensProjectionContext projCtx, String reason,
             Task task, OperationResult parentResult)
             throws ObjectNotFoundException, CommunicationException, SchemaException, ConfigurationException,
             SecurityViolationException, ExpressionEvaluationException {
-        new ProjectionFullLoadOperation<>(projCtx.getLensContext(), projCtx, reason, task)
+        new ProjectionFullLoadOperation<>(projCtx.getLensContext(), projCtx, reason, false, task)
+                .loadFullShadow(parentResult);
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    void loadFullShadowNoDiscovery(@NotNull LensProjectionContext projCtx, String reason,
+            Task task, OperationResult parentResult)
+            throws ObjectNotFoundException, CommunicationException, SchemaException, ConfigurationException,
+            SecurityViolationException, ExpressionEvaluationException {
+        new ProjectionFullLoadOperation<>(projCtx.getLensContext(), projCtx, reason, true, task)
                 .loadFullShadow(parentResult);
     }
 

diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java b/...rc/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
@@ -30,6 +30,7 @@
 import com.evolveum.midpoint.schema.processor.ResourceAttributeContainer;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.*;
+import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowAssociationType;
 
 import org.jetbrains.annotations.NotNull;
@@ -50,12 +51,6 @@
 import com.evolveum.midpoint.schema.processor.ResourceAttributeDefinition;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.ShadowUtil;
-import com.evolveum.midpoint.util.exception.CommunicationException;
-import com.evolveum.midpoint.util.exception.ConfigurationException;
-import com.evolveum.midpoint.util.exception.ExpressionEvaluationException;
-import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.exception.SecurityViolationException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
@@ -127,7 +122,7 @@ private void processReconciliation(LensProjectionContext projCtx, Task task, Ope
         }
 
         if (!projCtx.isFullShadow()) {
-            contextLoader.loadFullShadow(projCtx, "projection reconciliation", task, result);
+            contextLoader.loadFullShadowNoDiscovery(projCtx, "projection reconciliation", task, result);
         }
 
         LOGGER.trace("Starting reconciliation of {}", projCtx.getHumanReadableName());

diff --git a/...a/com/evolveum/midpoint/model/impl/lens/projector/loader/ProjectionFullLoadOperation.java b/...a/com/evolveum/midpoint/model/impl/lens/projector/loader/ProjectionFullLoadOperation.java
@@ -52,6 +52,7 @@ public class ProjectionFullLoadOperation<F extends ObjectType> {
     @NotNull private final LensProjectionContext projCtx;
     @NotNull private final String reason;
     @NotNull private final Task task;
+    private final boolean noDiscovery;
     @NotNull private final ModelBeans beans;
 
     private FullShadowLoadedTraceType trace;
@@ -60,11 +61,13 @@ public ProjectionFullLoadOperation(
             @NotNull LensContext<F> context,
             @NotNull LensProjectionContext projCtx,
             @NotNull String reason,
+            boolean noDiscovery,
             @NotNull Task task) {
         this.context = context;
         this.projCtx = projCtx;
         this.reason = reason;
         this.task = task;
+        this.noDiscovery = noDiscovery;
         this.beans = ModelBeans.get();
     }
 
@@ -159,15 +162,19 @@ private Collection<SelectorOptions<GetOperationOptions>> createOptions() throws
         if (projCtx.isDoReconciliation()) {
             getOptions.setForceRefresh(true);
         }
-        if (SchemaConstants.CHANNEL_DISCOVERY_URI.equals(context.getChannel())) {
-            LOGGER.trace("Loading full resource object {} from provisioning - with doNotDiscover to avoid loops; reason: {}",
-                    projCtx, reason);
-            // Avoid discovery loops
+        String discoveryDescription;
+        if (noDiscovery) {
             getOptions.setDoNotDiscovery(true);
+            discoveryDescription = "no discovery - on caller request";
+        } else if (SchemaConstants.CHANNEL_DISCOVERY_URI.equals(context.getChannel())) {
+            getOptions.setDoNotDiscovery(true);
+            discoveryDescription = "no discovery - to avoid loops";
         } else {
-            LOGGER.trace("Loading full resource object {} from provisioning (discovery enabled), reason: {}, channel: {}",
-                    projCtx, reason, context.getChannel());
+            discoveryDescription = "discovery enabled";
         }
+        LOGGER.trace("Loading full resource object {} from provisioning ({}) as requested; reason: {}",
+                projCtx, discoveryDescription, reason);
+
         Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions.createCollection(getOptions);
         addRetrievePasswordIfNeeded(options);
         return options;

diff --git a/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiAccount.java b/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiAccount.java
@@ -863,7 +863,7 @@ public void test500MultiSimple() throws Exception {
 
         when();
 
-        traced(() -> assignAccountToUser(user.getOid(), RESOURCE_DUMMY_MULTI_OUTBOUND_SIMPLE_OID, INTENT_DEFAULT, task, result));
+        assignAccountToUser(user.getOid(), RESOURCE_DUMMY_MULTI_OUTBOUND_SIMPLE_OID, INTENT_DEFAULT, task, result);
 
         then();
 

diff --git a/...odel-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java b/...odel-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiResource.java
@@ -198,13 +198,7 @@ public void test115JackAssignRoleDummiesFullErrorIvory() throws Exception {
     public void test116JackUnAssignRoleDummiesFullErrorIvory() throws Exception {
         assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL);
         getDummyResource().setAddBreakMode(BreakMode.NETWORK);
-        traced(() -> {
-            try {
-                jackUnassignRoleDummiesError(ROLE_DUMMIES_IVORY_OID, RESOURCE_DUMMY_IVORY_OID);
-            } catch (Exception e) {
-                throw new SystemException(e);
-            }
-        });
+        jackUnassignRoleDummiesError(ROLE_DUMMIES_IVORY_OID, RESOURCE_DUMMY_IVORY_OID);
     }
 
     /**
@@ -525,7 +519,7 @@ public void test224JackKillBeigeAccountAndRecompute() throws Exception {
 
         // WHEN
         when();
-        traced(() -> recomputeUser(USER_JACK_OID, executeOptions().reconcile(), task, result));
+        recomputeUser(USER_JACK_OID, executeOptions().reconcile(), task, result);
 
         // THEN
         then();

diff --git a/...ng/story/src/test/java/com/evolveum/midpoint/testing/story/TestResourceInMaintenance.java b/...ng/story/src/test/java/com/evolveum/midpoint/testing/story/TestResourceInMaintenance.java
@@ -296,7 +296,7 @@ public void test040CreateNewAccount() throws Exception {
         // lets try recompute just for fun, mp should do nothing and report success:
         when("recompute");
         OperationResult result2 = createOperationResult();
-        traced(() -> modelService.recompute(UserType.class, USER2_OID, executeOptions().reconcile(), task, result2));
+        modelService.recompute(UserType.class, USER2_OID, executeOptions().reconcile(), task, result2);
 
         then("recompute");
         assertSuccess(result2, 4); // Deep inside is an exception about maintenance