MID-8842 ninja - DB schema version skip check option + some logging a…

…dded (debug level) (cherry picked from commit 44e334d)
Evolveum · Aug 3, 2023 · 9004da8 · 9004da8
1 parent 7c28f2f
commit 9004da8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/...n/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java b/...n/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
@@ -19,6 +19,8 @@ public interface MidpointConfiguration {
     String MIDPOINT_LOGGING_ALT_FILENAME_PROPERTY = "midpoint.logging.alt.filename";
     String MIDPOINT_LOGGING_ALT_PREFIX_PROPERTY = "midpoint.logging.alt.prefix";
 
+    String MIDPOINT_SKIP_VERSION_CHECK="midpoint.skipVersionCheck";
+
     String USER_HOME_PROPERTY = "user.home";
 
     /** Property for config file name override; if empty, default value is used. */

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepoContext.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepoContext.java
@@ -11,34 +11,34 @@
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Set;
-
-import com.evolveum.midpoint.repo.sqale.qmodel.common.MGlobalMetadata;
-import com.evolveum.midpoint.repo.sqale.qmodel.common.QGlobalMetadata;
-import com.evolveum.midpoint.repo.sqlbase.JdbcSession;
-
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;
 import javax.xml.namespace.QName;
 
 import com.querydsl.sql.types.ArrayType;
 import com.querydsl.sql.types.EnumAsObjectType;
+import org.apache.commons.lang3.BooleanUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.SerializationOptions;
 import com.evolveum.midpoint.prism.delta.ChangeType;
 import com.evolveum.midpoint.prism.delta.ItemDelta;
 import com.evolveum.midpoint.repo.sqale.jsonb.Jsonb;
 import com.evolveum.midpoint.repo.sqale.jsonb.QuerydslJsonbType;
 import com.evolveum.midpoint.repo.sqale.qmodel.common.MContainerType;
+import com.evolveum.midpoint.repo.sqale.qmodel.common.MGlobalMetadata;
+import com.evolveum.midpoint.repo.sqale.qmodel.common.QGlobalMetadata;
 import com.evolveum.midpoint.repo.sqale.qmodel.common.QUri;
 import com.evolveum.midpoint.repo.sqale.qmodel.ext.MExtItem;
 import com.evolveum.midpoint.repo.sqale.qmodel.ext.MExtItemCardinality;
 import com.evolveum.midpoint.repo.sqale.qmodel.ext.MExtItemHolderType;
 import com.evolveum.midpoint.repo.sqale.qmodel.object.MObjectType;
 import com.evolveum.midpoint.repo.sqale.qmodel.ref.MReferenceType;
 import com.evolveum.midpoint.repo.sqlbase.JdbcRepositoryConfiguration;
+import com.evolveum.midpoint.repo.sqlbase.JdbcSession;
 import com.evolveum.midpoint.repo.sqlbase.SqlRepoContext;
 import com.evolveum.midpoint.repo.sqlbase.mapping.QueryModelMappingRegistry;
 import com.evolveum.midpoint.schema.SchemaConstantsGenerated;
@@ -47,6 +47,8 @@
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.exception.SystemException;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventStageType;
 import com.evolveum.midpoint.xml.ns._public.common.audit_3.AuditEventTypeType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -57,6 +59,8 @@
  */
 public class SqaleRepoContext extends SqlRepoContext {
 
+    private static final Trace LOGGER = TraceManager.getTrace(SqaleRepoContext.class);
+
     private final String schemaChangeNumberLabel;
 
     private final int schemaChangeNumberValue;
@@ -119,6 +123,14 @@ public SqaleRepoContext(
 
     @PostConstruct
     public void initialize() {
+        // skip version check if option was defined or option value is "true" (equals ignore case)
+        String skipVersionCheck = System.getProperty(MidpointConfiguration.MIDPOINT_SKIP_VERSION_CHECK + "1");
+        if ("".equals(skipVersionCheck) || BooleanUtils.isTrue(Boolean.parseBoolean(skipVersionCheck))) {
+            return;
+        }
+
+        LOGGER.debug("Checking DB schema version.");
+
         try (JdbcSession session = this.newJdbcSession().startReadOnlyTransaction()) {
             MGlobalMetadata metadata = session.newQuery().from(QGlobalMetadata.DEFAULT)
                     .select(QGlobalMetadata.DEFAULT)
@@ -133,6 +145,8 @@ public void initialize() {
                         + ") doesn't match expected value (" + schemaChangeNumberValue + ") for label '" + schemaChangeNumberLabel
                         + "'. Seems like mismatch between midPoint executable version and DB schema version. Maybe DB schema was not updated?");
             }
+
+            LOGGER.debug("DB schema version check OK.");
         }
 
         clearCaches();