Merge pull request #31216 from KyleAure/31211-dbrotation-checkpoint-fix

Author: KyleAure

dev/fattest.simplicity/src/componenttest/topology/database/container/DatabaseContainerUtil.java

@@ -77,7 +77,7 @@ private static final String toReplacementString(String key) {
     private final ServerConfiguration serverClone;
     private final JdbcDatabaseContainer<?> databaseCont;
     private final DatabaseContainerType databaseType;
-    private final boolean isModifiable;
+   
 
     //Optional fields
     private boolean useGeneric = true;
@@ -89,6 +89,7 @@ private static final String toReplacementString(String key) {
     //Optional updates
     private Map<String, Fileset> libraries = Collections.emptyMap();
     private Set<JavaPermission> permissions = Collections.emptySet();
+    private boolean isModifiable = false;
 
     ///// Constructor /////
     private DatabaseContainerUtil(LibertyServer serv, JdbcDatabaseContainer<?> cont) throws Exception {
@@ -133,7 +134,7 @@ private DatabaseContainerUtil(LibertyServer serv, JdbcDatabaseContainer<?> cont)
         //TODO what about authData elements inside a <databaseStore> element?
 
         //If there is nothing to modify, this is not modifiable
-        this.isModifiable = !this.datasources.isEmpty() || !this.authDatas.isEmpty();
+        this.isModifiable |= !this.datasources.isEmpty() || !this.authDatas.isEmpty();
     }
 
     ///// Builder /////
@@ -145,9 +146,7 @@ private DatabaseContainerUtil(LibertyServer serv, JdbcDatabaseContainer<?> cont)
      */
     public static DatabaseContainerUtil build(LibertyServer server, JdbcDatabaseContainer<?> cont) {
         try {
-            DatabaseContainerUtil instance = new DatabaseContainerUtil(server, cont);
-            Log.info(c, "build", instance.toString());
-            return instance;
+            return new DatabaseContainerUtil(server, cont);
         } catch (Exception e) {
             throw new RuntimeException("Failure while building database container util", e);
         }
@@ -184,6 +183,8 @@ public DatabaseContainerUtil withDriverReplacement() {
         this.permissions = serverClone.getJavaPermissions().stream()
                         .filter(p -> p.getCodeBase().contains(toReplacementString(DRIVER_KEY)))
                         .collect(Collectors.toSet());
+        
+        this.isModifiable |= !this.libraries.isEmpty() || !this.permissions.isEmpty();
 
         return this;
     }
@@ -497,8 +498,11 @@ private Set<AuthData> findAuthDataLocations(DataSource ds) {
     public String toString() {
         return "DatabaseContainerUtil"
                         + System.lineSeparator() + "[server=" + server.getServerName() + ", databaseType=" + databaseType + ", isModifiable=" + isModifiable 
-                        + System.lineSeparator() + "datasources=" + datasources.stream().map(ds -> getElementId(ds)).collect(Collectors.toList())
-                        + System.lineSeparator() + "authDatas=" + authDatas.stream().map(ad -> getElementId(ad)).collect(Collectors.toList()) + "]";
+                        + System.lineSeparator() + "\tdatasources=" + datasources.stream().map(ds -> getElementId(ds)).collect(Collectors.toList())
+                        + System.lineSeparator() + "\tauthDatas=" + authDatas.stream().map(ad -> getElementId(ad)).collect(Collectors.toList()) 
+                        + System.lineSeparator() + "\tlibraries=" + libraries.keySet()
+                        + System.lineSeparator() + "\tpermissions=" + permissions.stream().map(ps -> getElementId(ps)).collect(Collectors.toList())
+                        + System.lineSeparator() + "]";
     }
 
 

dev/fattest.simplicity/src/componenttest/topology/impl/LibertyServer.java

@@ -669,7 +669,7 @@ public void setAssertNoAppRestartOnRestore(boolean assertNoAppRestartOnRestore)
          */
         private boolean criuRestoreDisableRecovery = true;
 
-        private Properties checkpointEnv = null;
+        private Properties checkpointEnv = new Properties();
 
         /**
          * Set of regular expressions to match against lines to ignore in the post checkpoint log files. Error / Warning messages found